From 367b43fd31ebb8a7ca797b04a7ce1f4bd6c55228 Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 3 Oct 2017 13:51:15 +0200 Subject: [PATCH 1/5] adds polls index orders on ignore i18n-tasks --- config/i18n-tasks.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index 156a38eff..427fec5ad 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -154,6 +154,7 @@ ignore_unused: - 'users.show.filters.*' - 'polls.index.filters.*' - 'polls.index.section_header.*' + - 'polls.index.orders.*' - 'debates.index.select_order' - 'debates.index.orders.*' - 'debates.index.section_header.*' From 894bda92ba3e2e2d84ea3748aa610ced858db08e Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 3 Oct 2017 13:53:57 +0200 Subject: [PATCH 2/5] moves custom setting to consul settings css --- app/assets/stylesheets/_consul_settings.scss | 2 ++ app/assets/stylesheets/_settings.scss | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/_consul_settings.scss b/app/assets/stylesheets/_consul_settings.scss index 0844f861f..1f03c9be7 100644 --- a/app/assets/stylesheets/_consul_settings.scss +++ b/app/assets/stylesheets/_consul_settings.scss @@ -75,3 +75,5 @@ $accordion-content-color: foreground($accordion-background, $text); $tab-item-font-size: $base-font-size; $tab-item-padding: $line-height / 2 0; $tab-content-border: $border; + +$orbit-bullet-diameter: 0.8rem; diff --git a/app/assets/stylesheets/_settings.scss b/app/assets/stylesheets/_settings.scss index a38071a05..33800fed5 100644 --- a/app/assets/stylesheets/_settings.scss +++ b/app/assets/stylesheets/_settings.scss @@ -411,7 +411,7 @@ $maincontent-shadow: 0 0 10px rgba($black, 0.5); $orbit-bullet-background: $medium-gray; $orbit-bullet-background-active: $dark-gray; -$orbit-bullet-diameter: 0.8rem; +$orbit-bullet-diameter: 1.2rem; $orbit-bullet-margin: 0.1rem; $orbit-bullet-margin-top: 0.8rem; $orbit-bullet-margin-bottom: 0.8rem; From d39c2c6e9edb45f4510248236e5c78269928ddb6 Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 3 Oct 2017 13:55:59 +0200 Subject: [PATCH 3/5] cleans css format --- app/assets/stylesheets/layout.scss | 37 ++++++++++++----------- app/assets/stylesheets/mixins.scss | 8 +++-- app/assets/stylesheets/participation.scss | 2 +- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 44b450779..b9f79430e 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -343,11 +343,9 @@ a { } .truncate-horizontal-text { - white-space: nowrap; overflow: hidden; text-overflow: ellipsis; - -o-text-overflow: ellipsis; - -ms-text-overflow: ellipsis; + white-space: nowrap; } .align-top { @@ -633,7 +631,7 @@ header { text-align: left; @include breakpoint(medium) { - margin-right: rem-calc(24); + margin-right: $line-height; } &:hover { @@ -2183,9 +2181,10 @@ table { } // 19. Recommended Section Home -// ----------- +// ---------------------------- .home-page { + .push { display: none; } @@ -2219,7 +2218,7 @@ table { .card-section { padding: $line-height 0; - max-width: 300px; + max-width: rem-calc(300); margin: 0 auto; p { @@ -2229,10 +2228,10 @@ table { } .orbit { - height: 300px; + height: rem-calc(300); .orbit-wrapper { - max-height: 250px; + max-height: rem-calc(250); overflow: hidden; position: relative; } @@ -2248,7 +2247,7 @@ table { background: image-url('truncate.png'); background-repeat: repeat-x; bottom: 0; - height: 20px; + height: rem-calc(20); position: absolute; width: 100%; } @@ -2269,21 +2268,21 @@ table { .proposals-inner, .budget-investments-inner { background: #fff; - max-height: 350px; + max-height: rem-calc(350); @include breakpoint(small) { - max-height: 400px; + max-height: rem-calc(400); } h4 { margin-top: $line-height; margin-bottom: 0; font-size: rem-calc(18); - min-height: 50px; + min-height: rem-calc(50); } h5 { - font-size: rem-calc(14); + font-size: $small-font-size; text-align: left; } } @@ -2291,20 +2290,20 @@ table { .carousel-image { .card .orbit { - height: 480px; + height: rem-calc(480); .orbit-wrapper { - max-height: 450px; + max-height: rem-calc(450); } } .debates-inner, .proposals-inner, .budget-investments-inner { - max-height: 500px; + max-height: rem-calc(500); @include breakpoint(small) { - max-height: 600px; + max-height: rem-calc(600); } } } @@ -2318,7 +2317,9 @@ table { } } -// 19. Documents +// 20. Documents +// ------------- + .documents-list { table { diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss index 1aa51d1a6..ac3c0a923 100644 --- a/app/assets/stylesheets/mixins.scss +++ b/app/assets/stylesheets/mixins.scss @@ -2,7 +2,8 @@ // // 01. Logo // 02. Orbit bullets -// +// 03. Direct uploads +// ------------------ // 01. Logo // -------- @@ -34,6 +35,7 @@ // 02. Orbit bullet // ---------------- + @mixin orbit-bullets { @include disable-mouse-outline; position: relative; @@ -59,8 +61,9 @@ } } -// 02. Direct uploads +// 03. Direct uploads // ------------------ + @mixin direct-uploads { .cached-image { @@ -133,5 +136,4 @@ .loading-bar.no-transition { transition: none; } - } diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index b1edc246d..c0eb6eed7 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -825,7 +825,7 @@ background: image-url('truncate.png'); background-repeat: repeat-x; bottom: 0; - height: 24px; + height: rem-calc(24); position: absolute; width: 100%; } From 5e9a452e55e31d88e8bdeb029a4b4f536dc1626f Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 3 Oct 2017 13:56:16 +0200 Subject: [PATCH 4/5] removes unnecessary blank space --- app/views/budgets/investments/_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/budgets/investments/_form.html.erb b/app/views/budgets/investments/_form.html.erb index 8a19c188a..b3bbf4e14 100644 --- a/app/views/budgets/investments/_form.html.erb +++ b/app/views/budgets/investments/_form.html.erb @@ -41,7 +41,7 @@ parent_class: "budget_investment" %> - <% end %> + <% end %>
<%= f.text_field :location %> From c32a70d2a92ab8f2500bde1d26553df70169ca29 Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 3 Oct 2017 13:57:01 +0200 Subject: [PATCH 5/5] improves css for items on list with images --- app/assets/stylesheets/participation.scss | 9 ++++----- app/views/budgets/investments/_investment.html.erb | 4 ++-- app/views/proposals/_proposal.html.erb | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index c0eb6eed7..565803114 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -668,16 +668,15 @@ padding-top: 100%; } } - - .column:first-child { - text-align: center; - } } @include breakpoint(medium) { .panel { - padding: 0 $line-height / 2 0 0; + + &.with-image { + padding: 0 $line-height / 2 0 0; + } .no-image { height: 100%; diff --git a/app/views/budgets/investments/_investment.html.erb b/app/views/budgets/investments/_investment.html.erb index 2c6269a3f..ecfdcb3c7 100644 --- a/app/views/budgets/investments/_investment.html.erb +++ b/app/views/budgets/investments/_investment.html.erb @@ -1,8 +1,8 @@
-
+
-
+
<% if investment.image.present? %> <%= image_tag investment.image_url(:thumb), alt: investment.image.title %> diff --git a/app/views/proposals/_proposal.html.erb b/app/views/proposals/_proposal.html.erb index be5ac8e17..2f5c22c3c 100644 --- a/app/views/proposals/_proposal.html.erb +++ b/app/views/proposals/_proposal.html.erb @@ -1,11 +1,11 @@
Proposal.votes_needed_for_success) %>" data-type="proposal"> -
+
-
+
<% if proposal.image.present? %> <%= image_tag proposal.image_url(:thumb), alt: proposal.image.title %>