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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
50780ef4
Commit
50780ef4
authored
May 26, 2017
by
Clement Ho
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'enable-duplicate-property-scss-lint' into 'master'
Enable DuplicateProperty scss-lint See merge request !11722
parents
8968171c
e9253ba6
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
3 additions
and
9 deletions
+3
-9
.scss-lint.yml
.scss-lint.yml
+1
-1
app/assets/stylesheets/framework/blocks.scss
app/assets/stylesheets/framework/blocks.scss
+0
-1
app/assets/stylesheets/framework/emojis.scss
app/assets/stylesheets/framework/emojis.scss
+0
-1
app/assets/stylesheets/framework/lists.scss
app/assets/stylesheets/framework/lists.scss
+0
-1
app/assets/stylesheets/framework/selects.scss
app/assets/stylesheets/framework/selects.scss
+0
-1
app/assets/stylesheets/pages/boards.scss
app/assets/stylesheets/pages/boards.scss
+2
-0
app/assets/stylesheets/pages/ci_projects.scss
app/assets/stylesheets/pages/ci_projects.scss
+0
-1
app/assets/stylesheets/pages/diff.scss
app/assets/stylesheets/pages/diff.scss
+0
-1
app/assets/stylesheets/pages/issues.scss
app/assets/stylesheets/pages/issues.scss
+0
-1
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+0
-1
No files found.
.scss-lint.yml
View file @
50780ef4
...
...
@@ -57,7 +57,7 @@ linters:
# Reports when you define the same property twice in a single rule set.
DuplicateProperty
:
enabled
:
fals
e
enabled
:
tru
e
# Separate rule, function, and mixin declarations with empty lines.
EmptyLineBetweenBlocks
:
...
...
app/assets/stylesheets/framework/blocks.scss
View file @
50780ef4
...
...
@@ -23,7 +23,6 @@
.row-content-block
{
margin-top
:
0
;
margin-bottom
:
-
$gl-padding
;
background-color
:
$gray-light
;
padding
:
$gl-padding
;
margin-bottom
:
0
;
...
...
app/assets/stylesheets/framework/emojis.scss
View file @
50780ef4
gl-emoji
{
display
:
inline-block
;
display
:
inline-flex
;
vertical-align
:
middle
;
font-family
:
"Apple Color Emoji"
,
"Segoe UI Emoji"
,
"Segoe UI Symbol"
;
...
...
app/assets/stylesheets/framework/lists.scss
View file @
50780ef4
...
...
@@ -11,7 +11,6 @@
>
li
{
padding
:
10px
15px
;
min-height
:
20px
;
border-bottom
:
1px
solid
$list-border-light
;
border-bottom
:
1px
solid
$list-border
;
&
:
:
after
{
...
...
app/assets/stylesheets/framework/selects.scss
View file @
50780ef4
...
...
@@ -96,7 +96,6 @@
.select2-search-field
input
{
padding
:
5px
$gl-padding
/
2
;
font-size
:
13px
;
height
:
auto
;
font-family
:
inherit
;
font-size
:
inherit
;
...
...
app/assets/stylesheets/pages/boards.scss
View file @
50780ef4
...
...
@@ -72,7 +72,9 @@
@media
(
min-width
:
$screen-sm-min
)
{
height
:
475px
;
// Needed for PhantomJS
// scss-lint:disable DuplicateProperty
height
:
calc
(
100vh
-
222px
);
// scss-lint:enable DuplicateProperty
min-height
:
475px
;
transition
:
width
.2s
;
...
...
app/assets/stylesheets/pages/ci_projects.scss
View file @
50780ef4
...
...
@@ -36,7 +36,6 @@
pre
.commit-message
{
background
:
none
;
padding
:
0
;
margin
:
0
;
border
:
none
;
margin
:
20px
0
;
border-radius
:
0
;
...
...
app/assets/stylesheets/pages/diff.scss
View file @
50780ef4
...
...
@@ -94,7 +94,6 @@
.old_line
,
.new_line
{
margin
:
0
;
padding
:
0
;
border
:
none
;
padding
:
0
5px
;
border-right
:
1px
solid
;
...
...
app/assets/stylesheets/pages/issues.scss
View file @
50780ef4
...
...
@@ -204,7 +204,6 @@ ul.related-merge-requests > li {
.dropdown-toggle
{
.fa-caret-down
{
pointer-events
:
none
;
margin-left
:
0
;
color
:
inherit
;
margin-left
:
0
;
}
...
...
app/assets/stylesheets/pages/projects.scss
View file @
50780ef4
...
...
@@ -247,7 +247,6 @@
font-size
:
13px
;
font-weight
:
600
;
line-height
:
13px
;
padding
:
$gl-vert-padding
$gl-padding
;
letter-spacing
:
.4px
;
padding
:
6px
14px
;
text-align
:
center
;
...
...
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