consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Alessandro Cuoghi
2017-07-26 12:08:39 +02:00
committed by taitus
parent ee0a10855d
commit c913687be5
5 changed files with 76 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/_settings.scss
View File

@@ -411,7 +411,7 @@ $maincontent-shadow: 0 0 10px rgba($black, 0.5);
$orbit-bullet-background: $medium-gray; $orbit-bullet-background: $medium-gray;
$orbit-bullet-background-active: $dark-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: 0.1rem;
$orbit-bullet-margin-top: 0.8rem; $orbit-bullet-margin-top: 0.8rem;
$orbit-bullet-margin-bottom: 0.8rem; $orbit-bullet-margin-bottom: 0.8rem;

45
app/assets/stylesheets/layout.scss
View File

@@ -2140,8 +2140,16 @@ table {
// 19. Recommended Section Home // 19. Recommended Section Home
// ----------- // -----------
.home-page {
.push {
display: none;
}
}
.section-recommended { .section-recommended {
padding-top: $line-height * 2; padding: $line-height * 2 0;
// padding-bottom: $line-height * 2;
h2 { h2 {
margin-bottom: $line-height * 2; margin-bottom: $line-height * 2;
@@ -2163,10 +2171,11 @@ table {
.card { .card {
.card-section { .card-section {
padding: $line-height; padding:$line-height 0;
p { p {
font-size: rem-calc(15); font-size: rem-calc(15);
text-align: left;
} }
} }
@@ -2226,6 +2235,38 @@ table {
h5 { h5 {
font-size: rem-calc(14); 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;
}
}
}

2
app/views/layouts/application.html.erb
View File

@@ -23,7 +23,7 @@
<%= setting['per_page_code_head'].try(:html_safe) %> <%= setting['per_page_code_head'].try(:html_safe) %>
</head> </head>
<body> <body class="<%= yield (:body_class) %>">
<%= setting['per_page_code_body'].try(:html_safe) %> <%= setting['per_page_code_body'].try(:html_safe) %>
<h1 class="show-for-sr"><%= setting['org_name'] %></h1> <h1 class="show-for-sr"><%= setting['org_name'] %></h1>

3
app/views/welcome/_recommended.html.erb
View File

@@ -1,7 +1,8 @@
<div class="highlight small-12 column section-recommended"> <div class="small-12 column section-recommended padding">
<div class="row"> <div class="row">
<h2 class="text-center"><%= t("welcome.recommended.title") %></h2> <h2 class="text-center"><%= t("welcome.recommended.title") %></h2>
<!-- Add the carousel-image class to show the pictures -->
<div class="small-12 column carousel-image"> <div class="small-12 column carousel-image">
<% centered_and_size_class = calculate_centered_and_size_class(recommended_debates, recommended_proposals, recommended_budget_investments) %> <% centered_and_size_class = calculate_centered_and_size_class(recommended_debates, recommended_proposals, recommended_budget_investments) %>
<% if recommended_debates.any? %> <% if recommended_debates.any? %>

54
app/views/welcome/index.html.erb
View File

@@ -1,3 +1,5 @@
<% content_for :body_class, "home-page" %>
<% content_for :canonical do %> <% content_for :canonical do %>
<%= render "shared/canonical", href: root_url %> <%= render "shared/canonical", href: root_url %>
<% end %> <% end %>
@@ -21,31 +23,6 @@
</div> </div>
</div> </div>
<% cache [locale_and_user_status, @featured_debates, @featured_proposals, 'featured'] do %>
<main>
<div class="row text-center margin">
<div class="small-12 medium-3 column">
<h2><%= t("welcome.debates.title") %></h2>
<p><%= t("welcome.debates.description") %></p>
</div>
<div class="small-12 medium-3 column">
<h2><%= t("welcome.proposal.title") %></h2>
<p><%= t("welcome.proposal.description") %></p>
</div>
<div class="small-12 medium-3 column">
<h2><%= t("welcome.decide.title") %></h2>
<p><%= t("welcome.decide.description") %></p>
</div>
<div class="small-12 medium-3 column">
<h2><%= t("welcome.do.title") %></h2>
<p><%= t("welcome.do.description") %></p>
</div>
</div>
</main>
<% end %>
<% if current_user.present? %> <% if current_user.present? %>
<% recommended_debates = current_user.recommended_debates %> <% recommended_debates = current_user.recommended_debates %>
@@ -59,3 +36,30 @@
<% end %> <% end %>
<% end %> <% end %>
<% cache [locale_and_user_status, @featured_debates, @featured_proposals, 'featured'] do %>
<main>
<div class="highlight small-12 column text-center">
<div class="row margin padding">
<div class="small-12 medium-3 column">
<h2><%= t("welcome.debates.title") %></h2>
<p><%= t("welcome.debates.description") %></p>
</div>
<div class="small-12 medium-3 column">
<h2><%= t("welcome.proposal.title") %></h2>
<p><%= t("welcome.proposal.description") %></p>
</div>
<div class="small-12 medium-3 column">
<h2><%= t("welcome.decide.title") %></h2>
<p><%= t("welcome.decide.description") %></p>
</div>
<div class="small-12 medium-3 column">
<h2><%= t("welcome.do.title") %></h2>
<p><%= t("welcome.do.description") %></p>
</div>
</div>
</div>
</main>
<% end %>