Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update npm and ruby dependencies #5393

Merged
merged 13 commits into from
Aug 6, 2014
Merged

Update npm and ruby dependencies #5393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b4e3992
Update npm dependencies
kaelig Aug 6, 2014
78e3b27
Optimise SVG with SVGO 0.4.5
kaelig Aug 6, 2014
a292cf2
Update scss-lint and Sass
kaelig Aug 6, 2014
8da55d2
Conform to new linting rule
kaelig Aug 6, 2014
63f919a
Merge branch 'master' of github.com:guardian/frontend into update-dep…
kaelig Aug 6, 2014
8edd90f
Optimise SVG
kaelig Aug 6, 2014
0004605
Revert "Optimise SVG"
kaelig Aug 6, 2014
83d0313
Revert "Update npm dependencies"
kaelig Aug 6, 2014
1f6284a
Revert "Optimise SVG with SVGO 0.4.5"
kaelig Aug 6, 2014
4bd9685
Merge branch 'master' of github.com:guardian/frontend into update-dep…
kaelig Aug 6, 2014
4729b1c
Force SVGO 0.4.4
kaelig Aug 6, 2014
1c86acf
Optimise big logo
kaelig Aug 6, 2014
bf6dded
Merge branch 'master' of github.com:guardian/frontend into update-dep…
kaelig Aug 6, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .scss-lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,9 @@ linters:
UnnecessaryMantissa:
enabled: true

UnnecessaryParentReference:
enabled: true

UrlFormat:
enabled: false

Expand Down
4 changes: 2 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
10 changes: 5 additions & 5 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion common/app/assets/images/global/guardian-logo-big.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion common/app/assets/stylesheets/module/_headline-list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
@include fs-bodyCopy(2);
}

& + & {
+ & {
border-top: 1px solid $c-neutral6;
}
}
Expand Down
4 changes: 2 additions & 2 deletions common/app/assets/stylesheets/module/_tabs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
color: inherit;
}

& + & a {
+ & a {
border-left: 2px solid rgba(255, 255, 255, .75);
@include rem((
padding-left: 6px
Expand All @@ -85,7 +85,7 @@
background: #ffffff;
}

& + .tabs__tab a {
+ .tabs__tab a {
border-left: 0;
@include rem((
padding-left: 8px
Expand Down
4 changes: 2 additions & 2 deletions common/app/assets/stylesheets/module/content/_live-blog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ $block-padding-right: $gs-gutter;
}
}

& + & {
+ & {
.dropdown__button {
border-top: 0 none;

Expand Down Expand Up @@ -848,7 +848,7 @@ $timeline-width: 14px;
border-top: 2px solid $c-neutral4;
}

& + &:before,
+ &:before,
.item:before,
.item__byline,
.item__meta {
Expand Down
2 changes: 1 addition & 1 deletion common/app/assets/stylesheets/module/facia/_row-pattern.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
&.facia-slice__item--content-type-video {
padding-bottom: 0;
}
& + .facia-slice__item {
+ .facia-slice__item {
@include vertical-item-separator;
}

Expand Down
2 changes: 1 addition & 1 deletion common/app/assets/stylesheets/module/football/_match-stat.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
float: left;
width: 49%;

& + & {
+ & {
float: right;
text-align: right;
}
Expand Down
4 changes: 2 additions & 2 deletions common/app/assets/stylesheets/module/football/_stats.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@
float: left;
width: 49.5%;

& + & {
+ & {
float: right;
}
}
Expand Down Expand Up @@ -281,7 +281,7 @@
vertical-align: top;
padding-bottom: ($gs-baseline/3)*2;

& + & {
+ & {
float: right;
}
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down