Skip to content

Commit 9859b11

Browse files
committed
Clean up views to be consistent with new design
1 parent d35e6f7 commit 9859b11

File tree

10 files changed

+32
-108
lines changed

10 files changed

+32
-108
lines changed

app/components/bulletin-cover.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,7 @@ export default Ember.Component.extend({
2020
});
2121

2222
function suitableScreenHeight() {
23-
return Math.max(Ember.$(window).height() - 40, 320);
23+
const navBarHeightPx = 50;
24+
const coverBorderWidthPx = 10;
25+
return Math.max(Ember.$(window).height() - (navBarHeightPx + coverBorderWidthPx), 320);
2426
}

app/styles/_variables.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ $small-device-break: 768px;
2222
$medium-device-break: 992px;
2323
$large-device-break: 1200px;
2424

25-
$nav-bar-height: 30px;
25+
$nav-bar-height: 50px;
2626
$bulletin-announcements-color: $gray-blue-light;

app/styles/app.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@import "utils";
2+
@import "hiding-menu";
23
@import "announcement-editor";
34
@import "components/bulletin-cover";
45
@import "components/bulletin-navigator";
@@ -25,6 +26,7 @@
2526

2627
body {
2728
background-color: $white;
29+
padding-top: $nav-bar-height;
2830
@include body-font();
2931
}
3032

app/styles/components/bulletin-cover.scss

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
margin: 0 $padding-m $padding-m $padding-m;
77

88
.inner {
9-
bottom: $padding-m;
9+
bottom: 0;
1010
color: $white;
1111
position: absolute;
1212
margin: $padding-m;
@@ -65,8 +65,6 @@
6565

6666
@media only screen and (min-width: $small-device-break) {
6767
.inner {
68-
padding: 0 $padding-xl;
69-
7068
audio {
7169
max-width: initial;
7270
}
@@ -84,4 +82,10 @@
8482
font-size: 24px;
8583
}
8684
}
85+
86+
@media only screen and (min-width: $medium-device-break) {
87+
.inner {
88+
padding: 0 $padding-xl;
89+
}
90+
}
8791
}

app/styles/components/bulletin-navigator.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.bulletin-navigator {
2-
margin-left: $padding-l;
3-
margin-top: $padding-l;
2+
margin-left: $padding-m * 2;
3+
margin-top: $padding-m * 2;
44
position: absolute;
55
z-index: 100;
66

@@ -16,6 +16,6 @@
1616
}
1717

1818
@media only screen and (min-width: $medium-device-break) {
19-
margin-left: $padding-xl;
19+
padding-left: $padding-xl;
2020
}
2121
}
Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
.navbar {
2-
background-color: transparent;
2+
z-index: 100;
3+
background-color: $white;
34
border-style: none;
4-
color: $white;
55
width: 100%;
66

77
.navbar-header {
88
float: none;
9-
padding: 6px 0 0 $padding-m;
9+
height: $nav-bar-height;
10+
margin-left: 0;
11+
margin-right: 0;
1012

1113
.navbar-brand {
12-
color: $white;
14+
color: $black;
1315
float: none;
1416
line-height: $nav-bar-height;
1517
padding: 0;
@@ -20,16 +22,20 @@
2022
font-size: 36px;
2123

2224
&:before {
25+
margin-left: 0;
2326
}
2427
}
2528

2629
abbr[title] {
2730
border-style: none;
2831
position: absolute;
29-
top: -8px;
32+
cursor: pointer;
3033
}
3134
}
3235

3336
@media only screen and (min-width: $small-device-break) {
37+
.navbar-header .navbar-brand {
38+
margin-left: 0;
39+
}
3440
}
3541
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<nav class="navbar navbar-default navbar-fixed-top">
1+
{{#hiding-menu throttleTime=200 topTolerance=50 class="navbar navbar-default navbar-fixed-top"}}
22
<div class="container">
33
<div class="navbar-header">
44
{{#link-to "index" class="navbar-brand"}}
@@ -7,5 +7,5 @@
77
{{/link-to}}
88
</div>
99
</div>
10-
</nav>
11-
{{yield}}
10+
{{yield}}
11+
{{/hiding-menu}}

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@
5454
"ember-data": "^2.7.0",
5555
"ember-disable-proxy-controllers": "^1.0.1",
5656
"ember-export-application-global": "^1.0.4",
57+
"ember-hiding-menu": "0.0.3",
58+
"ember-in-viewport": "2.0.8",
5759
"ember-load-initializers": "^0.5.0",
5860
"ember-marked": "0.0.4",
5961
"ember-metrics": "0.6.0",

tests/acceptance/sunday-redirect-test.js

Lines changed: 0 additions & 68 deletions
This file was deleted.

tests/integration/components/cover-page-test.js

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)