Skip to content

Commit cb6d93f

Browse files
authored
Merge pull request #165 from openmcac/bootstrap4
Upgrade to Bootstrap 4
2 parents 443e842 + 79134f3 commit cb6d93f

Some content is hidden

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

75 files changed

+460
-423
lines changed

app/styles/_variables.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ $padding-m: 10px;
1818
$padding-l: 25px;
1919
$padding-xl: 42px;
2020

21-
$small-device-break: 768px;
22-
$medium-device-break: 992px;
23-
$large-device-break: 1200px;
21+
$small-device-break: 544px;
22+
$medium-device-break: 768px;
23+
$large-device-break: 992px;
24+
$extra-large-device-break: 1200px;
2425

2526
$nav-bar-height: 50px;
2627
$bulletin-announcements-color: $gray-blue-light;

app/styles/announcement-editor.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,13 @@ $announcement-height: 60px;
5050
}
5151

5252
.url {
53-
width: 100%;
54-
border-style: none;
5553
border-bottom-style: solid;
5654
border-bottom-width: 1px;
5755
border-color: $gray-light;
56+
border-style: none;
57+
display: none;
5858
margin-bottom: $padding-m;
59+
width: 100%;
5960
}
6061

6162
.handle {

app/styles/app.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
@import "components/mcac-header.scss";
1111
@import "components/pace";
1212
@import "components/page-view";
13+
@import "components/pagination";
1314
@import "components/post-composer";
1415
@import "components/post-form";
1516
@import "components/post-view";
@@ -27,6 +28,7 @@
2728
body {
2829
background-color: $white;
2930
padding-top: $nav-bar-height;
31+
font-size: 14px;
3032
@include body-font();
3133
}
3234

app/styles/components/bulletin-cover.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
}
6464
}
6565

66-
@media only screen and (min-width: $small-device-break) {
66+
@media only screen and (min-width: $medium-device-break) {
6767
.inner {
6868
audio {
6969
max-width: initial;
@@ -83,7 +83,7 @@
8383
}
8484
}
8585

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

app/styles/components/bulletin-navigator.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
position: absolute;
55
z-index: 100;
66

7+
a, a:hover, a:visited, a:not([href]) {
8+
color: $white;
9+
text-decoration: none;
10+
}
11+
712
.nav-button {
813
background: rgb(0, 0, 0); /* Fall-back for browsers that don't support rgba */
914
background: rgba(0, 0, 0, .5);
1015
padding: $padding-m;
11-
12-
&, &:hover {
13-
color: $white;
14-
text-decoration: none;
15-
}
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/bulletin-view.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
}
5858

5959
@media only screen and
60-
(min-width: $small-device-break) and
61-
(max-width: $medium-device-break) {
60+
(min-width: $medium-device-break) and
61+
(max-width: $large-device-break) {
6262
.container {
6363
}
6464

@@ -80,7 +80,7 @@
8080
}
8181
}
8282

83-
@media only screen and (min-width: $medium-device-break) {
83+
@media only screen and (min-width: $large-device-break) {
8484
.service-order {
8585
text-align: right;
8686

app/styles/components/group-header.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
}
5353
}
5454

55-
@media only screen and (min-width: $small-device-break) {
55+
@media only screen and (min-width: $medium-device-break) {
5656
border-width: 0 1px;
5757
border-style: solid;
5858
border-color: $gray-extralight;
@@ -100,7 +100,7 @@
100100
}
101101
}
102102

103-
@media only screen and (min-width: $medium-device-break) {
103+
@media only screen and (min-width: $large-device-break) {
104104
.group-details {
105105
.profile-picture-wrapper {
106106
text-align: center;

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;
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
.pagination-wrapper {
2+
text-align: center;
3+
4+
.pagination {
5+
li {
6+
background-color: $white;
7+
display: inline-block;
8+
font-size: 18px;
9+
margin: $padding-s;
10+
padding: $padding-s $padding-m;
11+
}
12+
13+
a, a:visited {
14+
color: $gray-dark;
15+
}
16+
17+
.arrow {
18+
&.prev {
19+
}
20+
21+
&.next {
22+
}
23+
}
24+
}
25+
26+
.page-number {
27+
&.active {
28+
}
29+
}
30+
}

0 commit comments

Comments
 (0)