GitLab wurde erfolgreich aktualisiert. Durch regelmäßige Updates bleibt das THM GitLab sicher. Danke für Ihre Geduld.

Commit edac38c4 authored by connorshea's avatar connorshea

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.
parent 57dd206f
{ {
"always-semicolon": true, "exclude": [
"color-case": "lower", "app/assets/stylesheets/framework/tw_bootstrap_variables.scss",
"block-indent": " ", "app/assets/stylesheets/framework/fonts.scss"
"color-shorthand": true, ],
"element-case": "lower", "always-semicolon": true,
"space-before-colon": "", "color-case": "lower",
"space-after-colon": " ", "block-indent": " ",
"space-before-combinator": " ", "color-shorthand": true,
"space-after-combinator": " ", "element-case": "lower",
"space-between-declarations": "\n", "space-before-colon": "",
"space-before-opening-brace": " ", "space-after-colon": " ",
"space-after-opening-brace": "\n", "space-before-combinator": " ",
"space-before-closing-brace": "\n", "space-after-combinator": " ",
"unitless-zero": true "space-between-declarations": "\n",
"space-before-opening-brace": " ",
"space-after-opening-brace": "\n",
"space-before-closing-brace": "\n",
"unitless-zero": true
} }
...@@ -128,7 +128,6 @@ scss-lint: ...@@ -128,7 +128,6 @@ scss-lint:
- bundle exec rake scss_lint - bundle exec rake scss_lint
tags: tags:
- ruby - ruby
allow_failure: true
brakeman: brakeman:
stage: test stage: test
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
@media (max-width: $screen-xs-max) { @media (max-width: $screen-xs-max) {
.filter-item { .filter-item {
display: block; display: block;
margin: 0 0 10px 0; margin: 0 0 10px;
} }
} }
// 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 */ /* latin-ext */
@font-face { @font-face {
font-family: 'Source Sans Pro'; font-family: 'Source Sans Pro';
......
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
padding-bottom: 0; padding-bottom: 0;
.btn, form, .dropdown, .dropdown-menu-toggle, .form-control { .btn, form, .dropdown, .dropdown-menu-toggle, .form-control {
margin: 0 0 10px 0; margin: 0 0 10px;
display: block; display: block;
width: 100%; width: 100%;
} }
......
...@@ -3,12 +3,12 @@ img { ...@@ -3,12 +3,12 @@ img {
height: auto; height: auto;
} }
p.details { p.details {
font-style:italic; font-style: italic;
color:#777 color: #777
} }
.footer p { .footer p {
font-size:small; font-size: small;
color:#777 color: #777
} }
pre.commit-message { pre.commit-message {
white-space: pre-wrap; white-space: pre-wrap;
...@@ -20,5 +20,5 @@ pre.commit-message { ...@@ -20,5 +20,5 @@ pre.commit-message {
color: #090; color: #090;
} }
.file-stats .deleted-file { .file-stats .deleted-file {
color: #B00; color: #b00;
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment