From c913687be5d1dad6792d0b7a52ccfa76c068c634 Mon Sep 17 00:00:00 2001 From: Alessandro Cuoghi Date: Wed, 26 Jul 2017 12:08:39 +0200 Subject: [PATCH] Moved below the header the recomended. Changed orbit-bullets diameter.Align text on the left. Used all width space for each container of the recomended. --- app/assets/stylesheets/_settings.scss | 2 +- app/assets/stylesheets/layout.scss | 45 ++++++++++++++++++++- app/views/layouts/application.html.erb | 2 +- app/views/welcome/_recommended.html.erb | 3 +- app/views/welcome/index.html.erb | 54 +++++++++++++------------ 5 files changed, 76 insertions(+), 30 deletions(-) diff --git a/app/assets/stylesheets/_settings.scss b/app/assets/stylesheets/_settings.scss index 33800fed5..a38071a05 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: 1.2rem; +$orbit-bullet-diameter: 0.8rem; $orbit-bullet-margin: 0.1rem; $orbit-bullet-margin-top: 0.8rem; $orbit-bullet-margin-bottom: 0.8rem; diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 5c4dcb567..e774d963c 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -2140,8 +2140,16 @@ table { // 19. Recommended Section Home // ----------- + +.home-page { + .push { + display: none; + } +} + .section-recommended { - padding-top: $line-height * 2; + padding: $line-height * 2 0; + // padding-bottom: $line-height * 2; h2 { margin-bottom: $line-height * 2; @@ -2163,10 +2171,11 @@ table { .card { .card-section { - padding: $line-height; + padding:$line-height 0; p { font-size: rem-calc(15); + text-align: left; } } @@ -2226,6 +2235,38 @@ table { h5 { font-size: rem-calc(14); + text-align: left; } } + + .carousel-image { + + .card .orbit { + height: 480px; + + .orbit-wrapper { + min-height: 450px; + max-height: 460px; + } + } + + .debates-inner, + .proposals-inner, + .budget-investments-inner { + max-height: 500px; + + @include breakpoint(small) { + max-height: 600px; + } + } + } + + .carousel-image .orbit-wrapper img { + display: block; + + @include breakpoint(small) { + margin: 0 auto; + } + } + } diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index f88a4f136..4ed17ed3d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -23,7 +23,7 @@ <%= setting['per_page_code_head'].try(:html_safe) %> - + <%= setting['per_page_code_body'].try(:html_safe) %>

<%= setting['org_name'] %>

diff --git a/app/views/welcome/_recommended.html.erb b/app/views/welcome/_recommended.html.erb index 3460c3a24..f1e23e081 100644 --- a/app/views/welcome/_recommended.html.erb +++ b/app/views/welcome/_recommended.html.erb @@ -1,7 +1,8 @@ -
+

<%= t("welcome.recommended.title") %>

+
<% centered_and_size_class = calculate_centered_and_size_class(recommended_debates, recommended_proposals, recommended_budget_investments) %> <% if recommended_debates.any? %> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index af894f023..da92dc54a 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -1,3 +1,5 @@ +<% content_for :body_class, "home-page" %> + <% content_for :canonical do %> <%= render "shared/canonical", href: root_url %> <% end %> @@ -21,31 +23,6 @@
-<% cache [locale_and_user_status, @featured_debates, @featured_proposals, 'featured'] do %> -
-
-
-

<%= t("welcome.debates.title") %>

-

<%= t("welcome.debates.description") %>

- -
-
-

<%= t("welcome.proposal.title") %>

-

<%= t("welcome.proposal.description") %>

-
- -
-

<%= t("welcome.decide.title") %>

-

<%= t("welcome.decide.description") %>

-
-
-

<%= t("welcome.do.title") %>

-

<%= t("welcome.do.description") %>

-
-
-
-<% end %> - <% if current_user.present? %> <% recommended_debates = current_user.recommended_debates %> @@ -59,3 +36,30 @@ <% end %> <% end %> + + + +<% cache [locale_and_user_status, @featured_debates, @featured_proposals, 'featured'] do %> +
+
+
+
+

<%= t("welcome.debates.title") %>

+

<%= t("welcome.debates.description") %>

+
+
+

<%= t("welcome.proposal.title") %>

+

<%= t("welcome.proposal.description") %>

+
+
+

<%= t("welcome.decide.title") %>

+

<%= t("welcome.decide.description") %>

+
+
+

<%= t("welcome.do.title") %>

+

<%= t("welcome.do.description") %>

+
+
+
+
+<% end %>