Skip to content

Commit 22a3f7a

Browse files
committed
Make group/index and index bootstrap4 compliant
1 parent 035256b commit 22a3f7a

File tree

5 files changed

+15
-14
lines changed

5 files changed

+15
-14
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/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/templates/group.hbs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<div class="container group-header">
22
<div class="row">
3-
<header class="col-sm-12 group-banner"
3+
<header class="col-md-12 group-banner"
44
style="background-image: url('{{cloudinary-fetch url=model.bannerUrl width=1920}}')"
55
data-auto-id="group-banner">
66
</header>
77
</div>
88

99
<div class="row group-details">
10-
<div class="col-xs-12 col-sm-2 col-md-offset-1">
10+
<div class="col-xs-12 col-md-2 offset-lg-1">
1111
<div class="profile-picture-wrapper">
1212
<div class="profile-picture"
1313
data-auto-id="group-profile-picture"
1414
style="background-image: url('{{cloudinary-fetch url=model.profilePictureUrl width=200}}')"></div>
1515
</div>
1616
</div>
1717

18-
<div class="col-xs-12 col-sm-10 col-md-8">
18+
<div class="col-xs-12 col-md-10 col-lg-8">
1919
<h1 class="group-name" data-auto-id="group-name">
2020
{{#link-to "group.index" model.slug}}{{model.name}}{{/link-to}}
2121
</h1>

app/templates/group/index.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="container group-index" data-auto-id="group">
22
<div class="row">
33
{{#if posts.length}}
4-
<section class="col-sm-7 col-md-offset-1 col-md-6 latest-news"
4+
<section class="col-md-7 offset-lg-1 col-lg-6 latest-news"
55
data-auto-id="group-posts">
66
<h2>Latest news</h2>
77
<div>
@@ -14,7 +14,7 @@
1414
</div>
1515
</section>
1616
{{/if}}
17-
<section class="col-sm-5 col-md-4 about-group">
17+
<section class="col-md-5 col-lg-4 about-group">
1818
<h2>About</h2>
1919
{{{group.aboutHtml}}}
2020
</section>

app/templates/index.hbs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<section class="theme">
99
<div class="container">
1010
<div class="row">
11-
<div class="col-sm-offset-1 col-sm-10 col-md-offset-2 col-md-8">
11+
<div class="offset-md-1 col-md-10 offset-lg-2 col-lg-8">
1212
As a congregation of the Montreal Chinese Alliance Church we believe
1313
<strong>because God loves us, we will love Jesus, love His people, and
1414
love the world, for Jesus' sake</strong>.
@@ -18,13 +18,13 @@
1818
</section>
1919
<section class="container around-church">
2020
<div class="row body">
21-
<div class="col-sm-offset-1 col-sm-10 col-md-offset-2 col-md-8">
21+
<div class="offset-md-1 col-md-10 offset-lg-2 col-lg-8">
2222
Want to know more about our church? Check out some of the groups within
2323
our church that may interest you.
2424
</div>
2525
</div>
2626
<div class="row">
27-
<div class="col-sm-offset-2 col-sm-4 group">
27+
<div class="offset-md-2 col-md-4 group">
2828
{{#link-to "group.index" "childrens-church"}}
2929
<img src={{cloudinary-fetch url="https://mcac.s3.amazonaws.com/groups/fabe359d-8611-4112-b675-842cd40ef57e.jpg"
3030
width=200
@@ -37,7 +37,7 @@
3737
{{/link-to}}
3838
</div>
3939
</div>
40-
<div class="col-sm-4 group" {{action "viewGroup" "english-service"}}>
40+
<div class="col-md-4 group" {{action "viewGroup" "english-service"}}>
4141
{{#link-to "group.index" "english-service"}}
4242
<img src={{cloudinary-fetch url="https://mcac.s3.amazonaws.com/groups/5c7d76a8-d195-4907-951d-5b3fb00c438d.jpg"
4343
width=200

0 commit comments

Comments
 (0)