Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
bc09ea58
Commit
bc09ea58
authored
Jul 12, 2017
by
Takuya Noguchi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable DeclarationOrder in scss-lint
parent
4daa6da5
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
29 additions
and
23 deletions
+29
-23
.scss-lint.yml
.scss-lint.yml
+3
-2
app/assets/stylesheets/framework/awards.scss
app/assets/stylesheets/framework/awards.scss
+1
-1
app/assets/stylesheets/framework/dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+2
-2
app/assets/stylesheets/framework/markdown_area.scss
app/assets/stylesheets/framework/markdown_area.scss
+1
-1
app/assets/stylesheets/framework/responsive-tables.scss
app/assets/stylesheets/framework/responsive-tables.scss
+1
-1
app/assets/stylesheets/pages/commits.scss
app/assets/stylesheets/pages/commits.scss
+1
-1
app/assets/stylesheets/pages/cycle_analytics.scss
app/assets/stylesheets/pages/cycle_analytics.scss
+4
-4
app/assets/stylesheets/pages/diff.scss
app/assets/stylesheets/pages/diff.scss
+4
-4
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+2
-1
app/assets/stylesheets/pages/pipeline_schedules.scss
app/assets/stylesheets/pages/pipeline_schedules.scss
+1
-1
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+1
-1
app/assets/stylesheets/pages/ui_dev_kit.scss
app/assets/stylesheets/pages/ui_dev_kit.scss
+4
-4
changelogs/unreleased/enable-scss-lint-declaration-order.yml
changelogs/unreleased/enable-scss-lint-declaration-order.yml
+4
-0
No files found.
.scss-lint.yml
View file @
bc09ea58
...
@@ -43,10 +43,11 @@ linters:
...
@@ -43,10 +43,11 @@ linters:
# Rule sets should be ordered as follows:
# Rule sets should be ordered as follows:
# - @extend declarations
# - @extend declarations
# - @include declarations without inner @content
# - @include declarations without inner @content
# - properties, @include declarations with inner @content
# - properties
# - @include declarations with inner @content
# - nested rule sets.
# - nested rule sets.
DeclarationOrder
:
DeclarationOrder
:
enabled
:
fals
e
enabled
:
tru
e
# `scss-lint:disable` control comments should be preceded by a comment
# `scss-lint:disable` control comments should be preceded by a comment
# explaining why these linters are being disabled for this file.
# explaining why these linters are being disabled for this file.
...
...
app/assets/stylesheets/framework/awards.scss
View file @
bc09ea58
...
@@ -231,11 +231,11 @@
...
@@ -231,11 +231,11 @@
.award-control-icon-positive
,
.award-control-icon-positive
,
.award-control-icon-super-positive
{
.award-control-icon-super-positive
{
@include
transition
(
opacity
,
transform
);
position
:
absolute
;
position
:
absolute
;
left
:
10px
;
left
:
10px
;
bottom
:
6px
;
bottom
:
6px
;
opacity
:
0
;
opacity
:
0
;
@include
transition
(
opacity
,
transform
);
}
}
.award-control-text
{
.award-control-text
{
...
...
app/assets/stylesheets/framework/dropdowns.scss
View file @
bc09ea58
...
@@ -35,8 +35,8 @@
...
@@ -35,8 +35,8 @@
.open
{
.open
{
.dropdown-menu
,
.dropdown-menu
,
.dropdown-menu-nav
{
.dropdown-menu-nav
{
display
:
block
;
@include
set-visible
;
@include
set-visible
;
display
:
block
;
@media
(
max-width
:
$screen-xs-max
)
{
@media
(
max-width
:
$screen-xs-max
)
{
width
:
100%
;
width
:
100%
;
...
@@ -184,6 +184,7 @@
...
@@ -184,6 +184,7 @@
.dropdown-menu
,
.dropdown-menu
,
.dropdown-menu-nav
{
.dropdown-menu-nav
{
@include
set-invisible
;
display
:
block
;
display
:
block
;
position
:
absolute
;
position
:
absolute
;
width
:
100%
;
width
:
100%
;
...
@@ -200,7 +201,6 @@
...
@@ -200,7 +201,6 @@
border
:
1px
solid
$dropdown-border-color
;
border
:
1px
solid
$dropdown-border-color
;
border-radius
:
$border-radius-base
;
border-radius
:
$border-radius-base
;
box-shadow
:
0
2px
4px
$dropdown-shadow-color
;
box-shadow
:
0
2px
4px
$dropdown-shadow-color
;
@include
set-invisible
;
@media
(
max-width
:
$screen-sm-min
)
{
@media
(
max-width
:
$screen-sm-min
)
{
width
:
100%
;
width
:
100%
;
...
...
app/assets/stylesheets/framework/markdown_area.scss
View file @
bc09ea58
...
@@ -165,8 +165,8 @@
...
@@ -165,8 +165,8 @@
.cur
{
.cur
{
.avatar
{
.avatar
{
border
:
1px
solid
$white-light
;
@include
disableAllAnimation
;
@include
disableAllAnimation
;
border
:
1px
solid
$white-light
;
}
}
}
}
...
...
app/assets/stylesheets/framework/responsive-tables.scss
View file @
bc09ea58
...
@@ -100,9 +100,9 @@
...
@@ -100,9 +100,9 @@
}
}
.table-mobile-header
{
.table-mobile-header
{
@include
flex-max-width
(
40
);
color
:
$gl-text-color-secondary
;
color
:
$gl-text-color-secondary
;
text-align
:
left
;
text-align
:
left
;
@include
flex-max-width
(
40
);
@media
(
min-width
:
$screen-md-min
)
{
@media
(
min-width
:
$screen-md-min
)
{
display
:
none
;
display
:
none
;
...
...
app/assets/stylesheets/pages/commits.scss
View file @
bc09ea58
...
@@ -250,8 +250,8 @@
...
@@ -250,8 +250,8 @@
}
}
.committed_ago
{
.committed_ago
{
float
:
right
;
@extend
.cgray
;
@extend
.cgray
;
float
:
right
;
}
}
}
}
}
}
...
...
app/assets/stylesheets/pages/cycle_analytics.scss
View file @
bc09ea58
...
@@ -24,9 +24,9 @@
...
@@ -24,9 +24,9 @@
.col-headers
{
.col-headers
{
ul
{
ul
{
@include
clearfix
;
margin
:
0
;
margin
:
0
;
padding
:
0
;
padding
:
0
;
@include
clearfix
;
}
}
li
{
li
{
...
@@ -189,8 +189,8 @@
...
@@ -189,8 +189,8 @@
}
}
li
{
li
{
list-style-type
:
none
;
@include
clearfix
;
@include
clearfix
;
list-style-type
:
none
;
}
}
.stage-nav-item
{
.stage-nav-item
{
...
@@ -281,11 +281,11 @@
...
@@ -281,11 +281,11 @@
}
}
.stage-event-item
{
.stage-event-item
{
@include
clearfix
;
list-style-type
:
none
;
list-style-type
:
none
;
padding
:
0
0
$gl-padding
;
padding
:
0
0
$gl-padding
;
margin
:
0
$gl-padding
$gl-padding
;
margin
:
0
$gl-padding
$gl-padding
;
border-bottom
:
1px
solid
$gray-darker
;
border-bottom
:
1px
solid
$gray-darker
;
@include
clearfix
;
&
:last-child
{
&
:last-child
{
border-bottom
:
none
;
border-bottom
:
none
;
...
@@ -307,9 +307,9 @@
...
@@ -307,9 +307,9 @@
&
.issue-title
,
&
.issue-title
,
&
.commit-title
,
&
.commit-title
,
&
.merge-merquest-title
{
&
.merge-merquest-title
{
@include
text-overflow
();
max-width
:
100%
;
max-width
:
100%
;
display
:
block
;
display
:
block
;
@include
text-overflow
();
a
{
a
{
color
:
$gl-text-color
;
color
:
$gl-text-color
;
...
...
app/assets/stylesheets/pages/diff.scss
View file @
bc09ea58
...
@@ -91,6 +91,7 @@
...
@@ -91,6 +91,7 @@
.old_line
,
.old_line
,
.new_line
{
.new_line
{
@include
user-select
(
none
);
margin
:
0
;
margin
:
0
;
border
:
none
;
border
:
none
;
padding
:
0
5px
;
padding
:
0
5px
;
...
@@ -99,7 +100,6 @@
...
@@ -99,7 +100,6 @@
min-width
:
35px
;
min-width
:
35px
;
max-width
:
50px
;
max-width
:
50px
;
width
:
35px
;
width
:
35px
;
@include
user-select
(
none
);
a
{
a
{
float
:
left
;
float
:
left
;
...
@@ -354,12 +354,12 @@
...
@@ -354,12 +354,12 @@
}
}
&
.active
{
&
.active
{
cursor
:
default
;
color
:
$gl-text-color
;
&
:hover
{
&
:hover
{
text-decoration
:
none
;
text-decoration
:
none
;
}
}
cursor
:
default
;
color
:
$gl-text-color
;
}
}
&
.disabled
{
&
.disabled
{
...
...
app/assets/stylesheets/pages/notes.scss
View file @
bc09ea58
...
@@ -121,10 +121,11 @@ ul.notes {
...
@@ -121,10 +121,11 @@ ul.notes {
overflow-y
:
hidden
;
overflow-y
:
hidden
;
.note-text
{
.note-text
{
word-wrap
:
break-word
;
@include
md-typography
;
@include
md-typography
;
// Reset ul style types since we're nested inside a ul already
// Reset ul style types since we're nested inside a ul already
@include
bulleted-list
;
@include
bulleted-list
;
word-wrap
:
break-word
;
ul
.task-list
{
ul
.task-list
{
ul
:not
(
.task-list
)
{
ul
:not
(
.task-list
)
{
padding-left
:
1
.3em
;
padding-left
:
1
.3em
;
...
...
app/assets/stylesheets/pages/pipeline_schedules.scss
View file @
bc09ea58
...
@@ -137,6 +137,7 @@
...
@@ -137,6 +137,7 @@
}
}
.pipeline-variable-row-remove-button
{
.pipeline-variable-row-remove-button
{
@include
transition
(
color
);
flex-shrink
:
0
;
flex-shrink
:
0
;
display
:
flex
;
display
:
flex
;
justify-content
:
center
;
justify-content
:
center
;
...
@@ -147,7 +148,6 @@
...
@@ -147,7 +148,6 @@
background
:
transparent
;
background
:
transparent
;
border
:
0
;
border
:
0
;
color
:
$gl-text-color-secondary
;
color
:
$gl-text-color-secondary
;
@include
transition
(
color
);
&
:hover
,
&
:hover
,
&
:focus
{
&
:focus
{
...
...
app/assets/stylesheets/pages/projects.scss
View file @
bc09ea58
...
@@ -587,9 +587,9 @@ pre.light-well {
...
@@ -587,9 +587,9 @@ pre.light-well {
}
}
.project-row
{
.project-row
{
@include
basic-list-stats
;
display
:
flex
;
display
:
flex
;
align-items
:
center
;
align-items
:
center
;
@include
basic-list-stats
;
}
}
h3
{
h3
{
...
...
app/assets/stylesheets/pages/ui_dev_kit.scss
View file @
bc09ea58
...
@@ -5,13 +5,13 @@
...
@@ -5,13 +5,13 @@
}
}
.example
{
.example
{
padding
:
15px
;
border
:
1px
dashed
$ui-dev-kit-example-border
;
margin-bottom
:
15px
;
&
:
:
before
{
&
:
:
before
{
content
:
"Example"
;
content
:
"Example"
;
color
:
$ui-dev-kit-example-color
;
color
:
$ui-dev-kit-example-color
;
}
}
padding
:
15px
;
border
:
1px
dashed
$ui-dev-kit-example-border
;
margin-bottom
:
15px
;
}
}
}
}
changelogs/unreleased/enable-scss-lint-declaration-order.yml
0 → 100644
View file @
bc09ea58
---
title
:
Enable DeclarationOrder in scss-lint
merge_request
:
12805
author
:
Takuya Noguchi
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment