darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-06 19:48:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #437 from alphagov/tidy-scss

Browse Source 
Don’t lint SCSS files that have come from outside
This commit is contained in:
Chris Hill-Scott
2016-04-13 16:13:33 +01:00
parent 1beca5e84b b549b98108
commit 0a31949c73
7 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/_grids.scss
View File

@@ -1,3 +1,7 @@
.column-whole {
@include grid-column(1/1);
}
.column-three-quarters { .column-three-quarters {
@include grid-column(3/4); @include grid-column(3/4);
} }

2
app/assets/stylesheets/app.scss
View File

@@ -121,7 +121,7 @@ td {
margin-bottom: 5px; margin-bottom: 5px;
} }
a[rel="external"] { a[rel='external'] {
@include external-link-default; @include external-link-default;
@include external-link-16; @include external-link-16;
@include media(tablet) { @include media(tablet) {

2
app/assets/stylesheets/components/banner.scss
View File

@@ -113,7 +113,7 @@
margin-bottom: $gutter; margin-bottom: $gutter;
&:last-child { &:last-child {
margin-bottom: 0 margin-bottom: 0;
} }
& + p { & + p {

6
app/assets/stylesheets/components/email-message.scss
View File

@@ -1,3 +1,5 @@
$white-50-opaque: rgba($white, 0.5);
.email-message { .email-message {
margin-bottom: $gutter; margin-bottom: $gutter;
@@ -76,9 +78,9 @@
color: $white; color: $white;
border-style: solid; border-style: solid;
border-width: 3px; border-width: 3px;
border-colour: $white; border-color: $white;
border-radius: 6px; border-radius: 6px;
box-shadow: 0 0 0 1px rgba($white, 0.5); box-shadow: 0 0 0 1px $white-50-opaque;
&:hover { &:hover {
background: $link-hover-colour; background: $link-hover-colour;

0
app/assets/stylesheets/components/previous-next-navigation.scss → app/assets/stylesheets/components/vendor/previous-next-navigation.scss vendored
View File

2
app/assets/stylesheets/main.scss
View File

@@ -47,7 +47,7 @@ $path: '/static/images/';
@import 'components/browse-list'; @import 'components/browse-list';
@import 'components/email-message'; @import 'components/email-message';
@import 'components/api-key'; @import 'components/api-key';
@import 'components/previous-next-navigation'; @import 'components/vendor/previous-next-navigation';
@import 'views/job'; @import 'views/job';
@import 'views/edit-template'; @import 'views/edit-template';

6
gulpfile.babel.js
View File

@@ -108,7 +108,11 @@ gulp.task('watchForChanges', function() {
}); });
gulp.task('lint:sass', () => gulp 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())
.pipe(plugins.sassLint.format(stylish)) .pipe(plugins.sassLint.format(stylish))
.pipe(plugins.sassLint.failOnError()) .pipe(plugins.sassLint.failOnError())