From 203bc740ac4bc423c5af2c07b07d2e252ea6a826 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Gonz=C3=A1lez?= Date: Thu, 12 Jan 2017 10:54:39 +0100 Subject: [PATCH 01/10] Adjust home and process index styles --- app/assets/stylesheets/legislation.scss | 4 +- .../stylesheets/legislation_process.scss | 117 +++++++++++------- .../legislation/processes/_key_dates.html.erb | 59 ++++----- .../legislation/processes/_process.html.erb | 5 +- .../processes/phase_empty.html.erb | 4 +- .../processes/phase_not_open.html.erb | 4 +- app/views/legislation/processes/show.html.erb | 4 +- 7 files changed, 115 insertions(+), 82 deletions(-) diff --git a/app/assets/stylesheets/legislation.scss b/app/assets/stylesheets/legislation.scss index c53216dd9..950f9ce23 100644 --- a/app/assets/stylesheets/legislation.scss +++ b/app/assets/stylesheets/legislation.scss @@ -9,7 +9,7 @@ // ----------------- .brand-heading { background: $brand; - margin-bottom: 2rem; + margin-bottom: 5rem; .column { padding-top: 10rem; @@ -58,7 +58,7 @@ // 03. Legislation cards // ----------------- .legislation { - margin: 0 0 4rem 0; + margin: 0 0 5rem 0; background: white; border: 1px solid; border-color: #e5e6e9 #dfe0e4 #d0d1d5; diff --git a/app/assets/stylesheets/legislation_process.scss b/app/assets/stylesheets/legislation_process.scss index d5ab74130..db6c9718e 100644 --- a/app/assets/stylesheets/legislation_process.scss +++ b/app/assets/stylesheets/legislation_process.scss @@ -34,6 +34,8 @@ font-weight: 700; } +$epigraph-font-size: rem-calc(15); + // 02. Hero // ----------------- .legislation-hero { @@ -63,7 +65,9 @@ #debate-info { display: none; - margin-top: 1rem; + margin-top: 3rem; + padding-top: 4rem; + border-top: 1px solid darken($border, 10%); @include breakpoint(medium) { margin-bottom: 2rem; @@ -80,6 +84,7 @@ } p { + font-size: $base-font-size; @include breakpoint(medium) { margin-left: 25%; } @@ -97,7 +102,7 @@ } .center .button { - background: #004A83; + background: $brand; margin-bottom: 0; } @@ -112,6 +117,14 @@ .description { margin-bottom: 1rem; + + p { + font-size: $epigraph-font-size; + } + + h4 { + font-size: $base-font-size; + } @include breakpoint(medium) { margin-bottom: 0; @@ -145,61 +158,75 @@ // ----------------- .legislation-process-categories { position: relative; - - svg { - position: absolute; - top: 1.5rem; - left: 0; - - @include breakpoint(medium) { - transform: rotate(-8deg); - top: 0.75rem; - } - } - - ul { - padding-top: 4rem; - list-style: none; - margin-left: 0; - padding-left: 0; + + .legislation-process-list { border-bottom: 1px solid $medium-gray; - - li { - cursor: pointer; + margin: 0 1rem 1rem 1rem; + + @include breakpoint(medium) { margin-left: 0; - display: inline-block; - margin-bottom: 1rem; - margin-right: 1rem; + } + + ul { + max-width: 75rem; + margin-left: auto; + margin-right: auto; + list-style: none; + padding-top: 4rem; + padding-left: 0; + margin-bottom: 0; + + @include breakpoint(medium) { + padding-left: 1rem; + } + + svg { + position: absolute; + top: 1.5rem; - @media (min-width: 950px) { - margin-right: 0; - margin-left: 3rem; - margin-bottom: 0; + @include breakpoint(medium) { + transform: rotate(-8deg); + top: 0.75rem; + } } - a, - h4 { - color: #6D6D6D; - margin-bottom: 0; - } - - a { - &:hover, &:active { - text-decoration: none; + li { + cursor: pointer; + display: inline-block; + margin: 0 1rem 1rem 0; + + &:first-of-type { + margin-left: 0; } - p { - margin-bottom: 0; + @media (min-width: 950px) { + margin: 0 0 0 3rem; + } - @include breakpoint(medium) { - margin-bottom: 1rem; + a, + h4 { + color: #6D6D6D; + margin-bottom: 0; + } + + a { + &:hover, &:active { + text-decoration: none; + } + + p { + margin-bottom: 0; + + @include breakpoint(medium) { + margin-bottom: 1rem; + } } } } - } - .active { - border-bottom: 2px solid $brand; + .active { + border-bottom: 2px solid $brand; + } } } } diff --git a/app/views/legislation/processes/_key_dates.html.erb b/app/views/legislation/processes/_key_dates.html.erb index a6d921c35..e64d99f08 100644 --- a/app/views/legislation/processes/_key_dates.html.erb +++ b/app/views/legislation/processes/_key_dates.html.erb @@ -1,29 +1,32 @@ -