diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss index a2acbea13..30330aac1 100644 --- a/app/assets/stylesheets/debates.scss +++ b/app/assets/stylesheets/debates.scss @@ -487,13 +487,16 @@ font-weight: bold; } - h3 { - border-top: 2px solid $brand; - display: inline-block; - font-size: rem-calc(16); - margin: -1px 0 rem-calc(12); - padding-top: rem-calc(6); - text-transform: uppercase; + aside { + + h3 { + border-top: 2px solid $brand; + display: inline-block; + font-size: rem-calc(16); + margin: -1px 0 rem-calc(12); + padding-top: rem-calc(6); + text-transform: uppercase; + } } .votes { diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss index 5a7d4c6d7..0ac594b6d 100644 --- a/app/assets/stylesheets/participacion.scss +++ b/app/assets/stylesheets/participacion.scss @@ -302,13 +302,21 @@ header { font-size: rem-calc(16); margin-top: 0; - &.see-more { + &.see-more-debates { width: 100%; @media (min-width: $small-breakpoint) { width: auto; } } + + &.see-more-proposals { + @extend .see-more-debates; + + @media (min-width: $small-breakpoint) { + margin-left: rem-calc(12); + } + } } .home-page { @@ -329,7 +337,7 @@ header { @media (min-width: $small-breakpoint) { display: inline-block; margin-bottom: 0; - margin-left: rem-calc(24); + margin-left: rem-calc(12); } &:hover { @@ -656,7 +664,7 @@ header { @media (min-width: $small-breakpoint) { line-height: $line-height*3; margin-left: rem-calc(12); - margin-right: rem-calc(72); + margin-right: rem-calc(36); } &:after { @@ -772,7 +780,7 @@ footer { @extend .tags; h3 { - border-top: 1px solid $votes-border; + border-top: 2px solid $brand; display: inline-block; font-family: $font-family-sans-serif; font-size: rem-calc(16); diff --git a/app/assets/stylesheets/proposals.scss b/app/assets/stylesheets/proposals.scss index 5e5187297..0da187b6d 100644 --- a/app/assets/stylesheets/proposals.scss +++ b/app/assets/stylesheets/proposals.scss @@ -75,6 +75,7 @@ // } .total-supports { + color: $proposals; float: right; font-size: rem-calc(14); @@ -342,7 +343,6 @@ // } .total-supports { - color: $proposals; display: inline-block; line-height: $line-height; margin-left: rem-calc(24); @@ -456,13 +456,16 @@ font-weight: bold; } - h3 { - border-top: 2px solid $brand; - display: inline-block; - font-size: rem-calc(16); - margin: -1px 0 rem-calc(12); - padding-top: rem-calc(6); - text-transform: uppercase; + aside { + + h3 { + border-top: 2px solid $brand; + display: inline-block; + font-size: rem-calc(16); + margin: -1px 0 rem-calc(12); + padding-top: rem-calc(6); + text-transform: uppercase; + } } .supports { @@ -539,8 +542,8 @@ } .icon-proposals { - color: $debates; - font-size: rem-calc(60); + color: $proposals; + font-size: rem-calc(50); line-height: $line-height; opacity: .5; } @@ -563,7 +566,7 @@ margin: rem-calc(12) 0; &:before { - color: $debates; + color: $proposals; content: "l "; font-family: "icons" !important; } diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb index 256fe3755..38593a359 100644 --- a/app/views/debates/index.html.erb +++ b/app/views/debates/index.html.erb @@ -24,7 +24,7 @@ <% if @tag_filter || @search_terms %> -
+
<%= t("debates.index.select_order") %>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index e85fba66b..8eb5b9a8e 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -31,9 +31,10 @@