Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Commit c42279d

Browse files
author
Victor George
committed
navigation fixed, new icons, new track icons
1 parent 6f5c701 commit c42279d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+15459
-454
lines changed

‎app/layout/header/header.controller.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747

4848
vm.userMenu = [
4949
{ 'sref': 'dashboard', 'text': 'DASHBOARD', 'icon': '/images/nav/dashboard.svg' },
50-
{ 'sref': 'profile.about', 'srefParams': { 'userHandle': vm.userHandle }, 'text': 'MY PROFILE', 'icon': '/images/nav/badge.svg' },
51-
{ 'href': vm.constants.COMMUNITY_URL + '/PactsMemberServlet?module=PaymentHistory&full_list=false', 'text': 'PAYMENTS', 'icon': '/images/nav/money-bag.svg', 'target': '_blank' },
52-
{ 'sref': 'settings.profile', 'text': 'SETTINGS', 'icon': '/images/nav/gear.svg' },
50+
{ 'sref': 'profile.about', 'srefParams': { 'userHandle': vm.userHandle }, 'text': 'MY PROFILE', 'icon': '/images/nav/profile.svg' },
51+
{ 'href': vm.constants.COMMUNITY_URL + '/PactsMemberServlet?module=PaymentHistory&full_list=false', 'text': 'PAYMENTS', 'icon': '/images/nav/wallet.svg', 'target': '_blank' },
52+
{ 'sref': 'settings.profile', 'text': 'SETTINGS', 'icon': '/images/nav/settings.svg' },
5353
];
5454

5555
ProfileService.getUserProfile(vm.userHandle)

‎app/layout/header/header.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
li.submenu-item
4949
a.menu-link(ng-click="vm.logout(); main.menuVisible = vm.isAuth = false")
50-
img.menu-icon(ng-src="/images/nav/logout.svg")
50+
img.menu-icon(ng-src="/images/nav/exit.svg")
5151
.menu-text LOG OUT
5252

5353
// links for anonymous user

‎app/services/nav.service.js

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,24 @@
1616

1717
service.menuLinks = {
1818
'compete': [
19-
{ 'href': "/challenges/design/active/", 'text': 'DESIGN CHALLENGES', 'icon': '/images/nav/design.svg' },
20-
{ 'href': "/challenges/develop/active", 'text': 'DEVELOPMENT CHALLENGES', 'icon': '/images/nav/development.svg' },
21-
{ 'href': "/challenges/data/active", 'text': 'DATA SCIENCE CHALLENGES', 'icon': '/images/nav/data-science.svg' },
22-
{ 'href': CONSTANTS.ARENA_URL, 'text': 'THE ARENA', 'icon': '/images/nav/srms.svg', 'target': '_blank' },
19+
{ 'href': "/challenges/design/active/", 'text': 'DESIGN CHALLENGES', 'icon': '/images/nav/track-design.svg' },
20+
{ 'href': "/challenges/develop/active", 'text': 'DEVELOPMENT CHALLENGES', 'icon': '/images/nav/track-develop.svg' },
21+
{ 'href': "/challenges/data/active", 'text': 'DATA SCIENCE CHALLENGES', 'icon': '/images/nav/track-data.svg' },
22+
{ 'href': CONSTANTS.ARENA_URL, 'text': 'THE ARENA', 'icon': '/images/nav/track-cp.svg', 'target': '_blank' },
2323
],
2424
'learn': [
25-
{ 'href': '/community/design/', 'text': 'DESIGN', 'icon': '/images/nav/scroll-design.svg' },
26-
{ 'href': '/community/development/', 'text': 'DEVELOPMENT', 'icon': '/images/nav/scroll-develop.svg' },
27-
{ 'href': '/community/data-science/', 'text': 'DATA SCIENCE', 'icon': '/images/nav/scroll-data.svg' },
28-
{ 'href': '/community/competitive%20programming/', 'text': 'COMPETITIVE PROGRAMMING', 'icon': '/images/nav/srms.svg' },
25+
{ 'href': '/community/design/', 'text': 'DESIGN', 'icon': '/images/nav/book-design.svg' },
26+
{ 'href': '/community/development/', 'text': 'DEVELOPMENT', 'icon': '/images/nav/book-develop.svg' },
27+
{ 'href': '/community/data-science/', 'text': 'DATA SCIENCE', 'icon': '/images/nav/book-data.svg' },
28+
{ 'href': '/community/competitive%20programming/', 'text': 'COMPETITIVE PROGRAMMING', 'icon': '/images/nav/book-cp.svg' },
2929
],
3030
'community': [
31-
{ 'href': '/community/members/', 'text': 'MEMBERS', 'icon': '/images/nav/users.svg' },
32-
{ 'href': '/community/member-programs/', 'text': 'PROGRAMS', 'icon': '/images/nav/medal.svg' },
33-
{ 'href': CONSTANTS.FORUMS_APP_URL, 'text': 'FORUMS', 'icon': '/images/nav/forum.svg', 'target': '_blank' },
31+
{ 'href': '/community/', 'text': 'COMMUNITY', 'icon': '/images/nav/community.svg' },
32+
{ 'href': '/community/members/', 'text': 'MEMBERS', 'icon': '/images/nav/members.svg' },
33+
{ 'href': '/community/member-programs/', 'text': 'PROGRAMS', 'icon': '/images/nav/programs.svg' },
34+
{ 'href': CONSTANTS.FORUMS_APP_URL, 'text': 'FORUMS', 'icon': '/images/nav/forums.svg', 'target': '_blank' },
3435
{ 'href': '/community/statistics/', 'text': 'STATISTICS', 'icon': '/images/nav/statistics.svg' },
35-
{ 'href': '/community/events/', 'text': 'EVENTS', 'icon': '/images/nav/calendar.svg' },
36+
{ 'href': '/community/events/', 'text': 'EVENTS', 'icon': '/images/nav/events.svg' },
3637
{ 'href': '/blog/', 'text': 'BLOG', 'icon': '/images/nav/blog.svg' }
3738
]
3839
};

