From b67872263aa9f1883d8d22cd27a5ec3a2760f29f Mon Sep 17 00:00:00 2001 From: Paul Hayes Date: Mon, 15 Feb 2016 17:29:46 +0000 Subject: [PATCH 1/3] Update govuk-lint and sass-rails * Update govuk-lint to pickup sass linting * Update sass-rails and sass to fix bundle errors --- Gemfile | 2 +- Gemfile.lock | 33 ++++++++++++++++++--------------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/Gemfile b/Gemfile index 8eb7d0e89..ba230d100 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ gem 'govuk_frontend_toolkit', '2.0.1' gem 'logstasher', '0.6.1' gem 'plek', '1.11' gem 'rails', '4.1.14.1' -gem 'sass-rails', '~> 4.0.3' +gem 'sass-rails', '~> 5.0.4' gem 'slimmer', '9.0.1' gem 'uglifier', '>= 1.3.0' gem 'unicorn', '4.8' diff --git a/Gemfile.lock b/Gemfile.lock index 467e1f7f4..a23322d59 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -56,6 +56,7 @@ GEM xpath (~> 2.0) casperjs (1.0.0) coderay (1.1.0) + concurrent-ruby (1.0.0) crack (0.4.3) safe_yaml (~> 1.0.0) debug_inspector (0.0.2) @@ -72,12 +73,12 @@ GEM rest-client (~> 1.8.0) govuk-content-schema-test-helpers (1.1.0) json-schema (~> 2.5.1) - govuk-lint (0.5.3) + govuk-lint (0.6.1) rubocop (~> 0.35.0) + scss_lint (~> 0.44.0) govuk_frontend_toolkit (2.0.1) rails (>= 3.1.0) sass (>= 3.2.0) - hike (1.2.3) http-cookie (1.0.2) domain_name (~> 0.5) i18n (0.7.0) @@ -106,7 +107,7 @@ GEM mini_portile2 (~> 2.0.0.rc2) null_logger (0.0.1) parallel (1.6.1) - parser (2.3.0.4) + parser (2.3.0.6) ast (~> 2.2) plek (1.11.0) powerpack (0.1.1) @@ -161,12 +162,16 @@ GEM tins (<= 1.6.0) ruby-progressbar (1.7.5) safe_yaml (1.0.4) - sass (3.2.19) - sass-rails (4.0.5) + sass (3.4.21) + sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) - sass (~> 3.2.2) - sprockets (~> 2.8, < 3.0) - sprockets-rails (~> 2.0) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + scss_lint (0.44.0) + rake (~> 10.0) + sass (~> 3.4.15) slimmer (9.0.1) activesupport json @@ -176,18 +181,16 @@ GEM rack (>= 1.3.5) rest-client slop (3.6.0) - sprockets (2.12.4) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) + sprockets (3.5.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) thor (0.19.1) thread_safe (0.3.5) - tilt (1.4.1) + tilt (2.0.2) tins (1.6.0) tzinfo (1.2.2) thread_safe (~> 0.1) @@ -235,7 +238,7 @@ DEPENDENCIES rails (= 4.1.14.1) rails-i18n (>= 4.0.4) rails_translation_manager (~> 0.0.2) - sass-rails (~> 4.0.3) + sass-rails (~> 5.0.4) slimmer (= 9.0.1) uglifier (>= 1.3.0) unicorn (= 4.8) From 6efe114f5f0cb462a4ab265bfc99e6a5ebbdfdb5 Mon Sep 17 00:00:00 2001 From: Paul Hayes Date: Mon, 15 Feb 2016 17:50:48 +0000 Subject: [PATCH 2/3] Fix sass linting offences MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SpaceAroundOperator is useful for arithmetic with variables, however when doing `1/3`, the alternative `1 / 3` seems wrong – disable the linter for this instance. --- .../stylesheets/helpers/_available-languages.scss | 6 ++++-- app/assets/stylesheets/helpers/_dash-list.scss | 3 ++- app/assets/stylesheets/views/_service-manual.scss | 12 ++++++++---- .../stylesheets/views/_topical-event-about-page.scss | 1 + app/assets/stylesheets/views/_unpublishing.scss | 2 +- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/helpers/_available-languages.scss b/app/assets/stylesheets/helpers/_available-languages.scss index 3e8e517a9..4e0310a3c 100644 --- a/app/assets/stylesheets/helpers/_available-languages.scss +++ b/app/assets/stylesheets/helpers/_available-languages.scss @@ -7,7 +7,6 @@ padding: $gutter-half 0 $gutter-one-third; border-bottom: 1px solid $border-colour; - li { float: left; display: block; @@ -20,11 +19,13 @@ border-right: 0; } - a, span { + a, + span { display: block; margin-top: -1px; @include core-16; } + .direction-rtl & { direction: rtl; float: right; @@ -33,6 +34,7 @@ border-right: 0; margin: 3px 0 2px $gutter-one-third; padding: 0 0 0 $gutter-one-third; + &.last { border-left: 0; } diff --git a/app/assets/stylesheets/helpers/_dash-list.scss b/app/assets/stylesheets/helpers/_dash-list.scss index 5e6630dbf..2021a3678 100644 --- a/app/assets/stylesheets/helpers/_dash-list.scss +++ b/app/assets/stylesheets/helpers/_dash-list.scss @@ -9,12 +9,13 @@ @media (min-width: 1px) { // target modern browsers list-style-type: none; + &:before { content: "-"; position: relative; float: left; width: $gutter-half; - margin-left: $gutter-half*-1; + margin-left: $gutter-half * -1; } } } diff --git a/app/assets/stylesheets/views/_service-manual.scss b/app/assets/stylesheets/views/_service-manual.scss index 10aa05bb3..1e85df771 100644 --- a/app/assets/stylesheets/views/_service-manual.scss +++ b/app/assets/stylesheets/views/_service-manual.scss @@ -21,14 +21,16 @@ width: auto; min-width: 120px; - @include media(tablet){ + @include media(tablet) { padding-right: $gutter-one-third; } } + &.direction-rtl dt { float: right; clear: right; - @include media(tablet){ + + @include media(tablet) { padding-left: $gutter-one-third; padding-right: 0; } @@ -38,10 +40,11 @@ float: left; width: 55%; - @include media(tablet){ + @include media(tablet) { width: 70%; } } + &.direction-rtl dd { float: right; } @@ -53,10 +56,10 @@ } } - // Page contents .page-contents { margin-top: 1em; + @include media(tablet) { margin-top: 2em; } @@ -84,6 +87,7 @@ .govspeak-wrapper { padding-top: 0.9375em; + @include media(tablet) { padding-top: 1.875em; } diff --git a/app/assets/stylesheets/views/_topical-event-about-page.scss b/app/assets/stylesheets/views/_topical-event-about-page.scss index ed50d9a2c..c12901f34 100644 --- a/app/assets/stylesheets/views/_topical-event-about-page.scss +++ b/app/assets/stylesheets/views/_topical-event-about-page.scss @@ -3,6 +3,7 @@ @include sidebar-with-body; .offset-one-third { + // scss-lint:disable SpaceAroundOperator margin-left: percentage(1/3); } } diff --git a/app/assets/stylesheets/views/_unpublishing.scss b/app/assets/stylesheets/views/_unpublishing.scss index f375f5749..5d666f17a 100644 --- a/app/assets/stylesheets/views/_unpublishing.scss +++ b/app/assets/stylesheets/views/_unpublishing.scss @@ -1,5 +1,5 @@ .unpublishing { - margin-bottom: $gutter*2; + margin-bottom: $gutter * 2; .summary, .alternative { From a4b90ba560ea02494fd098bb58db25f75b0c69a2 Mon Sep 17 00:00:00 2001 From: Paul Hayes Date: Mon, 15 Feb 2016 17:54:03 +0000 Subject: [PATCH 3/3] Add sass linting to jenkins --- jenkins.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jenkins.sh b/jenkins.sh index 0664eae0b..92036dc4d 100755 --- a/jenkins.sh +++ b/jenkins.sh @@ -48,6 +48,8 @@ if [[ ${GIT_BRANCH} != "origin/master" ]]; then --format html --out rubocop-${GIT_COMMIT}.html \ --format clang \ Gemfile app test config + + bundle exec govuk-lint-sass app fi GOVUK_CONTENT_SCHEMAS_PATH=tmp/govuk-content-schemas bundle exec rake