From b549b9810866d48db6b65c661a288e4a0caa41d7 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Wed, 13 Apr 2016 12:50:13 +0100
Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20lint=20SCSS=20files=20that=20ha?=
 =?UTF-8?q?ve=20come=20from=20outside?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We should (and do) keep exact copies of SCSS files that have come from
elsewhere so that we can easily upgrade them. But sometimes they don’t
always pass our linting rules, or throw a lot of warnings, which is
noisy.

This commit:
- moves such files into their own subdirectory
- tells SCSS Lint to ignore files in this directory
---
 app/assets/stylesheets/_grids.scss                          | 4 ++++
 app/assets/stylesheets/app.scss                             | 2 +-
 app/assets/stylesheets/components/banner.scss               | 2 +-
 app/assets/stylesheets/components/email-message.scss        | 6 ++++--
 .../components/{ => vendor}/previous-next-navigation.scss   | 0
 app/assets/stylesheets/main.scss                            | 2 +-
 gulpfile.babel.js                                           | 6 +++++-
 7 files changed, 16 insertions(+), 6 deletions(-)
 rename app/assets/stylesheets/components/{ => vendor}/previous-next-navigation.scss (100%)

diff --git a/app/assets/stylesheets/_grids.scss b/app/assets/stylesheets/_grids.scss
index bb711f3e4..946e9d207 100644
--- a/app/assets/stylesheets/_grids.scss
+++ b/app/assets/stylesheets/_grids.scss
@@ -1,3 +1,7 @@
+.column-whole {
+  @include grid-column(1/1);
+}
+
 .column-three-quarters {
   @include grid-column(3/4);
 }
diff --git a/app/assets/stylesheets/app.scss b/app/assets/stylesheets/app.scss
index 1b2376488..a34ba0521 100644
--- a/app/assets/stylesheets/app.scss
+++ b/app/assets/stylesheets/app.scss
@@ -121,7 +121,7 @@ td {
   margin-bottom: 5px;
 }
 
-a[rel="external"] {
+a[rel='external'] {
   @include external-link-default;
   @include external-link-16;
   @include media(tablet) {
diff --git a/app/assets/stylesheets/components/banner.scss b/app/assets/stylesheets/components/banner.scss
index bf6fdf993..a669311c9 100644
--- a/app/assets/stylesheets/components/banner.scss
+++ b/app/assets/stylesheets/components/banner.scss
@@ -113,7 +113,7 @@
     margin-bottom: $gutter;
 
     &:last-child {
-      margin-bottom: 0
+      margin-bottom: 0;
     }
 
     & + p {
diff --git a/app/assets/stylesheets/components/email-message.scss b/app/assets/stylesheets/components/email-message.scss
index 6604495f2..990a52135 100644
--- a/app/assets/stylesheets/components/email-message.scss
+++ b/app/assets/stylesheets/components/email-message.scss
@@ -1,3 +1,5 @@
+$white-50-opaque: rgba($white, 0.5);
+
 .email-message {
 
   margin-bottom: $gutter;
@@ -76,9 +78,9 @@
       color: $white;
       border-style: solid;
       border-width: 3px;
-      border-colour: $white;
+      border-color: $white;
       border-radius: 6px;
-      box-shadow: 0 0 0 1px rgba($white, 0.5);
+      box-shadow: 0 0 0 1px $white-50-opaque;
 
       &:hover {
         background: $link-hover-colour;
diff --git a/app/assets/stylesheets/components/previous-next-navigation.scss b/app/assets/stylesheets/components/vendor/previous-next-navigation.scss
similarity index 100%
rename from app/assets/stylesheets/components/previous-next-navigation.scss
rename to app/assets/stylesheets/components/vendor/previous-next-navigation.scss
diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss
index 07c64ae0d..7bcfc9d86 100644
--- a/app/assets/stylesheets/main.scss
+++ b/app/assets/stylesheets/main.scss
@@ -47,7 +47,7 @@ $path: '/static/images/';
 @import 'components/browse-list';
 @import 'components/email-message';
 @import 'components/api-key';
-@import 'components/previous-next-navigation';
+@import 'components/vendor/previous-next-navigation';
 
 @import 'views/job';
 @import 'views/edit-template';
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index a6026fbe9..786a5b7ba 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -108,7 +108,11 @@ gulp.task('watchForChanges', function() {
 });
 
 gulp.task('lint:sass', () => gulp
-  .src(paths.src + 'stylesheets/**/*.scss')
+  .src([
+    paths.src + 'stylesheets/*.scss',
+    paths.src + 'stylesheets/components/*.scss',
+    paths.src + 'stylesheets/views/*.scss',
+  ])
     .pipe(plugins.sassLint())
     .pipe(plugins.sassLint.format(stylish))
     .pipe(plugins.sassLint.failOnError())