From f79f24a163a2087699e4df0b5e6f8c2e56c23a39 Mon Sep 17 00:00:00 2001 From: Eric Ronne Date: Tue, 14 Nov 2017 10:09:32 -0600 Subject: [PATCH 1/5] Shrunk logo on mobile, padding adjs, renamed "eiti" logo style to "nrrd" --- _sass/_variables.scss | 2 +- _sass/blocks/_header.scss | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/_sass/_variables.scss b/_sass/_variables.scss index d99f41864..44ee72418 100644 --- a/_sass/_variables.scss +++ b/_sass/_variables.scss @@ -1,7 +1,7 @@ @import 'lib/font-awesome/font-awesome/variables'; // Logos -$eiti-logo-width: 250px; +$nrrd-logo-width: 220px; // Typography $weight-light: 300; // (Lato Light) use diff --git a/_sass/blocks/_header.scss b/_sass/blocks/_header.scss index b247b3e07..e993c6996 100644 --- a/_sass/blocks/_header.scss +++ b/_sass/blocks/_header.scss @@ -25,7 +25,7 @@ header, .header { - margin-top: $base-padding-base; + margin-top: $base-padding; } .header-image_link { @@ -38,7 +38,7 @@ header, .header-image { max-width: 316px; - width: $eiti-logo-width; + width: $nrrd-logo-width; @include respond-to(medium-up) { width: auto; @@ -47,7 +47,7 @@ header, .header-left { @include span-columns(6); - margin-bottom: $base-padding; + margin-bottom: $base-padding-base; @include respond-to(medium-up) { @include span-columns(3); From 0380f5eadf4f143d05353b2f4db97fcf7df859a7 Mon Sep 17 00:00:00 2001 From: Eric Ronne Date: Tue, 14 Nov 2017 10:28:24 -0600 Subject: [PATCH 2/5] Indentation fix, by Order of Hound --- _sass/blocks/_header.scss | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/_sass/blocks/_header.scss b/_sass/blocks/_header.scss index e993c6996..b21a24748 100644 --- a/_sass/blocks/_header.scss +++ b/_sass/blocks/_header.scss @@ -46,14 +46,14 @@ header, } .header-left { - @include span-columns(6); - margin-bottom: $base-padding-base; - - @include respond-to(medium-up) { - @include span-columns(3); - margin-bottom: 0; - margin-top: 2rem; - } + @include span-columns(6); + margin-bottom: $base-padding-base; + + @include respond-to(medium-up) { + @include span-columns(3); + margin-bottom: 0; + margin-top: 2rem; + } } .header-right { From 3faebe9bc4a1d94b8e2eac8180b4e6a6a8a579ea Mon Sep 17 00:00:00 2001 From: Eric Ronne Date: Tue, 14 Nov 2017 14:40:20 -0600 Subject: [PATCH 3/5] Indenting --- _sass/blocks/_header.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_sass/blocks/_header.scss b/_sass/blocks/_header.scss index b21a24748..06bc8b6b2 100644 --- a/_sass/blocks/_header.scss +++ b/_sass/blocks/_header.scss @@ -47,12 +47,12 @@ header, .header-left { @include span-columns(6); - margin-bottom: $base-padding-base; + margin-bottom: $base-padding-base; @include respond-to(medium-up) { @include span-columns(3); - margin-bottom: 0; - margin-top: 2rem; + margin-bottom: 0; + margin-top: 2rem; } } From 5740fdc91c9ee7c1f48495e983d9607bca71d139 Mon Sep 17 00:00:00 2001 From: Eric Ronne Date: Tue, 14 Nov 2017 14:46:05 -0600 Subject: [PATCH 4/5] omg atom sheesh --- _sass/blocks/_header.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_sass/blocks/_header.scss b/_sass/blocks/_header.scss index 06bc8b6b2..06f09fe75 100644 --- a/_sass/blocks/_header.scss +++ b/_sass/blocks/_header.scss @@ -46,11 +46,11 @@ header, } .header-left { - @include span-columns(6); + @include span-columns(6); margin-bottom: $base-padding-base; - @include respond-to(medium-up) { - @include span-columns(3); + @include respond-to(medium-up) { + @include span-columns(3); margin-bottom: 0; margin-top: 2rem; } From c6cdbb652087971f40852071c153e09d9742ec7f Mon Sep 17 00:00:00 2001 From: Marco Segreto Date: Tue, 14 Nov 2017 13:51:08 -0800 Subject: [PATCH 5/5] Fix linting problems with tabs --- _sass/blocks/_header.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/_sass/blocks/_header.scss b/_sass/blocks/_header.scss index 06f09fe75..f1d0638bc 100644 --- a/_sass/blocks/_header.scss +++ b/_sass/blocks/_header.scss @@ -47,12 +47,12 @@ header, .header-left { @include span-columns(6); - margin-bottom: $base-padding-base; + margin-bottom: $base-padding-base; - @include respond-to(medium-up) { - @include span-columns(3); - margin-bottom: 0; - margin-top: 2rem; + @include respond-to(medium-up) { + @include span-columns(3); + margin-bottom: 0; + margin-top: 2rem; } }