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

Commit d4254a9

Browse files
committed
Merge branch 'sup-1349-new-nav' of https://github.com/appirio-tech/topcoder-app into dev
2 parents fe2cc12 + b5ba562 commit d4254a9

File tree

4 files changed

+34
-3
lines changed

4 files changed

+34
-3
lines changed

app/index.jade

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,9 @@ html
8383

8484
toaster-container(toaster-options="{{main.globalToasterConfig}}")
8585

86-
.view-container(ui-view="container")
86+
.fold-wrapper
87+
.view-container(ui-view="container")
88+
.fold-pusher
8789

8890
div(ui-view="footer")
8991

assets/css/layout/footer.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434

3535

3636
@media only screen and (max-width : 991px) {
37+
.bottom-footer, .fold-pusher {
38+
height: 200px;
39+
}
3740
.bottom-footer .menu-item {
3841
display: none;
3942
margin-top: 30px;
@@ -71,6 +74,9 @@
7174
}
7275

7376
@media only screen and (min-width : 992px) {
77+
.bottom-footer, .fold-pusher {
78+
height: 270px;
79+
}
7480
.bottom-footer {
7581
padding-top: 40px;
7682

@@ -87,6 +93,9 @@
8793
font-size: 16px;
8894
line-height: 21px;
8995
}
96+
.menu-link:hover {
97+
color: #0096ff;
98+
}
9099
}
91100
}
92101

assets/css/layout/header.scss

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,14 @@
188188
padding-left: 10px;
189189
vertical-align: middle;
190190
}
191+
192+
.menu-item-header {
193+
text-transform: none;
194+
}
195+
}
196+
197+
.menu-item-header {
198+
text-transform: uppercase;
191199
}
192200

193201
.submenu {
@@ -468,14 +476,12 @@
468476

469477
.menu-item-header {
470478
color: #a3a3a3;
471-
text-transform: uppercase;
472479
}
473480

474481
// Change source ordering for user logo and username
475482
.user-menu .menu-item-header {
476483
position: relative;
477484
padding-right: 40px;
478-
text-transform: none;
479485

480486
.user-avatar {
481487
position: absolute;

assets/css/topcoder.scss

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,30 @@
44
// Resets and top level container stylings
55
html {
66
min-height: 100%;
7+
height: 100%;
78
box-sizing: border-box;
89
}
910

1011
*, *:before, *:after {
12+
margin: 0;
1113
box-sizing: inherit;
1214
}
1315

1416
body {
1517
@include source-sans-regular;
1618
background-color: $ui-page-gray;
19+
height: 100%;
20+
}
21+
22+
23+
.fold-wrapper {
24+
min-height: 100%;
25+
@media only screen and (min-width : 992px) {
26+
margin: 0 auto -270px;
27+
}
28+
@media only screen and (max-width : 991px) {
29+
margin: 0 auto -200px;
30+
}
1731
}
1832

1933
.notifications {

0 commit comments

Comments
 (0)