Skip to content

G
gitlab-ce
Commit 375c910a authored by Clement Ho's avatar Clement Ho
Browse files
Options

Merge branch 'enable-scss-lint-space-after-comma' into 'master' 

Enable SpaceAfterComma in scss-lint

See merge request !12734
parents 919c9930 2fb911aa
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 18 deletions
.scss-lint.yml
View file @ 375c910a
...@@ -176,7 +176,7 @@ linters: ...@@ -176,7 +176,7 @@ linters:
# Commas in lists should be followed by a space. # Commas in lists should be followed by a space.
SpaceAfterComma: SpaceAfterComma:
enabled: false enabled: true
# Properties should be formatted with a single space separating the colon # Properties should be formatted with a single space separating the colon
# from the property's value. # from the property's value.
......
app/assets/stylesheets/framework/awards.scss
View file @ 375c910a
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
opacity: 0; opacity: 0;
transform: scale(.2); transform: scale(.2);
transform-origin: 0 -45px; transform-origin: 0 -45px;
transition: .3s cubic-bezier(.67,.06,.19,1.44); transition: .3s cubic-bezier(.67, .06, .19, 1.44);
transition-property: transform, opacity; transition-property: transform, opacity;
&.is-aligned-right { &.is-aligned-right {
......
app/assets/stylesheets/framework/variables.scss
View file @ 375c910a
...@@ -317,7 +317,7 @@ $badge-color: $gl-text-color-secondary; ...@@ -317,7 +317,7 @@ $badge-color: $gl-text-color-secondary;
/* /*
* Award emoji * Award emoji
*/ */
$award-emoji-menu-shadow: rgba(0,0,0,.175); $award-emoji-menu-shadow: rgba(0, 0, 0, .175);
$award-emoji-positive-add-bg: #fed159; $award-emoji-positive-add-bg: #fed159;
$award-emoji-positive-add-lines: #bb9c13; $award-emoji-positive-add-lines: #bb9c13;
...@@ -568,7 +568,7 @@ $kdb-color: #555; ...@@ -568,7 +568,7 @@ $kdb-color: #555;
$kdb-border: #ccc; $kdb-border: #ccc;
$kdb-border-bottom: #bbb; $kdb-border-bottom: #bbb;
$kdb-shadow: #bbb; $kdb-shadow: #bbb;
$body-text-shadow: rgba(255,255,255,0.01); $body-text-shadow: rgba(255, 255, 255, 0.01);
/* /*
* UI Dev Kit * UI Dev Kit
......
app/assets/stylesheets/highlight/white.scss
View file @ 375c910a
...@@ -113,7 +113,7 @@ $white-gc-bg: #eaf2f5; ...@@ -113,7 +113,7 @@ $white-gc-bg: #eaf2f5;
border-color: $line-removed-dark; border-color: $line-removed-dark;
a { a {
color: scale-color($line-number-old,$red: -30%, $green: -30%, $blue: -30%); color: scale-color($line-number-old, $red: -30%, $green: -30%, $blue: -30%);
} }
} }
...@@ -122,7 +122,7 @@ $white-gc-bg: #eaf2f5; ...@@ -122,7 +122,7 @@ $white-gc-bg: #eaf2f5;
border-color: $line-added-dark; border-color: $line-added-dark;
a { a {
color: scale-color($line-number-new,$red: -30%, $green: -30%, $blue: -30%); color: scale-color($line-number-new, $red: -30%, $green: -30%, $blue: -30%);
} }
} }
...@@ -163,7 +163,7 @@ $white-gc-bg: #eaf2f5; ...@@ -163,7 +163,7 @@ $white-gc-bg: #eaf2f5;
background-color: $line-removed; background-color: $line-removed;
&::before { &::before {
color: scale-color($line-number-old,$red: -30%, $green: -30%, $blue: -30%); color: scale-color($line-number-old, $red: -30%, $green: -30%, $blue: -30%);
} }
span.idiff { span.idiff {
...@@ -175,7 +175,7 @@ $white-gc-bg: #eaf2f5; ...@@ -175,7 +175,7 @@ $white-gc-bg: #eaf2f5;
background-color: $line-added; background-color: $line-added;
&::before { &::before {
color: scale-color($line-number-new,$red: -30%, $green: -30%, $blue: -30%); color: scale-color($line-number-new, $red: -30%, $green: -30%, $blue: -30%);
} }
span.idiff { span.idiff {
......
app/assets/stylesheets/new_sidebar.scss
View file @ 375c910a
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
@import 'framework/tw_bootstrap_variables'; @import 'framework/tw_bootstrap_variables';
@import "bootstrap/variables"; @import "bootstrap/variables";
$active-background: rgba(0,0,0,.04); $active-background: rgba(0, 0, 0, .04);
$active-border: $indigo-500; $active-border: $indigo-500;
$active-color: $indigo-700; $active-color: $indigo-700;
$active-hover-background: $active-background; $active-hover-background: $active-background;
$active-hover-color: $gl-text-color; $active-hover-color: $gl-text-color;
$inactive-badge-background: rgba(0,0,0,.08); $inactive-badge-background: rgba(0, 0, 0, .08);
$hover-background: $indigo-700; $hover-background: $indigo-700;
$hover-color: $white-light; $hover-color: $white-light;
$inactive-color: $gl-text-color-secondary; $inactive-color: $gl-text-color-secondary;
......
app/assets/stylesheets/pages/builds.scss
View file @ 375c910a
...@@ -6,26 +6,26 @@ ...@@ -6,26 +6,26 @@
@keyframes blinking-dots { @keyframes blinking-dots {
0% { 0% {
background-color: rgba($white-light, 1); background-color: rgba($white-light, 1);
box-shadow: 12px 0 0 0 rgba($white-light,0.2), box-shadow: 12px 0 0 0 rgba($white-light, 0.2),
24px 0 0 0 rgba($white-light,0.2); 24px 0 0 0 rgba($white-light, 0.2);
} }
25% { 25% {
background-color: rgba($white-light, 0.4); background-color: rgba($white-light, 0.4);
box-shadow: 12px 0 0 0 rgba($white-light,2), box-shadow: 12px 0 0 0 rgba($white-light, 2),
24px 0 0 0 rgba($white-light,0.2); 24px 0 0 0 rgba($white-light, 0.2);
} }
75% { 75% {
background-color: rgba($white-light, 0.4); background-color: rgba($white-light, 0.4);
box-shadow: 12px 0 0 0 rgba($white-light,0.2), box-shadow: 12px 0 0 0 rgba($white-light, 0.2),
24px 0 0 0 rgba($white-light,1); 24px 0 0 0 rgba($white-light, 1);
} }
100% { 100% {
background-color: rgba($white-light, 1); background-color: rgba($white-light, 1);
box-shadow: 12px 0 0 0 rgba($white-light,0.2), box-shadow: 12px 0 0 0 rgba($white-light, 0.2),
24px 0 0 0 rgba($white-light,0.2); 24px 0 0 0 rgba($white-light, 0.2);
} }
} }
......
changelogs/unreleased/enable-scss-lint-space-after-comma.yml 0 → 100644
View file @ 375c910a
---
title: Enable SpaceAfterComma in scss-lint
merge_request: 12734
author: Takuya Noguchi
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7