Merge pull request #5393 from guardian/update-dependencies

Update npm and ruby dependencies
guardian · Aug 6, 2014 · 481edd7 · 481edd7
2 parents 2189b4f + bf6dded
commit 481edd7
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 18 deletions.
diff --git a/.scss-lint.yml b/.scss-lint.yml
@@ -124,6 +124,9 @@ linters:
   UnnecessaryMantissa:
     enabled: true
 
+  UnnecessaryParentReference:
+    enabled: true
+
   UrlFormat:
     enabled: false
 

diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
-gem "sass", "~> 3.3.7"
+gem "sass", "~> 3.3.14"
 
 group :development do
-  gem "scss-lint", "0.25.1"
+  gem "scss-lint", "0.26.2"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,15 +2,15 @@ GEM
   remote: https://rubygems.org/
   specs:
     rainbow (2.0.0)
-    sass (3.3.11)
-    scss-lint (0.25.1)
+    sass (3.3.14)
+    scss-lint (0.26.2)
       rainbow (~> 2.0)
-      sass (~> 3.3.0)
+      sass (~> 3.3.0, >= 3.3.7)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
-  sass (~> 3.3.7)
-  scss-lint (= 0.25.1)
+  sass (~> 3.3.14)
+  scss-lint (= 0.26.2)
diff --git a/common/app/assets/images/global/guardian-logo-big.svg b/common/app/assets/images/global/guardian-logo-big.svg
diff --git a/common/app/assets/stylesheets/module/_headline-list.scss b/common/app/assets/stylesheets/module/_headline-list.scss
@@ -15,7 +15,7 @@
         @include fs-bodyCopy(2);
     }
 
-    & + & {
+    + & {
         border-top: 1px solid $c-neutral6;
     }
 }

diff --git a/common/app/assets/stylesheets/module/_tabs.scss b/common/app/assets/stylesheets/module/_tabs.scss
@@ -71,7 +71,7 @@
         color: inherit;
     }
 
-    & + & a {
+    + & a {
         border-left: 2px solid rgba(255, 255, 255, .75);
         @include rem((
             padding-left: 6px
@@ -85,7 +85,7 @@
         background: #ffffff;
     }
 
-    & + .tabs__tab a {
+    + .tabs__tab a {
         border-left: 0;
         @include rem((
             padding-left: 8px

diff --git a/common/app/assets/stylesheets/module/content/_live-blog.scss b/common/app/assets/stylesheets/module/content/_live-blog.scss
@@ -623,7 +623,7 @@ $block-padding-right: $gs-gutter;
         }
     }
 
-    & + & {
+    + & {
         .dropdown__button {
             border-top: 0 none;
 
@@ -848,7 +848,7 @@ $timeline-width: 14px;
         border-top: 2px solid $c-neutral4;
     }
 
-    & + &:before,
+    + &:before,
     .item:before,
     .item__byline,
     .item__meta {

diff --git a/common/app/assets/stylesheets/module/facia/_row-pattern.scss b/common/app/assets/stylesheets/module/facia/_row-pattern.scss
@@ -36,7 +36,7 @@
     &.facia-slice__item--content-type-video {
         padding-bottom: 0;
     }
-    & + .facia-slice__item {
+    + .facia-slice__item {
         @include vertical-item-separator;
     }
 

diff --git a/common/app/assets/stylesheets/module/football/_match-stat.scss b/common/app/assets/stylesheets/module/football/_match-stat.scss
@@ -11,7 +11,7 @@
     float: left;
     width: 49%;
 
-    & + & {
+    + & {
         float: right;
         text-align: right;
     }

diff --git a/common/app/assets/stylesheets/module/football/_stats.scss b/common/app/assets/stylesheets/module/football/_stats.scss
@@ -246,7 +246,7 @@
     float: left;
     width: 49.5%;
 
-    & + & {
+    + & {
         float: right;
     }
 }
@@ -281,7 +281,7 @@
     vertical-align: top;
     padding-bottom: ($gs-baseline/3)*2;
 
-    & + & {
+    + & {
         float: right;
     }
 }

diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
     "mkdirp": "^0.5.0",
     "moment": "^2.7.0",
     "phantomjs": "~1.9.1",
-    "svgo": "^0.4.4"
+    "svgo": "0.4.4"
   },
   "scripts": {
     "postinstall": "grunt hookmeup"