‎assets/css/directives/profile-widget.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@
105105
margin-left: 20px;
106106
}
107107
.track-icon {
108-
background-size: 44px;
109-
width: 44px;
108+
background-size: 40px;
109+
width: 40px;
110110
}
111111
.text {
112112
@include sofia-pro-light;

‎assets/css/layout/header.scss

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,12 @@
156156
padding: 0 15px 0 37px;
157157
background: transparent;
158158
outline: none;
159+
box-shadow: none;
160+
161+
&:focus {
162+
outline: none;
163+
box-shadow: none;
164+
}
159165
}
160166

161167
::-webkit-input-placeholder {
@@ -189,8 +195,8 @@
189195
.username {
190196
vertical-align: middle;
191197
&.underline {
192-
padding-bottom: 4px;
193-
border-bottom: 4px #0096FF solid;
198+
padding-bottom: 12px;
199+
border-bottom: 2px $primary solid;
194200
}
195201
}
196202

@@ -275,7 +281,7 @@
275281
display: block;
276282

277283
&.active {
278-
background-color: rgba(0, 150, 255, 0.2);
284+
background-color: rgba(0, 150, 255, 0.35);
279285
border-left: 5px solid $primary;
280286
color: #fff;
281287
margin: 0 -20px;
@@ -381,11 +387,13 @@
381387
.menu-item .submenu {
382388
overflow: hidden;
383389
max-height: 0px;
390+
// opacity: 0;
384391
transition: all .25s ease-in-out;
385392
}
386393

387394
.menu-item:hover .submenu {
388395
max-height: 500px;
396+
// opacity: 1;
389397
}
390398

391399
// Expand the submenu only when hovering on header or submenu itself or if submenu is marked with .expanded
@@ -399,7 +407,12 @@
399407
}
400408

401409
.menu-link.active {
402-
background-color: rgba(0, 150, 255, 0.1);
410+
background-color: rgba(0, 150, 255, 0.35);
411+
// border-bottom: 3px solid $primary;
412+
}
413+
414+
.menu-link.active:hover {
415+
background-color: rgba(0, 150, 255, 1);
403416
}
404417

405418
.menu-item:not(.anonymous-menu):hover .menu-item-header {
@@ -447,7 +460,7 @@
447460
top: 100%;
448461
left: 0;
449462
right: 0;
450-
background-color: rgba(61, 61, 61, 0.95);
463+
background: rgba(38,38,38,.95);
451464
}
452465

453466
.suggestion-list {
@@ -458,16 +471,19 @@
458471
}
459472

460473
.link-group .menu-link {
461-
width: 130px;
462-
height: 122px;
474+
// width: 130px;
475+
max-width: 90px;
476+
padding: 0 30px;
477+
height: 123px;
463478
font-size: 12px;
479+
font-weight: 300;
464480
line-height: 1.2em;
465481

466482
img {
467483
display: block;
468-
height: 44px;
469-
width: 44px;
470-
margin: 20px auto 10px auto;
484+
height: 36px;
485+
width: 36px;
486+
margin: 30px auto 10px auto;
471487
}
472488
}
473489

@@ -524,8 +540,9 @@
524540

525541
.link-group {
526542
display: inline-block;
527-
color: #a3a3a3;
528-
font-size: 16px;
543+
color: $accent-gray;
544+
font-size: 14px;
545+
font-weight: 400;
529546
&.selected {
530547
-moz-box-shadow: inset 0 -4px 0px -1px #0096ff;
531548
-webkit-box-shadow: inset 0 -4px 0px -1px #0096ff;

‎assets/css/profile/icons.scss

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
.develop-icon {
2-
background-image:url('/images/ico-track-develop-outline.svg');
2+
background-image:url('/images/ico-track-develop.svg');
33
background-position:0 0;
44
background-repeat:no-repeat;
5-
background-size: 50px;
6-
height: 50px;
7-
width: 50px;
5+
background-size: 40px;
6+
height: 40px;
7+
width: 40px;
88
}
99
.design-icon {
10-
background-image:url('/images/ico-track-design-outline.svg');
10+
background-image:url('/images/ico-track-design.svg');
1111
font-size: 30px;
1212
background-position:0 0;
1313
background-repeat:no-repeat;
14-
background-size: 50px;
15-
height: 50px;
16-
width: 50px;
14+
background-size: 40px;
15+
height: 40px;
16+
width: 40px;
1717
}
1818
.data-icon {
19-
background-image:url('/images/ico-track-data-outline.svg');
19+
background-image:url('/images/ico-track-data.svg');
2020
background-position:0 0;
2121
background-repeat:no-repeat;
22-
background-size: 50px;
23-
height: 50px;
24-
width: 50px;
22+
background-size: 40px;
23+
height: 40px;
24+
width: 40px;
2525
}
2626
.copilot-icon {
27-
background-image:url('/images/ico-track-co_pilot-outline.svg');
27+
background-image:url('/images/ico-track-copilot.svg');
2828
background-position:0 0;
2929
background-repeat:no-repeat;
30-
background-size: 50px;
31-
height: 50px;
32-
width: 50px;
30+
background-size: 40px;
31+
height: 40px;
32+
width: 40px;
3333
}

‎assets/images/Navigation Icons - Master Sheet/artboards.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)