diff --git a/app/assets/stylesheets/_consul_settings.scss b/app/assets/stylesheets/_consul_settings.scss index 7b256e8a0..70bde8f65 100644 --- a/app/assets/stylesheets/_consul_settings.scss +++ b/app/assets/stylesheets/_consul_settings.scss @@ -115,4 +115,4 @@ $tab-content-border: $border; $orbit-bullet-diameter: 0.8rem; -$pagination-radius: $global-radius; \ No newline at end of file +$pagination-radius: $global-radius; diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 2ae5b7c40..c9858accb 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -253,7 +253,7 @@ a { } } - & + li { + + li { margin-left: 0; } @@ -2662,8 +2662,9 @@ table { &.title { display: inline-block; border-top: 4px solid $brand; + margin-bottom: 0; min-width: rem-calc(240); - padding-top: $line-height / 2; + padding: $line-height / 2 0; } } } @@ -2674,17 +2675,28 @@ table { clear: both; } - .debate { - margin: $line-height 0; + a { + + &.see-all { + border-bottom: 1px solid $border; + display: block; + font-size: $small-font-size; + margin: $line-height 0 $line-height / 2; + text-align: right; + width: 100%; + } } } .feed-image { display: inline-block; height: rem-calc(120); - margin: $line-height / 2 0; overflow: hidden; + @include breakpoint(medium) { + height: rem-calc(96); + } + img { margin-left: rem-calc(-15); max-width: none; @@ -2694,25 +2706,19 @@ table { .feed-description { - @include breakpoint(medium) { - padding-top: $line-height; - } - p { font-size: $small-font-size; + margin-bottom: 0; } } .feed-content { - border-bottom: 1px solid $border; - display: inline-block; - a { - - &.see-all { - font-size: $small-font-size; - margin: $line-height 0 $line-height / 2; - } + .debate, + .proposal { + margin-bottom: 0; + margin-top: 0; + padding: $line-height / 2 0; } } diff --git a/app/views/welcome/_feeds.html.erb b/app/views/welcome/_feeds.html.erb index 3a898d835..3d9548ff2 100644 --- a/app/views/welcome/_feeds.html.erb +++ b/app/views/welcome/_feeds.html.erb @@ -1,15 +1,15 @@ -