BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 4658c9a2 by Annabel Dunstone Gray
Options

Merge branch 'enable-scss-lint-trailing-whitespace' into 'master'

Enable trailingWhitespace in scss-lint ## What does this MR do? Enables `trailingWhitespace` in `.scss-lint.yml` ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? Improve SCSS maintainability and consistency ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? #23485 See merge request !7077
parents c99d12e5 54801144
Showing with 26 additions and 26 deletions
.scss-lint.yml
...@@ -223,7 +223,7 @@ linters: ...@@ -223,7 +223,7 @@ linters:
# Reports lines containing trailing whitespace. # Reports lines containing trailing whitespace.
TrailingWhitespace: TrailingWhitespace:
enabled: false enabled: true
# Don't write trailing zeros for numeric values with a decimal point. # Don't write trailing zeros for numeric values with a decimal point.
TrailingZero: TrailingZero:
......
app/assets/stylesheets/framework/animations.scss
// This file is based off animate.css 3.5.1, available here: // This file is based off animate.css 3.5.1, available here:
// https://github.com/daneden/animate.css/blob/3.5.1/animate.css // https://github.com/daneden/animate.css/blob/3.5.1/animate.css
// //
// animate.css - http://daneden.me/animate // animate.css - http://daneden.me/animate
// Version - 3.5.1 // Version - 3.5.1
// Licensed under the MIT license - http://opensource.org/licenses/MIT // Licensed under the MIT license - http://opensource.org/licenses/MIT
// //
// Copyright (c) 2016 Daniel Eden // Copyright (c) 2016 Daniel Eden
.animated { .animated {
......
app/assets/stylesheets/framework/logo.scss
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
10%, 80% { 10%, 80% {
fill: $tanuki-red; fill: $tanuki-red;
} }
20%, 90% { 20%, 90% {
fill: lighten($tanuki-red, 25%); fill: lighten($tanuki-red, 25%);
} }
......
app/assets/stylesheets/pages/cycle_analytics.scss
...@@ -9,15 +9,15 @@ ...@@ -9,15 +9,15 @@
padding: 24px 0; padding: 24px 0;
border-bottom: none; border-bottom: none;
position: relative; position: relative;
@media (max-width: $screen-sm-min) { @media (max-width: $screen-sm-min) {
padding: 6px 0 24px; padding: 6px 0 24px;
} }
} }
.column { .column {
text-align: center; text-align: center;
@media (max-width: $screen-sm-min) { @media (max-width: $screen-sm-min) {
padding: 15px 0; padding: 15px 0;
} }
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
&:last-child { &:last-child {
text-align: right; text-align: right;
@media (max-width: $screen-sm-min) { @media (max-width: $screen-sm-min) {
text-align: center; text-align: center;
} }
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
.bordered-box { .bordered-box {
border: 1px solid $border-color; border: 1px solid $border-color;
border-radius: $border-radius-default; border-radius: $border-radius-default;
} }
.content-list { .content-list {
...@@ -73,10 +73,10 @@ ...@@ -73,10 +73,10 @@
font-weight: 600; font-weight: 600;
color: $gl-title-color; color: $gl-title-color;
} }
&.text { &.text {
color: $layout-link-gray; color: $layout-link-gray;
&.value-col { &.value-col {
color: $gl-title-color; color: $gl-title-color;
} }
...@@ -108,13 +108,13 @@ ...@@ -108,13 +108,13 @@
.svg-container { .svg-container {
text-align: center; text-align: center;
svg { svg {
width: 136px; width: 136px;
height: 136px; height: 136px;
} }
} }
.inner-content { .inner-content {
@media (max-width: $screen-sm-min) { @media (max-width: $screen-sm-min) {
padding: 0 28px; padding: 0 28px;
......
app/assets/stylesheets/pages/diff.scss
...@@ -222,12 +222,12 @@ ...@@ -222,12 +222,12 @@
top: 13px; top: 13px;
right: 7px; right: 7px;
} }
.frame { .frame {
top: 0; top: 0;
right: 0; right: 0;
position: absolute; position: absolute;
&.deleted { &.deleted {
margin: 0; margin: 0;
display: block; display: block;
......
app/assets/stylesheets/pages/environments.scss
...@@ -37,10 +37,10 @@ ...@@ -37,10 +37,10 @@
.branch-name { .branch-name {
color: $gl-dark-link-color; color: $gl-dark-link-color;
} }
.stop-env-link { .stop-env-link {
color: $table-text-gray; color: $table-text-gray;
.stop-env-icon { .stop-env-icon {
font-size: 14px; font-size: 14px;
} }
...@@ -48,11 +48,11 @@ ...@@ -48,11 +48,11 @@
.deployment { .deployment {
.build-column { .build-column {
.build-link { .build-link {
color: $gl-dark-link-color; color: $gl-dark-link-color;
} }
.avatar { .avatar {
float: none; float: none;
} }
......
app/assets/stylesheets/pages/events.scss
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
.event-last-push { .event-last-push {
overflow: auto; overflow: auto;
width: 100%; width: 100%;
.event-last-push-text { .event-last-push-text {
@include str-truncated(100%); @include str-truncated(100%);
padding: 4px 0; padding: 4px 0;
......
app/assets/stylesheets/pages/login.scss
...@@ -286,7 +286,7 @@ ...@@ -286,7 +286,7 @@
.new_user { .new_user {
position: relative; position: relative;
padding-bottom: 35px; padding-bottom: 35px;
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) { @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
.forgot-password { .forgot-password {
float: none !important; float: none !important;
......
app/assets/stylesheets/pages/merge_conflicts.scss
...@@ -254,7 +254,7 @@ $colors: ( ...@@ -254,7 +254,7 @@ $colors: (
border-top: solid 2px $border-green-extra-light; border-top: solid 2px $border-green-extra-light;
} }
} }
.editor { .editor {
pre { pre {
height: 350px; height: 350px;
......
app/assets/stylesheets/pages/notes.scss
...@@ -458,7 +458,7 @@ ul.notes { ...@@ -458,7 +458,7 @@ ul.notes {
.discussion-next-btn { .discussion-next-btn {
svg { svg {
margin: 0; margin: 0;
path { path {
fill: $gray-darkest; fill: $gray-darkest;
} }
......
app/assets/stylesheets/pages/status.scss
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
.ci-status-icon-success_with_warning { .ci-status-icon-success_with_warning {
color: $gl-warning; color: $gl-warning;
} }
.ci-status-icon-running { .ci-status-icon-running {
color: $blue-normal; color: $blue-normal;
} }
......
app/assets/stylesheets/pages/tree.scss
...@@ -29,11 +29,11 @@ ...@@ -29,11 +29,11 @@
.last-commit { .last-commit {
@include str-truncated(506px); @include str-truncated(506px);
@media (min-width: $screen-sm-max) and (max-width: $screen-md-max) { @media (min-width: $screen-sm-max) and (max-width: $screen-md-max) {
@include str-truncated(450px); @include str-truncated(450px);
} }
} }
.commit-history-link-spacer { .commit-history-link-spacer {
......
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