File tree Expand file tree Collapse file tree 10 files changed +32
-108
lines changed Expand file tree Collapse file tree 10 files changed +32
-108
lines changed Original file line number Diff line number Diff line change @@ -20,5 +20,7 @@ export default Ember.Component.extend({
20
20
} ) ;
21
21
22
22
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 ) ;
24
26
}
Original file line number Diff line number Diff line change @@ -22,5 +22,5 @@ $small-device-break: 768px;
22
22
$medium-device-break : 992px ;
23
23
$large-device-break : 1200px ;
24
24
25
- $nav-bar-height : 30 px ;
25
+ $nav-bar-height : 50 px ;
26
26
$bulletin-announcements-color : $gray-blue-light ;
Original file line number Diff line number Diff line change 1
1
@import " utils" ;
2
+ @import " hiding-menu" ;
2
3
@import " announcement-editor" ;
3
4
@import " components/bulletin-cover" ;
4
5
@import " components/bulletin-navigator" ;
25
26
26
27
body {
27
28
background-color : $white ;
29
+ padding-top : $nav-bar-height ;
28
30
@include body-font ();
29
31
}
30
32
Original file line number Diff line number Diff line change 6
6
margin : 0 $padding-m $padding-m $padding-m ;
7
7
8
8
.inner {
9
- bottom : $padding-m ;
9
+ bottom : 0 ;
10
10
color : $white ;
11
11
position : absolute ;
12
12
margin : $padding-m ;
65
65
66
66
@media only screen and (min-width : $small-device-break ) {
67
67
.inner {
68
- padding : 0 $padding-xl ;
69
-
70
68
audio {
71
69
max-width : initial ;
72
70
}
84
82
font-size : 24px ;
85
83
}
86
84
}
85
+
86
+ @media only screen and (min-width : $medium-device-break ) {
87
+ .inner {
88
+ padding : 0 $padding-xl ;
89
+ }
90
+ }
87
91
}
Original file line number Diff line number Diff line change 1
1
.bulletin-navigator {
2
- margin-left : $padding-l ;
3
- margin-top : $padding-l ;
2
+ margin-left : $padding-m * 2 ;
3
+ margin-top : $padding-m * 2 ;
4
4
position : absolute ;
5
5
z-index : 100 ;
6
6
16
16
}
17
17
18
18
@media only screen and (min-width : $medium-device-break ) {
19
- margin -left : $padding-xl ;
19
+ padding -left : $padding-xl ;
20
20
}
21
21
}
Original file line number Diff line number Diff line change 1
1
.navbar {
2
- background-color : transparent ;
2
+ z-index : 100 ;
3
+ background-color : $white ;
3
4
border-style : none ;
4
- color : $white ;
5
5
width : 100% ;
6
6
7
7
.navbar-header {
8
8
float : none ;
9
- padding : 6px 0 0 $padding-m ;
9
+ height : $nav-bar-height ;
10
+ margin-left : 0 ;
11
+ margin-right : 0 ;
10
12
11
13
.navbar-brand {
12
- color : $white ;
14
+ color : $black ;
13
15
float : none ;
14
16
line-height : $nav-bar-height ;
15
17
padding : 0 ;
20
22
font-size : 36px ;
21
23
22
24
& :before {
25
+ margin-left : 0 ;
23
26
}
24
27
}
25
28
26
29
abbr [title ] {
27
30
border-style : none ;
28
31
position : absolute ;
29
- top : -8 px ;
32
+ cursor : pointer ;
30
33
}
31
34
}
32
35
33
36
@media only screen and (min-width : $small-device-break ) {
37
+ .navbar-header .navbar-brand {
38
+ margin-left : 0 ;
39
+ }
34
40
}
35
41
}
Original file line number Diff line number Diff line change 1
- < nav class =" navbar navbar-default navbar-fixed-top" >
1
+ {{ #hiding-menu throttleTime = 200 topTolerance = 50 class =" navbar navbar-default navbar-fixed-top" }}
2
2
<div class =" container" >
3
3
<div class =" navbar-header" >
4
4
{{ #link-to " index" class =" navbar-brand" }}
7
7
{{ /link-to }}
8
8
</div >
9
9
</div >
10
- </ nav >
11
- {{ yield }}
10
+ {{ yield }}
11
+ {{ /hiding-menu }}
Original file line number Diff line number Diff line change 54
54
"ember-data" : " ^2.7.0" ,
55
55
"ember-disable-proxy-controllers" : " ^1.0.1" ,
56
56
"ember-export-application-global" : " ^1.0.4" ,
57
+ "ember-hiding-menu" : " 0.0.3" ,
58
+ "ember-in-viewport" : " 2.0.8" ,
57
59
"ember-load-initializers" : " ^0.5.0" ,
58
60
"ember-marked" : " 0.0.4" ,
59
61
"ember-metrics" : " 0.6.0" ,
Load Diff This file was deleted.
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments