Skip to content

Commit ed0d679

Browse files
committed
Fix device breaks
1 parent f0352d8 commit ed0d679

File tree

10 files changed

+19
-30
lines changed

10 files changed

+19
-30
lines changed

app/styles/app.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
body {
2828
background-color: $white;
2929
padding-top: $nav-bar-height;
30+
font-size: 14px;
3031
@include body-font();
3132
}
3233

app/styles/components/bulletin-navigator.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
}
1616
}
1717

18-
@media only screen and (min-width: $medium-device-break) {
18+
@media only screen and (min-width: $large-device-break) {
1919
padding-left: $padding-xl;
2020
}
2121
}

app/styles/components/mcac-header.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
.navbar {
2-
z-index: 100;
32
background-color: $white;
43
border-style: none;
4+
padding: 0;
55
width: 100%;
6+
z-index: 100;
67

78
.navbar-header {
89
float: none;
@@ -14,6 +15,7 @@
1415
color: $black;
1516
float: none;
1617
line-height: $nav-bar-height;
18+
margin-right: 0;
1719
padding: 0;
1820
position: relative;
1921

@@ -35,7 +37,7 @@
3537
display: initial !important;
3638
}
3739

38-
@media only screen and (min-width: $small-device-break) {
40+
@media only screen and (min-width: $medium-device-break) {
3941
.navbar-header .navbar-brand {
4042
margin-left: 0;
4143
}

app/styles/components/nav-bar.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
display: inline-block;
3636
}
3737

38-
@media only screen and (min-width: $small-device-break) {
38+
@media only screen and (min-width: $medium-device-break) {
3939
.navbar-brand {
4040
padding-left: 15px;
4141
padding-right: 15px;

app/styles/components/post-view.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
}
131131
}
132132

133-
@media only screen and (min-width: $small-device-break) {
133+
@media only screen and (min-width: $medium-device-break) {
134134
border-width: $padding-xs;
135135

136136
.banner {
@@ -147,7 +147,7 @@
147147
}
148148
}
149149

150-
@media only screen and (min-width: $medium-device-break) {
150+
@media only screen and (min-width: $large-device-break) {
151151
h1 {
152152
}
153153

app/styles/footer.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ footer {
5454
font-style: italic;
5555
}
5656

57-
@media only screen and (min-width: $small-device-break) {
57+
@media only screen and (min-width: $medium-device-break) {
5858
border-width: 0 1px;
5959
border-style: solid;
6060
border-color: $gray-extralight;

app/styles/pages/dashboard-index.scss

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,5 @@
1010
.bulletin-actions {
1111
width: 150px;
1212
}
13-
14-
@media only screen and (min-width: $small-device-break) {
15-
}
16-
17-
@media only screen and (min-width: $medium-device-break) {
18-
}
1913
}
2014

app/styles/pages/group-index.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
border-color: $gray-extralight;
4242

4343
.about-group {
44-
font-size: 12px;
44+
font-size: 13px;
4545
}
4646

4747
.latest-news > div {

app/styles/pages/not-found.scss

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,4 @@
22
color: $gray;
33
padding-bottom: $padding-xl;
44
padding-top: $padding-xl;
5-
6-
@media only screen and
7-
(min-width: $small-device-break) and
8-
(max-width: $medium-device-break) {
9-
}
10-
11-
@media only screen and (min-width: $medium-device-break) {
12-
}
135
}

app/styles/utils.scss

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,63 +59,63 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
5959
@mixin margin-top-xl() {
6060
margin-top: $padding-l;
6161

62-
@media only screen and (min-width: $medium-device-break) {
62+
@media only screen and (min-width: $large-device-break) {
6363
margin-top: $padding-xl;
6464
}
6565
}
6666

6767
@mixin margin-top-l() {
6868
margin-top: $padding-m;
6969

70-
@media only screen and (min-width: $medium-device-break) {
70+
@media only screen and (min-width: $large-device-break) {
7171
margin-top: $padding-l;
7272
}
7373
}
7474

7575
@mixin padding-top-xl() {
7676
padding-top: $padding-l;
7777

78-
@media only screen and (min-width: $medium-device-break) {
78+
@media only screen and (min-width: $large-device-break) {
7979
padding-top: $padding-xl;
8080
}
8181
}
8282

8383
@mixin padding-bottom-xl() {
8484
padding-bottom: $padding-l;
8585

86-
@media only screen and (min-width: $medium-device-break) {
86+
@media only screen and (min-width: $large-device-break) {
8787
padding-bottom: $padding-xl;
8888
}
8989
}
9090

9191
@mixin padding-top-l() {
9292
padding-top: $padding-m;
9393

94-
@media only screen and (min-width: $medium-device-break) {
94+
@media only screen and (min-width: $large-device-break) {
9595
padding-top: $padding-l;
9696
}
9797
}
9898

9999
@mixin padding-top-m() {
100100
padding-top: $padding-s;
101101

102-
@media only screen and (min-width: $medium-device-break) {
102+
@media only screen and (min-width: $large-device-break) {
103103
padding-top: $padding-m;
104104
}
105105
}
106106

107107
@mixin padding-bottom-l() {
108108
padding-bottom: $padding-m;
109109

110-
@media only screen and (min-width: $medium-device-break) {
110+
@media only screen and (min-width: $large-device-break) {
111111
padding-bottom: $padding-l;
112112
}
113113
}
114114

115115
@mixin padding-bottom-m() {
116116
padding-bottom: $padding-s;
117117

118-
@media only screen and (min-width: $medium-device-break) {
118+
@media only screen and (min-width: $large-device-break) {
119119
padding-bottom: $padding-m;
120120
}
121121
}

0 commit comments

Comments
 (0)