Commit 0c967235 authored by Phil Hughes's avatar Phil Hughes

Merge branch '10938-fix-styleline-ee' into 'master'

EE: Adds EE folder in the stylelint command

Closes #10938

See merge request gitlab-org/gitlab-ee!10622
parents 76030d29 f2dd3a75
...@@ -13,17 +13,17 @@ ...@@ -13,17 +13,17 @@
margin: 0 4px; margin: 0 4px;
} }
&[data-plan="gold"] { &[data-plan='gold'] {
color: darken($gl-gold-plan, 20%); color: darken($gl-gold-plan, 20%);
svg g { fill: $gl-gold-plan; } svg g { fill: $gl-gold-plan; }
} }
&[data-plan="silver"] { &[data-plan='silver'] {
color: darken($gl-silver-plan, 20%); color: darken($gl-silver-plan, 20%);
svg g { fill: $gl-silver-plan; } svg g { fill: $gl-silver-plan; }
} }
&[data-plan="bronze"] { &[data-plan='bronze'] {
color: darken($gl-bronze-plan, 20%); color: darken($gl-bronze-plan, 20%);
svg g { fill: $gl-bronze-plan; } svg g { fill: $gl-bronze-plan; }
} }
......
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
} }
&.left-connector { &.left-connector {
@include flat-connector-before(88px) @include flat-connector-before(88px);
} }
&::after { &::after {
......
...@@ -5,21 +5,9 @@ $timeline-cell-width: 180px; ...@@ -5,21 +5,9 @@ $timeline-cell-width: 180px;
$border-style: 1px solid $border-gray-normal; $border-style: 1px solid $border-gray-normal;
$roadmap-gradient-dark-gray: rgba(0, 0, 0, 0.15); $roadmap-gradient-dark-gray: rgba(0, 0, 0, 0.15);
$roadmap-gradient-gray: rgba(255, 255, 255, 0.001); $roadmap-gradient-gray: rgba(255, 255, 255, 0.001);
$scroll-top-gradient: linear-gradient( $scroll-top-gradient: linear-gradient(to bottom, $roadmap-gradient-dark-gray 0%, $roadmap-gradient-gray 100%);
to bottom, $scroll-bottom-gradient: linear-gradient(to bottom, $roadmap-gradient-gray 0%, $roadmap-gradient-dark-gray 100%);
$roadmap-gradient-dark-gray 0%, $column-right-gradient: linear-gradient(to right, $roadmap-gradient-dark-gray 0%, $roadmap-gradient-gray 100%);
$roadmap-gradient-gray 100%
);
$scroll-bottom-gradient: linear-gradient(
to bottom,
$roadmap-gradient-gray 0%,
$roadmap-gradient-dark-gray 100%
);
$column-right-gradient: linear-gradient(
to right,
$roadmap-gradient-dark-gray 0%,
$roadmap-gradient-gray 100%
);
@keyframes colorTransitionDetailsCell { @keyframes colorTransitionDetailsCell {
from { from {
...@@ -145,7 +133,7 @@ $column-right-gradient: linear-gradient( ...@@ -145,7 +133,7 @@ $column-right-gradient: linear-gradient(
.roadmap-timeline-section .timeline-header-blank::after, .roadmap-timeline-section .timeline-header-blank::after,
.epics-list-section .epic-details-cell::after, .epics-list-section .epic-details-cell::after,
.skeleton-loader::after { .skeleton-loader::after {
content: ""; content: '';
position: absolute; position: absolute;
top: 0; top: 0;
right: -$grid-size; right: -$grid-size;
...@@ -229,7 +217,7 @@ $column-right-gradient: linear-gradient( ...@@ -229,7 +217,7 @@ $column-right-gradient: linear-gradient(
} }
.today-bar::before { .today-bar::before {
content: ""; content: '';
position: absolute; position: absolute;
top: -2px; top: -2px;
left: -3px; left: -3px;
...@@ -243,7 +231,7 @@ $column-right-gradient: linear-gradient( ...@@ -243,7 +231,7 @@ $column-right-gradient: linear-gradient(
&.scroll-top-shadow .timeline-header-blank::before { &.scroll-top-shadow .timeline-header-blank::before {
@include roadmap-scroll-mixin; @include roadmap-scroll-mixin;
content: ""; content: '';
position: absolute; position: absolute;
left: 0; left: 0;
bottom: -$grid-size; bottom: -$grid-size;
...@@ -360,21 +348,11 @@ $column-right-gradient: linear-gradient( ...@@ -360,21 +348,11 @@ $column-right-gradient: linear-gradient(
} }
&.start-date-undefined { &.start-date-undefined {
background: linear-gradient( background: linear-gradient(to right, $roadmap-gradient-gray 0%, $blue-200 50%, $blue-500 100%);
to right,
$roadmap-gradient-gray 0%,
$blue-200 50%,
$blue-500 100%
);
} }
&.end-date-undefined { &.end-date-undefined {
background: linear-gradient( background: linear-gradient(to right, $blue-500 0%, $blue-200 50%, $roadmap-gradient-gray 100%);
to right,
$blue-500 0%,
$blue-200 50%,
$roadmap-gradient-gray 100%
);
} }
} }
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
"prettier-staged-save": "node ./scripts/frontend/prettier.js save", "prettier-staged-save": "node ./scripts/frontend/prettier.js save",
"prettier-all": "node ./scripts/frontend/prettier.js check-all", "prettier-all": "node ./scripts/frontend/prettier.js check-all",
"prettier-all-save": "node ./scripts/frontend/prettier.js save-all", "prettier-all-save": "node ./scripts/frontend/prettier.js save-all",
"stylelint": "node node_modules/stylelint/bin/stylelint.js app/assets/stylesheets/**/*.* --custom-formatter node_modules/stylelint-error-string-formatter", "stylelint": "node node_modules/stylelint/bin/stylelint.js app/assets/stylesheets/**/*.* ee/app/assets/stylesheets/**/*.* --custom-formatter node_modules/stylelint-error-string-formatter",
"stylelint-file": "node node_modules/stylelint/bin/stylelint.js", "stylelint-file": "node node_modules/stylelint/bin/stylelint.js",
"stylelint-create-utility-map": "node scripts/frontend/stylelint/stylelint-utility-map.js", "stylelint-create-utility-map": "node scripts/frontend/stylelint/stylelint-utility-map.js",
"test": "yarn jest && yarn karma", "test": "yarn jest && yarn karma",
......
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