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

Merge pull request #4239 from consul/layout

Browse Source 
Simplify main layout styles
This commit is contained in:
Javi Martín
2020-11-23 18:23:33 +01:00
committed by GitHub
parent 682f374598 bb2e2fa0a3
commit 1fc74e7cfa
8 changed files with 16 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,7 +42,13 @@ body {
} }
body { body {
display: flex;
flex-direction: column;
font-size: $base-font-size; font-size: $base-font-size;
> .wrapper {
flex: 1;
}
} }
h1, h1,
@@ -214,19 +220,6 @@ a {
color: $check; color: $check;
} }
.wrapper {
min-height: 100%;
margin: 0 auto (-$line-height) * 12;
height: auto !important;
height: 100%;
}
.footer,
.push {
clear: both;
min-height: $line-height * 12;
}
.ie-callout { .ie-callout {
position: absolute; position: absolute;
top: 0; top: 0;
@@ -508,7 +501,8 @@ a {
// 02. Header // 02. Header
// ---------- // ----------
header { body > header,
.wrapper > header {
background: $brand; background: $brand;
border-bottom: 1px solid $border; border-bottom: 1px solid $border;
margin-bottom: $line-height; margin-bottom: $line-height;
@@ -932,7 +926,9 @@ footer {
.footer { .footer {
background: #f1f1f1; background: #f1f1f1;
clear: both;
margin-top: $line-height * 2; margin-top: $line-height * 2;
min-height: $line-height * 12;
padding-top: $line-height; padding-top: $line-height;
} }
@@ -999,8 +995,8 @@ footer {
.auth-page { .auth-page {
.wrapper { .footer {
margin: 0 auto (-$line-height) * 14; margin-top: 0;
} }
} }

6
app/assets/stylesheets/legislation_process.scss
View File

@@ -996,12 +996,6 @@
@include grid-row; @include grid-row;
margin-top: $line-height * 1.5; margin-top: $line-height * 1.5;
padding: 0 rem-calc(16); padding: 0 rem-calc(16);
> header {
background: none;
border: 0;
margin: 0;
}
} }
h4, h4,

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

@@ -131,8 +131,6 @@
// ---------------- // ----------------
@mixin admin-layout { @mixin admin-layout {
display: flex;
flex-direction: column;
> header { > header {
margin-bottom: 0; margin-bottom: 0;

6
app/views/layouts/_header.html.erb
View File

@@ -20,11 +20,11 @@
<%= t("application.menu") %> <%= t("application.menu") %>
</span> </span>
<div class="top-bar-title"> <h1 class="top-bar-title">
<%= link_to root_path, accesskey: "0" do %> <%= link_to root_path, accesskey: "0" do %>
<%= image_tag(image_path_for("logo_header.png"), class: "float-left", alt: t("layouts.header.logo")) %> <%= image_tag(image_path_for("logo_header.png"), class: "float-left", alt: setting["org_name"]) %>
<% end %> <% end %>
</div> </h1>
<div id="responsive-menu"> <div id="responsive-menu">
<div class="top-bar-right"> <div class="top-bar-right">

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

@@ -16,8 +16,6 @@
<body class="<%= yield (:body_class) %>"> <body class="<%= yield (:body_class) %>">
<%= raw setting["html.per_page_code_body"] %> <%= raw setting["html.per_page_code_body"] %>
<h1 class="show-for-sr"><%= setting["org_name"] %></h1>
<div class="wrapper <%= yield (:wrapper_class) %>"> <div class="wrapper <%= yield (:wrapper_class) %>">
<%= render "layouts/header", with_subnavigation: true %> <%= render "layouts/header", with_subnavigation: true %>
@@ -44,8 +42,6 @@
<%= render "layouts/flash" %> <%= render "layouts/flash" %>
<%= yield %> <%= yield %>
<div class="push"></div>
</div> </div>
<div class="footer"> <div class="footer">
<%= render "layouts/footer" %> <%= render "layouts/footer" %>

4
app/views/layouts/devise.html.erb
View File

@@ -12,7 +12,7 @@
<div class="auth-image small-12 medium-3 column"> <div class="auth-image small-12 medium-3 column">
<h1 class="logo margin"> <h1 class="logo margin">
<%= link_to root_path do %> <%= link_to root_path do %>
<%= image_tag(image_path_for("logo_header.png"), class: "float-left", alt: t("layouts.header.logo")) %> <%= image_tag(image_path_for("logo_header.png"), class: "float-left", alt: setting["org_name"]) %>
<% end %> <% end %>
</h1> </h1>
</div> </div>
@@ -28,8 +28,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="push"></div>
</div> </div>
<div class="footer"> <div class="footer">

1
config/locales/en/general.yml
View File

@@ -233,7 +233,6 @@ en:
collaborative_legislation: Collaborative legislation collaborative_legislation: Collaborative legislation
debates: Debates debates: Debates
locale: "Language:" locale: "Language:"
logo: CONSUL logo
management: Management management: Management
moderation: Moderation moderation: Moderation
valuation: Valuation valuation: Valuation

1
config/locales/es/general.yml
View File

@@ -233,7 +233,6 @@ es:
collaborative_legislation: Legislación colaborativa collaborative_legislation: Legislación colaborativa
debates: Debates debates: Debates
locale: "Idioma:" locale: "Idioma:"
logo: Logo de CONSUL
management: Gestión management: Gestión
moderation: Moderar moderation: Moderar
valuation: Evaluación valuation: Evaluación