diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2017-11-14 15:16:55 +0000 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2017-11-14 15:16:55 +0000 |
commit | 62287fec4f3dcfce99a1c8e083efb799720d97f2 (patch) | |
tree | bcd46ce69a7bdb549009a189ae60c81f95d4dae3 | |
parent | 3730d89fe8578ce827468ebebef9cd6e33ae89f4 (diff) | |
parent | d3b5ceaf9f936150a3b67a8433c23ed1d4e0b487 (diff) | |
download | gitlab-ce-62287fec4f3dcfce99a1c8e083efb799720d97f2.tar.gz |
Merge branch 'enable-scss-lint-unnecessary-mantissa' into 'master'
Enable UnnecessaryMantissa in scss-lint
See merge request gitlab-org/gitlab-ce!15255
-rw-r--r-- | .scss-lint.yml | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/files.scss | 8 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 6 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/environments.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/note_form.scss | 2 | ||||
-rw-r--r-- | changelogs/unreleased/enable-scss-lint-unnecessary-mantissa.yml | 5 |
6 files changed, 15 insertions, 10 deletions
diff --git a/.scss-lint.yml b/.scss-lint.yml index a855ef3c6e9..dcd4cac780a 100644 --- a/.scss-lint.yml +++ b/.scss-lint.yml @@ -241,7 +241,7 @@ linters: # Numeric values should not contain unnecessary fractional portions. UnnecessaryMantissa: - enabled: false + enabled: true # Do not use parent selector references (&) when they would otherwise # be unnecessary. diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss index 1247e5e4876..c2a3cd16e67 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -101,13 +101,13 @@ @for $i from 0 through 5 { .legend-box-#{$i} { - background-color: mix($blame-cyan, $blame-blue, $i / 5.0 * 100%); + background-color: mix($blame-cyan, $blame-blue, $i / 5 * 100%); } } @for $i from 1 through 4 { .legend-box-#{$i + 5} { - background-color: mix($blame-gray, $blame-cyan, $i / 4.0 * 100%); + background-color: mix($blame-gray, $blame-cyan, $i / 4 * 100%); } } } @@ -200,13 +200,13 @@ @for $i from 0 through 5 { td.blame-commit-age-#{$i} { - border-left-color: mix($blame-cyan, $blame-blue, $i / 5.0 * 100%); + border-left-color: mix($blame-cyan, $blame-blue, $i / 5 * 100%); } } @for $i from 1 through 4 { td.blame-commit-age-#{$i + 5} { - border-left-color: mix($blame-gray, $blame-cyan, $i / 4.0 * 100%); + border-left-color: mix($blame-gray, $blame-cyan, $i / 4 * 100%); } } } diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 2dafd1ce47c..cb2a237f574 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -163,7 +163,7 @@ $gl-text-color: #2e2e2e; $gl-text-color-secondary: #707070; $gl-text-color-tertiary: #949494; $gl-text-color-quaternary: #d6d6d6; -$gl-text-color-inverted: rgba(255, 255, 255, 1.0); +$gl-text-color-inverted: rgba(255, 255, 255, 1); $gl-text-color-secondary-inverted: rgba(255, 255, 255, .85); $gl-text-green: $green-600; $gl-text-green-hover: $green-700; @@ -486,8 +486,8 @@ $callout-success-color: $green-700; /* * Commit Page */ -$commit-max-width-marker-color: rgba(0, 0, 0, 0.0); -$commit-message-text-area-bg: rgba(0, 0, 0, 0.0); +$commit-max-width-marker-color: rgba(0, 0, 0, 0); +$commit-message-text-area-bg: rgba(0, 0, 0, 0); /* * Common diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss index 26c5f093c6b..b0795353ec1 100644 --- a/app/assets/stylesheets/pages/environments.scss +++ b/app/assets/stylesheets/pages/environments.scss @@ -173,7 +173,7 @@ .prometheus-graph-overlay { fill: none; - opacity: 0.0; + opacity: 0; pointer-events: all; } diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 14514b2f193..89f93a92f2e 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -7,7 +7,7 @@ .diff-file .diff-content { tr.line_holder:hover > td .line_note_link { - opacity: 1.0; + opacity: 1; filter: alpha(opacity = 100); } } diff --git a/changelogs/unreleased/enable-scss-lint-unnecessary-mantissa.yml b/changelogs/unreleased/enable-scss-lint-unnecessary-mantissa.yml new file mode 100644 index 00000000000..1049e94f312 --- /dev/null +++ b/changelogs/unreleased/enable-scss-lint-unnecessary-mantissa.yml @@ -0,0 +1,5 @@ +--- +title: Enable UnnecessaryMantissa in scss-lint +merge_request: 15255 +author: Takuya Noguchi +type: other |