From 1a143dfe0f894bbd8651e1d2273072ce23175048 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Tue, 25 Oct 2016 16:21:52 +0200 Subject: [PATCH 1/3] adds style for selection --- app/assets/stylesheets/layout.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index c180735eb..d850454d6 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -23,6 +23,11 @@ // 01. Global styles // ----------------- +::selection { + color: white; + background-color: $brand; +} + body { font-size: $base-font-size; } From 5c1e1f96ea4981ae0bbfe342ec53db6786ba981c Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Tue, 25 Oct 2016 16:23:45 +0200 Subject: [PATCH 2/3] deletes unused wrap class --- app/assets/stylesheets/layout.scss | 4 ---- app/views/debates/index.html.erb | 2 +- app/views/management/proposals/index.html.erb | 2 +- app/views/management/spending_proposals/index.html.erb | 2 +- app/views/proposals/index.html.erb | 2 +- app/views/proposals/summary.html.erb | 2 +- app/views/spending_proposals/index.html.erb | 2 +- 7 files changed, 6 insertions(+), 10 deletions(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index d850454d6..8052513fc 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -153,10 +153,6 @@ a { height: 100%; } -.wrap { - background: white; -} - .footer, .push { clear: both; min-height: $line-height*12; diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb index 22d628c65..2cd3f2d53 100644 --- a/app/views/debates/index.html.erb +++ b/app/views/debates/index.html.erb @@ -6,7 +6,7 @@ <% end %>
-
+
diff --git a/app/views/management/proposals/index.html.erb b/app/views/management/proposals/index.html.erb index e7966f0c5..fde056902 100644 --- a/app/views/management/proposals/index.html.erb +++ b/app/views/management/proposals/index.html.erb @@ -1,7 +1,7 @@
<%= render 'admin/shared/proposal_search', url: management_proposals_path %> -
+
diff --git a/app/views/management/spending_proposals/index.html.erb b/app/views/management/spending_proposals/index.html.erb index 49e4151d2..2178caf71 100644 --- a/app/views/management/spending_proposals/index.html.erb +++ b/app/views/management/spending_proposals/index.html.erb @@ -3,7 +3,7 @@ <%= render 'admin/shared/spending_proposal_search', url: management_spending_proposals_path %> -
+
diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb index 5efa3e24c..df9339619 100644 --- a/app/views/proposals/index.html.erb +++ b/app/views/proposals/index.html.erb @@ -6,7 +6,7 @@ <% end %>
-
+
diff --git a/app/views/proposals/summary.html.erb b/app/views/proposals/summary.html.erb index 38c56c963..d5bc22196 100644 --- a/app/views/proposals/summary.html.erb +++ b/app/views/proposals/summary.html.erb @@ -1,5 +1,5 @@
-
+
<%= render "shared/back_link" %> diff --git a/app/views/spending_proposals/index.html.erb b/app/views/spending_proposals/index.html.erb index 563b84e23..4e95fd8db 100644 --- a/app/views/spending_proposals/index.html.erb +++ b/app/views/spending_proposals/index.html.erb @@ -6,7 +6,7 @@ <% end %>
-
+
From 08db2faf86ef12238f9cfd28ae63077a6a42e445 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Tue, 25 Oct 2016 16:30:36 +0200 Subject: [PATCH 3/3] fixes breakpoint on mixins --- app/assets/stylesheets/mixins.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss index d772b8ace..5ffc534cb 100644 --- a/app/assets/stylesheets/mixins.scss +++ b/app/assets/stylesheets/mixins.scss @@ -13,7 +13,7 @@ font-size: rem-calc(24); font-weight: lighter; - @include breakpoint(small) { + @include breakpoint(medium) { line-height: $line-height*2; margin-top: 0; } @@ -22,7 +22,7 @@ height: 48px; width: 48px; - @include breakpoint(small) { + @include breakpoint(medium) { height: 80px; margin-right: $line-height/2; margin-top: 0;