diff options
author | connorshea <connor.james.shea@gmail.com> | 2016-03-22 23:58:29 +0300 |
---|---|---|
committer | connorshea <connor.james.shea@gmail.com> | 2016-03-23 00:01:31 +0300 |
commit | edac38c4397342bcee57ccd135b742de877331d4 (patch) | |
tree | 87350cf081d8fdf4f7aed6a1da2b1d5841380ae1 | |
parent | 57dd206f12524807403a6f3146bde0e31ead79a9 (diff) |
Fixes last remaining lints and enables scss-lint test for GitLab CI.
With this, builds will now fail if they break the SCSS style guide (at
least, the parts enabled by the linter).
Discussed in #14299.
-rw-r--r-- | .csscomb.json | 32 | ||||
-rw-r--r-- | .gitlab-ci.yml | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/filters.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/fonts.scss | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/notify.scss | 10 |
6 files changed, 29 insertions, 22 deletions
diff --git a/.csscomb.json b/.csscomb.json index e353e6a63d0..741cc1488b5 100644 --- a/.csscomb.json +++ b/.csscomb.json @@ -1,16 +1,20 @@ { - "always-semicolon": true, - "color-case": "lower", - "block-indent": " ", - "color-shorthand": true, - "element-case": "lower", - "space-before-colon": "", - "space-after-colon": " ", - "space-before-combinator": " ", - "space-after-combinator": " ", - "space-between-declarations": "\n", - "space-before-opening-brace": " ", - "space-after-opening-brace": "\n", - "space-before-closing-brace": "\n", - "unitless-zero": true + "exclude": [ + "app/assets/stylesheets/framework/tw_bootstrap_variables.scss", + "app/assets/stylesheets/framework/fonts.scss" + ], + "always-semicolon": true, + "color-case": "lower", + "block-indent": " ", + "color-shorthand": true, + "element-case": "lower", + "space-before-colon": "", + "space-after-colon": " ", + "space-before-combinator": " ", + "space-after-combinator": " ", + "space-between-declarations": "\n", + "space-before-opening-brace": " ", + "space-after-opening-brace": "\n", + "space-before-closing-brace": "\n", + "unitless-zero": true } diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2ad63548d78..53f115c92c8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -128,7 +128,6 @@ scss-lint: - bundle exec rake scss_lint tags: - ruby - allow_failure: true brakeman: stage: test diff --git a/app/assets/stylesheets/framework/filters.scss b/app/assets/stylesheets/framework/filters.scss index 99e49a70923..b05c5df1bd8 100644 --- a/app/assets/stylesheets/framework/filters.scss +++ b/app/assets/stylesheets/framework/filters.scss @@ -15,7 +15,7 @@ @media (max-width: $screen-xs-max) { .filter-item { display: block; - margin: 0 0 10px 0; + margin: 0 0 10px; } } diff --git a/app/assets/stylesheets/framework/fonts.scss b/app/assets/stylesheets/framework/fonts.scss index 7a946109e3a..5f9685bc71a 100644 --- a/app/assets/stylesheets/framework/fonts.scss +++ b/app/assets/stylesheets/framework/fonts.scss @@ -1,3 +1,7 @@ +// Disabling "SpaceAfterPropertyColon" linter because the linter doesn't like +// the way the `src` property is formatted in this file. +// scss-lint:disable SpaceAfterPropertyColon + /* latin-ext */ @font-face { font-family: 'Source Sans Pro'; diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index 625a0bf69c6..95bdd6d1ea3 100644 --- a/app/assets/stylesheets/framework/nav.scss +++ b/app/assets/stylesheets/framework/nav.scss @@ -132,7 +132,7 @@ padding-bottom: 0; .btn, form, .dropdown, .dropdown-menu-toggle, .form-control { - margin: 0 0 10px 0; + margin: 0 0 10px; display: block; width: 100%; } diff --git a/app/assets/stylesheets/notify.scss b/app/assets/stylesheets/notify.scss index f1d42f80f56..0a13a7e0b54 100644 --- a/app/assets/stylesheets/notify.scss +++ b/app/assets/stylesheets/notify.scss @@ -3,12 +3,12 @@ img { height: auto; } p.details { - font-style:italic; - color:#777 + font-style: italic; + color: #777 } .footer p { - font-size:small; - color:#777 + font-size: small; + color: #777 } pre.commit-message { white-space: pre-wrap; @@ -20,5 +20,5 @@ pre.commit-message { color: #090; } .file-stats .deleted-file { - color: #B00; + color: #b00; } |