Skip to content

Commit 116dc34

Browse files
committed
Merge branch 'develop'
2 parents 09d4362 + a72c66c commit 116dc34

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

app/assets/stylesheets/authentication.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
@import 'material';
22
@import 'bourbon';
33

4+
.news section:not(:last-of-type) {
5+
margin-bottom: 16px;
6+
}
7+
48
.section__featured-media {
59
background-size: cover;
610
background-repeat: no-repeat;

app/views/authentication/sessions/new.html.haml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
.mdl-cell.mdl-cell--4-col
33
= render 'partials/authentication/login_tabs'
44
- if @news_feed_posts
5-
.mdl-cell.mdl-cell--8-col
5+
.mdl-cell.mdl-cell--8-col.news
66
= render 'partials/authentication/news'

app/views/partials/authentication/_news.html.haml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
- @news_feed_posts.each do |post|
2-
%section.section--center.mdl-grid.mdl-grid--no-spacing.mdl-shadow--2dp
2+
%section.mdl-grid.mdl-grid--no-spacing.mdl-shadow--2dp
33
- if post.tile_media_id?
44
%header.section__featured-media.mdl-cell.mdl-cell--3-col-desktop.mdl-cell--2-col-tablet.mdl-cell--4-col-phone{style: "background-image: url(#{post.tile_media.url})"}
55
.mdl-card.mdl-cell.mdl-cell--9-col-desktop.mdl-cell--6-col-tablet.mdl-cell--4-col-phone

0 commit comments

Comments
 (0)