From 1347cb0152c992f8b71e185fa7ef1794fc94d931 Mon Sep 17 00:00:00 2001
From: Geremia Taglialatela <tagliala@users.noreply.github.com>
Date: Fri, 8 Jul 2016 05:38:44 +0200
Subject: [PATCH] Update SCSS-Lint to v0.49.0 (#20250)

SCSS-Lint 0.49.0 modifies Shorthand linter to report lint if a shorthand
of a length not specified in the allowed_shorthands option is used.

New defaults include "4" in the list of allowed shorthands, so we are changing our configuration accordingly.

Ref: https://github.com/brigade/scss-lint/commit/e283d1689699f581561fea344df3168128c46d7b
---
 Gemfile             | 2 +-
 Gemfile.lock        | 6 +++---
 scss/.scss-lint.yml | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index bdcbb0949f..fb4cea1506 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,5 +4,5 @@ group :development, :test do
   gem 'jekyll', '~> 3.1.2'
   gem 'jekyll-redirect-from', '~> 0.10.0'
   gem 'jekyll-sitemap', '~> 0.10.0'
-  gem 'scss_lint', '~> 0.48.0'
+  gem 'scss_lint', '~> 0.49.0'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index c4786fdf33..ed510a095e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -33,9 +33,9 @@ GEM
     rouge (1.11.1)
     safe_yaml (1.0.4)
     sass (3.4.22)
-    scss_lint (0.48.0)
+    scss_lint (0.49.0)
       rake (>= 0.9, < 12)
-      sass (~> 3.4.15)
+      sass (~> 3.4.20)
 
 PLATFORMS
   ruby
@@ -45,7 +45,7 @@ DEPENDENCIES
   jekyll (~> 3.1.2)
   jekyll-redirect-from (~> 0.10.0)
   jekyll-sitemap (~> 0.10.0)
-  scss_lint (~> 0.48.0)
+  scss_lint (~> 0.49.0)
 
 BUNDLED WITH
    1.12.5
diff --git a/scss/.scss-lint.yml b/scss/.scss-lint.yml
index af837e4d03..66c63335c6 100644
--- a/scss/.scss-lint.yml
+++ b/scss/.scss-lint.yml
@@ -457,7 +457,7 @@ linters:
 
   Shorthand:
     enabled: true
-    allowed_shorthands: [1, 2, 3]
+    allowed_shorthands: [1, 2, 3, 4]
 
   SingleLinePerProperty:
     enabled: false