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
Boxiang Sun
gitlab-ce
Commits
791c9d0d
Commit
791c9d0d
authored
Oct 24, 2016
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable SingleLinePerSelector in scss-lint
parent
cb38290a
Changes
42
Show whitespace changes
Inline
Side-by-side
Showing
42 changed files
with
247 additions
and
104 deletions
+247
-104
.scss-lint.yml
.scss-lint.yml
+1
-1
app/assets/stylesheets/framework/animations.scss
app/assets/stylesheets/framework/animations.scss
+2
-1
app/assets/stylesheets/framework/blocks.scss
app/assets/stylesheets/framework/blocks.scss
+2
-1
app/assets/stylesheets/framework/buttons.scss
app/assets/stylesheets/framework/buttons.scss
+2
-1
app/assets/stylesheets/framework/common.scss
app/assets/stylesheets/framework/common.scss
+4
-2
app/assets/stylesheets/framework/dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+4
-2
app/assets/stylesheets/framework/flash.scss
app/assets/stylesheets/framework/flash.scss
+4
-2
app/assets/stylesheets/framework/gitlab-theme.scss
app/assets/stylesheets/framework/gitlab-theme.scss
+3
-1
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+9
-4
app/assets/stylesheets/framework/lists.scss
app/assets/stylesheets/framework/lists.scss
+4
-2
app/assets/stylesheets/framework/mobile.scss
app/assets/stylesheets/framework/mobile.scss
+8
-4
app/assets/stylesheets/framework/nav.scss
app/assets/stylesheets/framework/nav.scss
+16
-6
app/assets/stylesheets/framework/selects.scss
app/assets/stylesheets/framework/selects.scss
+4
-2
app/assets/stylesheets/framework/tables.scss
app/assets/stylesheets/framework/tables.scss
+2
-1
app/assets/stylesheets/framework/tw_bootstrap.scss
app/assets/stylesheets/framework/tw_bootstrap.scss
+2
-1
app/assets/stylesheets/framework/typography.scss
app/assets/stylesheets/framework/typography.scss
+22
-6
app/assets/stylesheets/highlight/dark.scss
app/assets/stylesheets/highlight/dark.scss
+13
-6
app/assets/stylesheets/highlight/monokai.scss
app/assets/stylesheets/highlight/monokai.scss
+13
-6
app/assets/stylesheets/highlight/solarized_dark.scss
app/assets/stylesheets/highlight/solarized_dark.scss
+13
-6
app/assets/stylesheets/highlight/solarized_light.scss
app/assets/stylesheets/highlight/solarized_light.scss
+13
-6
app/assets/stylesheets/highlight/white.scss
app/assets/stylesheets/highlight/white.scss
+9
-4
app/assets/stylesheets/pages/admin.scss
app/assets/stylesheets/pages/admin.scss
+2
-1
app/assets/stylesheets/pages/ci_projects.scss
app/assets/stylesheets/pages/ci_projects.scss
+2
-1
app/assets/stylesheets/pages/commit.scss
app/assets/stylesheets/pages/commit.scss
+4
-2
app/assets/stylesheets/pages/commits.scss
app/assets/stylesheets/pages/commits.scss
+4
-2
app/assets/stylesheets/pages/confirmation.scss
app/assets/stylesheets/pages/confirmation.scss
+8
-2
app/assets/stylesheets/pages/detail_page.scss
app/assets/stylesheets/pages/detail_page.scss
+2
-1
app/assets/stylesheets/pages/diff.scss
app/assets/stylesheets/pages/diff.scss
+6
-3
app/assets/stylesheets/pages/editor.scss
app/assets/stylesheets/pages/editor.scss
+3
-1
app/assets/stylesheets/pages/errors.scss
app/assets/stylesheets/pages/errors.scss
+3
-1
app/assets/stylesheets/pages/issues.scss
app/assets/stylesheets/pages/issues.scss
+2
-1
app/assets/stylesheets/pages/login.scss
app/assets/stylesheets/pages/login.scss
+6
-3
app/assets/stylesheets/pages/merge_conflicts.scss
app/assets/stylesheets/pages/merge_conflicts.scss
+2
-1
app/assets/stylesheets/pages/milestone.scss
app/assets/stylesheets/pages/milestone.scss
+2
-1
app/assets/stylesheets/pages/note_form.scss
app/assets/stylesheets/pages/note_form.scss
+2
-1
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+2
-1
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+8
-4
app/assets/stylesheets/pages/profile.scss
app/assets/stylesheets/pages/profile.scss
+2
-1
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+8
-4
app/assets/stylesheets/pages/search.scss
app/assets/stylesheets/pages/search.scss
+4
-2
app/assets/stylesheets/pages/tree.scss
app/assets/stylesheets/pages/tree.scss
+4
-2
app/assets/stylesheets/print.scss
app/assets/stylesheets/print.scss
+21
-4
No files found.
.scss-lint.yml
View file @
791c9d0d
...
@@ -172,7 +172,7 @@ linters:
...
@@ -172,7 +172,7 @@ linters:
# Split selectors onto separate lines after each comma, and have each
# Split selectors onto separate lines after each comma, and have each
# individual selector occupy a single line.
# individual selector occupy a single line.
SingleLinePerSelector
:
SingleLinePerSelector
:
enabled
:
fals
e
enabled
:
tru
e
# Commas in lists should be followed by a space.
# Commas in lists should be followed by a space.
SpaceAfterComma
:
SpaceAfterComma
:
...
...
app/assets/stylesheets/framework/animations.scss
View file @
791c9d0d
...
@@ -37,7 +37,8 @@
...
@@ -37,7 +37,8 @@
}
}
@include
keyframes
(
pulse
)
{
@include
keyframes
(
pulse
)
{
from
,
to
{
from
,
to
{
@include
webkit-prefix
(
transform
,
scale3d
(
1
,
1
,
1
));
@include
webkit-prefix
(
transform
,
scale3d
(
1
,
1
,
1
));
}
}
...
...
app/assets/stylesheets/framework/blocks.scss
View file @
791c9d0d
...
@@ -128,7 +128,8 @@
...
@@ -128,7 +128,8 @@
position
:
relative
;
position
:
relative
;
.avatar-holder
{
.avatar-holder
{
.avatar
,
.identicon
{
.avatar
,
.identicon
{
margin
:
0
auto
;
margin
:
0
auto
;
float
:
none
;
float
:
none
;
}
}
...
...
app/assets/stylesheets/framework/buttons.scss
View file @
791c9d0d
...
@@ -213,7 +213,8 @@
...
@@ -213,7 +213,8 @@
top
:
2px
;
top
:
2px
;
}
}
svg
,
.fa
{
svg
,
.fa
{
&
:not
(
:last-child
)
{
&
:not
(
:last-child
)
{
margin-right
:
3px
;
margin-right
:
3px
;
}
}
...
...
app/assets/stylesheets/framework/common.scss
View file @
791c9d0d
...
@@ -143,7 +143,8 @@ li.note {
...
@@ -143,7 +143,8 @@ li.note {
}
}
}
}
.wiki_content
code
,
.readme
code
{
.wiki_content
code
,
.readme
code
{
background-color
:
inherit
;
background-color
:
inherit
;
}
}
...
@@ -350,7 +351,8 @@ table {
...
@@ -350,7 +351,8 @@ table {
margin-right
:
10px
;
margin-right
:
10px
;
}
}
.alert
,
.progress
{
.alert
,
.progress
{
margin-bottom
:
$gl-padding
;
margin-bottom
:
$gl-padding
;
}
}
...
...
app/assets/stylesheets/framework/dropdowns.scss
View file @
791c9d0d
...
@@ -275,7 +275,8 @@
...
@@ -275,7 +275,8 @@
a
{
a
{
padding-left
:
25px
;
padding-left
:
25px
;
&
.is-indeterminate
,
&
.is-active
{
&
.is-indeterminate
,
&
.is-active
{
&
:
:
before
{
&
:
:
before
{
position
:
absolute
;
position
:
absolute
;
left
:
5px
;
left
:
5px
;
...
@@ -373,7 +374,8 @@
...
@@ -373,7 +374,8 @@
}
}
}
}
.dropdown-input-field
,
.default-dropdown-input
{
.dropdown-input-field
,
.default-dropdown-input
{
width
:
100%
;
width
:
100%
;
min-height
:
30px
;
min-height
:
30px
;
padding
:
0
7px
;
padding
:
0
7px
;
...
...
app/assets/stylesheets/framework/flash.scss
View file @
791c9d0d
...
@@ -18,7 +18,8 @@
...
@@ -18,7 +18,8 @@
margin
:
0
;
margin
:
0
;
}
}
.flash-notice
,
.flash-alert
{
.flash-notice
,
.flash-alert
{
border-radius
:
$border-radius-default
;
border-radius
:
$border-radius-default
;
.container-fluid
,
.container-fluid
,
...
@@ -30,7 +31,8 @@
...
@@ -30,7 +31,8 @@
&
.flash-container-page
{
&
.flash-container-page
{
margin-bottom
:
0
;
margin-bottom
:
0
;
.flash-notice
,
.flash-alert
{
.flash-notice
,
.flash-alert
{
border-radius
:
0
;
border-radius
:
0
;
}
}
}
}
...
...
app/assets/stylesheets/framework/gitlab-theme.scss
View file @
791c9d0d
...
@@ -25,7 +25,9 @@
...
@@ -25,7 +25,9 @@
a
{
a
{
color
:
$color-light
;
color
:
$color-light
;
&
:hover
,
&
:focus
,
&
:active
{
&
:hover
,
&
:focus
,
&
:active
{
background
:
$color-dark
;
background
:
$color-dark
;
}
}
...
...
app/assets/stylesheets/framework/header.scss
View file @
791c9d0d
...
@@ -15,7 +15,8 @@ header {
...
@@ -15,7 +15,8 @@ header {
margin
:
8px
0
;
margin
:
8px
0
;
text-align
:
center
;
text-align
:
center
;
.tanuki-logo
,
img
{
.tanuki-logo
,
img
{
height
:
36px
;
height
:
36px
;
}
}
}
}
...
@@ -54,7 +55,9 @@ header {
...
@@ -54,7 +55,9 @@ header {
line-height
:
28px
;
line-height
:
28px
;
text-align
:
center
;
text-align
:
center
;
&
:hover
,
&
:focus
,
&
:active
{
&
:hover
,
&
:focus
,
&
:active
{
background-color
:
$background-color
;
background-color
:
$background-color
;
}
}
...
@@ -125,7 +128,8 @@ header {
...
@@ -125,7 +128,8 @@ header {
left
:
-50%
;
left
:
-50%
;
}
}
svg
,
img
{
svg
,
img
{
height
:
36px
;
height
:
36px
;
}
}
...
@@ -222,7 +226,8 @@ header {
...
@@ -222,7 +226,8 @@ header {
margin
:
0
;
margin
:
0
;
float
:
none
!
important
;
float
:
none
!
important
;
.visible-xs
,
.visable-sm
{
.visible-xs
,
.visable-sm
{
display
:
table-cell
!
important
;
display
:
table-cell
!
important
;
}
}
}
}
...
...
app/assets/stylesheets/framework/lists.scss
View file @
791c9d0d
...
@@ -76,14 +76,16 @@
...
@@ -76,14 +76,16 @@
/** light list with border-bottom between li **/
/** light list with border-bottom between li **/
ul
.bordered-list
,
ul
.unstyled-list
{
ul
.bordered-list
,
ul
.unstyled-list
{
@include
basic-list
;
@include
basic-list
;
&
.top-list
{
&
.top-list
{
li
:first-child
{
li
:first-child
{
padding-top
:
0
;
padding-top
:
0
;
h4
,
h5
{
h4
,
h5
{
margin-top
:
0
;
margin-top
:
0
;
}
}
}
}
...
...
app/assets/stylesheets/framework/mobile.scss
View file @
791c9d0d
...
@@ -79,7 +79,8 @@
...
@@ -79,7 +79,8 @@
padding-left
:
15px
!
important
;
padding-left
:
15px
!
important
;
}
}
.nav-links
,
.nav-links
{
.nav-links
,
.nav-links
{
li
a
{
li
a
{
font-size
:
14px
;
font-size
:
14px
;
padding
:
19px
10px
;
padding
:
19px
10px
;
...
@@ -99,18 +100,21 @@
...
@@ -99,18 +100,21 @@
@media
(
max-width
:
$screen-sm-max
)
{
@media
(
max-width
:
$screen-sm-max
)
{
.issues-filters
{
.issues-filters
{
.milestone-filter
,
.labels-filter
{
.milestone-filter
,
.labels-filter
{
display
:
none
;
display
:
none
;
}
}
}
}
.page-title
{
.page-title
{
.note-created-ago
,
.new-issue-link
{
.note-created-ago
,
.new-issue-link
{
display
:
none
;
display
:
none
;
}
}
}
}
.issue_edited_ago
,
.note_edited_ago
{
.issue_edited_ago
,
.note_edited_ago
{
display
:
none
;
display
:
none
;
}
}
...
...
app/assets/stylesheets/framework/nav.scss
View file @
791c9d0d
...
@@ -54,7 +54,9 @@
...
@@ -54,7 +54,9 @@
color
:
#959494
;
color
:
#959494
;
border-bottom
:
2px
solid
transparent
;
border-bottom
:
2px
solid
transparent
;
&
:hover
,
&
:active
,
&
:focus
{
&
:hover
,
&
:active
,
&
:focus
{
text-decoration
:
none
;
text-decoration
:
none
;
outline
:
none
;
outline
:
none
;
}
}
...
@@ -211,7 +213,11 @@
...
@@ -211,7 +213,11 @@
padding-bottom
:
0
;
padding-bottom
:
0
;
width
:
100%
;
width
:
100%
;
.btn
,
form
,
.dropdown
,
.dropdown-menu-toggle
,
.form-control
{
.btn
,
form
,
.dropdown
,
.dropdown-menu-toggle
,
.form-control
{
margin
:
0
0
10px
;
margin
:
0
0
10px
;
display
:
block
;
display
:
block
;
width
:
100%
;
width
:
100%
;
...
@@ -245,7 +251,8 @@
...
@@ -245,7 +251,8 @@
}
}
&
.adjust
{
&
.adjust
{
.nav-text
,
.nav-controls
{
.nav-text
,
.nav-controls
{
width
:
auto
;
width
:
auto
;
}
}
}
}
...
@@ -309,13 +316,15 @@
...
@@ -309,13 +316,15 @@
padding-top
:
10px
;
padding-top
:
10px
;
}
}
a
,
i
{
a
,
i
{
color
:
$layout-link-gray
;
color
:
$layout-link-gray
;
}
}
&
.active
{
&
.active
{
a
,
i
{
a
,
i
{
color
:
$black
;
color
:
$black
;
}
}
...
@@ -328,7 +337,8 @@
...
@@ -328,7 +337,8 @@
}
}
&
:hover
{
&
:hover
{
a
,
i
{
a
,
i
{
color
:
$black
;
color
:
$black
;
}
}
}
}
...
...
app/assets/stylesheets/framework/selects.scss
View file @
791c9d0d
...
@@ -3,7 +3,8 @@
...
@@ -3,7 +3,8 @@
width
:
100%
!
important
;
width
:
100%
!
important
;
}
}
.select2-container
,
.select2-container.select2-drop-above
{
.select2-container
,
.select2-container.select2-drop-above
{
.select2-choice
{
.select2-choice
{
background
:
#fff
;
background
:
#fff
;
border-color
:
$input-border
;
border-color
:
$input-border
;
...
@@ -71,7 +72,8 @@
...
@@ -71,7 +72,8 @@
}
}
.select2-container-active
{
.select2-container-active
{
.select2-choice
,
.select2-choices
{
.select2-choice
,
.select2-choices
{
box-shadow
:
none
;
box-shadow
:
none
;
}
}
}
}
...
...
app/assets/stylesheets/framework/tables.scss
View file @
791c9d0d
...
@@ -23,7 +23,8 @@ table {
...
@@ -23,7 +23,8 @@ table {
}
}
tr
{
tr
{
td
,
th
{
td
,
th
{
padding
:
10px
$gl-padding
;
padding
:
10px
$gl-padding
;
line-height
:
20px
;
line-height
:
20px
;
vertical-align
:
middle
;
vertical-align
:
middle
;
...
...
app/assets/stylesheets/framework/tw_bootstrap.scss
View file @
791c9d0d
...
@@ -126,7 +126,8 @@
...
@@ -126,7 +126,8 @@
box-shadow
:
none
;
box-shadow
:
none
;
.panel-body
{
.panel-body
{
form
,
pre
{
form
,
pre
{
margin
:
0
;
margin
:
0
;
}
}
...
...
app/assets/stylesheets/framework/typography.scss
View file @
791c9d0d
...
@@ -131,12 +131,14 @@
...
@@ -131,12 +131,14 @@
font-weight
:
inherit
;
font-weight
:
inherit
;
}
}
ul
,
ol
{
ul
,
ol
{
padding
:
0
;
padding
:
0
;
margin
:
3px
0
3px
28px
!
important
;
margin
:
3px
0
3px
28px
!
important
;
}
}
ul
:dir
(
rtl
),
ol
:dir
(
rtl
)
{
ul
:dir
(
rtl
),
ol
:dir
(
rtl
)
{
margin
:
3px
28px
3px
0
!
important
;
margin
:
3px
28px
3px
0
!
important
;
}
}
...
@@ -144,7 +146,8 @@
...
@@ -144,7 +146,8 @@
line-height
:
1
.6em
;
line-height
:
1
.6em
;
}
}
a
[
href
*=
"/uploads/"
],
a
[
href
*=
"storage.googleapis.com/google-code-attachments/"
]
{
a
[
href
*=
"/uploads/"
],
a
[
href
*=
"storage.googleapis.com/google-code-attachments/"
]
{
&
:before
{
&
:before
{
margin-right
:
4px
;
margin-right
:
4px
;
...
@@ -167,7 +170,12 @@
...
@@ -167,7 +170,12 @@
}
}
/* Link to current header. */
/* Link to current header. */
h1
,
h2
,
h3
,
h4
,
h5
,
h6
{
h1
,
h2
,
h3
,
h4
,
h5
,
h6
{
position
:
relative
;
position
:
relative
;
a
.anchor
{
a
.anchor
{
...
@@ -215,7 +223,12 @@ body {
...
@@ -215,7 +223,12 @@ body {
margin
:
12px
7px
;
margin
:
12px
7px
;
}
}
h1
,
h2
,
h3
,
h4
,
h5
,
h6
{
h1
,
h2
,
h3
,
h4
,
h5
,
h6
{
color
:
$gl-title-color
;
color
:
$gl-title-color
;
font-weight
:
600
;
font-weight
:
600
;
}
}
...
@@ -273,7 +286,10 @@ a > code {
...
@@ -273,7 +286,10 @@ a > code {
text-decoration
:
line-through
;
text-decoration
:
line-through
;
}
}
h1
,
h2
,
h3
,
h4
{
h1
,
h2
,
h3
,
h4
{
small
{
small
{
color
:
$gl-gray
;
color
:
$gl-gray
;
}
}
...
...
app/assets/stylesheets/highlight/dark.scss
View file @
791c9d0d
/* https://github.com/MozMorris/tomorrow-pygments */
/* https://github.com/MozMorris/tomorrow-pygments */
.code.dark
{
.code.dark
{
// Line numbers
// Line numbers
.line-numbers
,
.diff-line-num
{
.line-numbers
,
.diff-line-num
{
background-color
:
#1d1f21
;
background-color
:
#1d1f21
;
}
}
.diff-line-num
,
.diff-line-num
a
{
.diff-line-num
,
.diff-line-num
a
{
color
:
rgba
(
255
,
255
,
255
,
0
.3
);
color
:
rgba
(
255
,
255
,
255
,
0
.3
);
}
}
// Code itself
// Code itself
pre
.code
,
.diff-line-num
{
pre
.code
,
.diff-line-num
{
border-color
:
#666
;
border-color
:
#666
;
}
}
&
,
pre
.code
,
.line_holder
.line_content
{
&
,
pre
.code
,
.line_holder
.line_content
{
background-color
:
#1d1f21
;
background-color
:
#1d1f21
;
color
:
#c5c8c6
;
color
:
#c5c8c6
;
}
}
...
@@ -31,11 +36,13 @@
...
@@ -31,11 +36,13 @@
border-color
:
darken
(
#557
,
15%
);
border-color
:
darken
(
#557
,
15%
);
}
}
.diff-line-num.new
,
.line_content.new
{
.diff-line-num.new
,
.line_content.new
{
@include
diff_background
(
rgba
(
51
,
255
,
51
,
0
.1
)
,
rgba
(
51
,
255
,
51
,
0
.2
)
,
#808080
);
@include
diff_background
(
rgba
(
51
,
255
,
51
,
0
.1
)
,
rgba
(
51
,
255
,
51
,
0
.2
)
,
#808080
);
}
}
.diff-line-num.old
,
.line_content.old
{
.diff-line-num.old
,
.line_content.old
{
@include
diff_background
(
rgba
(
255
,
51
,
51
,
0
.2
)
,
rgba
(
255
,
51
,
51
,
0
.25
)
,
#808080
);
@include
diff_background
(
rgba
(
255
,
51
,
51
,
0
.2
)
,
rgba
(
255
,
51
,
51
,
0
.25
)
,
#808080
);
}
}
...
...
app/assets/stylesheets/highlight/monokai.scss
View file @
791c9d0d
/* https://github.com/richleland/pygments-css/blob/master/monokai.css */
/* https://github.com/richleland/pygments-css/blob/master/monokai.css */
.code.monokai
{
.code.monokai
{
// Line numbers
// Line numbers
.line-numbers
,
.diff-line-num
{
.line-numbers
,
.diff-line-num
{
background-color
:
#272822
;
background-color
:
#272822
;
}
}
.diff-line-num
,
.diff-line-num
a
{
.diff-line-num
,
.diff-line-num
a
{
color
:
rgba
(
255
,
255
,
255
,
0
.3
);
color
:
rgba
(
255
,
255
,
255
,
0
.3
);
}
}
// Code itself
// Code itself
pre
.code
,
.diff-line-num
{
pre
.code
,
.diff-line-num
{
border-color
:
#555
;
border-color
:
#555
;
}
}
&
,
pre
.code
,
.line_holder
.line_content
{
&
,
pre
.code
,
.line_holder
.line_content
{
background-color
:
#272822
;
background-color
:
#272822
;
color
:
#f8f8f2
;
color
:
#f8f8f2
;
}
}
...
@@ -31,11 +36,13 @@
...
@@ -31,11 +36,13 @@
border-color
:
darken
(
#49483e
,
15%
);
border-color
:
darken
(
#49483e
,
15%
);
}
}
.diff-line-num.new
,
.line_content.new
{
.diff-line-num.new
,
.line_content.new
{
@include
diff_background
(
rgba
(
166
,
226
,
46
,
0
.1
)
,
rgba
(
166
,
226
,
46
,
0
.15
)
,
#808080
);
@include
diff_background
(
rgba
(
166
,
226
,
46
,
0
.1
)
,
rgba
(
166
,
226
,
46
,
0
.15
)
,
#808080
);
}
}
.diff-line-num.old
,
.line_content.old
{
.diff-line-num.old
,
.line_content.old
{
@include
diff_background
(
rgba
(
254
,
147
,
140
,
0
.15
)
,
rgba
(
254
,
147
,
140
,
0
.2
)
,
#808080
);
@include
diff_background
(
rgba
(
254
,
147
,
140
,
0
.15
)
,
rgba
(
254
,
147
,
140
,
0
.2
)
,
#808080
);
}
}
...
...
app/assets/stylesheets/highlight/solarized_dark.scss
View file @
791c9d0d
/* https://gist.github.com/qguv/7936275 */
/* https://gist.github.com/qguv/7936275 */
.code.solarized-dark
{
.code.solarized-dark
{
// Line numbers
// Line numbers
.line-numbers
,
.diff-line-num
{
.line-numbers
,
.diff-line-num
{
background-color
:
#002b36
;
background-color
:
#002b36
;
}
}
.diff-line-num
,
.diff-line-num
a
{
.diff-line-num
,
.diff-line-num
a
{
color
:
rgba
(
255
,
255
,
255
,
0
.3
);
color
:
rgba
(
255
,
255
,
255
,
0
.3
);
}
}
// Code itself
// Code itself
pre
.code
,
.diff-line-num
{
pre
.code
,
.diff-line-num
{
border-color
:
#113b46
;
border-color
:
#113b46
;
}
}
&
,
pre
.code
,
.line_holder
.line_content
{
&
,
pre
.code
,
.line_holder
.line_content
{
background-color
:
#002b36
;
background-color
:
#002b36
;
color
:
#93a1a1
;
color
:
#93a1a1
;
}
}
...
@@ -31,11 +36,13 @@
...
@@ -31,11 +36,13 @@
border-color
:
darken
(
#174652
,
15%
);
border-color
:
darken
(
#174652
,
15%
);
}
}
.diff-line-num.new
,
.line_content.new
{
.diff-line-num.new
,
.line_content.new
{
@include
diff_background
(
rgba
(
133
,
153
,
0
,
0
.15
)
,
rgba
(
133
,
153
,
0
,
0
.25
)
,
#113b46
);
@include
diff_background
(
rgba
(
133
,
153
,
0
,
0
.15
)
,
rgba
(
133
,
153
,
0
,
0
.25
)
,
#113b46
);
}
}
.diff-line-num.old
,
.line_content.old
{
.diff-line-num.old
,
.line_content.old
{
@include
diff_background
(
rgba
(
220
,
50
,
47
,
0
.3
)
,
rgba
(
220
,
50
,
47
,
0
.25
)
,
#113b46
);
@include
diff_background
(
rgba
(
220
,
50
,
47
,
0
.3
)
,
rgba
(
220
,
50
,
47
,
0
.25
)
,
#113b46
);
}
}
...
...
app/assets/stylesheets/highlight/solarized_light.scss
View file @
791c9d0d
...
@@ -7,20 +7,25 @@
...
@@ -7,20 +7,25 @@
.code.solarized-light
{
.code.solarized-light
{
// Line numbers
// Line numbers
.line-numbers
,
.diff-line-num
{
.line-numbers
,
.diff-line-num
{
background-color
:
#fdf6e3
;
background-color
:
#fdf6e3
;
}
}
.diff-line-num
,
.diff-line-num
a
{
.diff-line-num
,
.diff-line-num
a
{
color
:
$black-transparent
;
color
:
$black-transparent
;
}
}
// Code itself
// Code itself
pre
.code
,
.diff-line-num
{
pre
.code
,
.diff-line-num
{
border-color
:
#c5d0d4
;
border-color
:
#c5d0d4
;
}
}
&
,
pre
.code
,
.line_holder
.line_content
{
&
,
pre
.code
,
.line_holder
.line_content
{
background-color
:
#fdf6e3
;
background-color
:
#fdf6e3
;
color
:
#586e75
;
color
:
#586e75
;
}
}
...
@@ -37,11 +42,13 @@
...
@@ -37,11 +42,13 @@
border-color
:
darken
(
#ddd8c5
,
15%
);
border-color
:
darken
(
#ddd8c5
,
15%
);
}
}
.diff-line-num.new
,
.line_content.new
{
.diff-line-num.new
,
.line_content.new
{
@include
diff_background
(
rgba
(
133
,
153
,
0
,
0
.2
)
,
rgba
(
133
,
153
,
0
,
0
.25
)
,
#c5d0d4
);
@include
diff_background
(
rgba
(
133
,
153
,
0
,
0
.2
)
,
rgba
(
133
,
153
,
0
,
0
.25
)
,
#c5d0d4
);
}
}
.diff-line-num.old
,
.line_content.old
{
.diff-line-num.old
,
.line_content.old
{
@include
diff_background
(
rgba
(
220
,
50
,
47
,
0
.2
)
,
rgba
(
220
,
50
,
47
,
0
.25
)
,
#c5d0d4
);
@include
diff_background
(
rgba
(
220
,
50
,
47
,
0
.2
)
,
rgba
(
220
,
50
,
47
,
0
.25
)
,
#c5d0d4
);
}
}
...
...
app/assets/stylesheets/highlight/white.scss
View file @
791c9d0d
...
@@ -7,20 +7,25 @@
...
@@ -7,20 +7,25 @@
.code.white
{
.code.white
{
// Line numbers
// Line numbers
.line-numbers
,
.diff-line-num
{
.line-numbers
,
.diff-line-num
{
background-color
:
$background-color
;
background-color
:
$background-color
;
}
}
.diff-line-num
,
.diff-line-num
a
{
.diff-line-num
,
.diff-line-num
a
{
color
:
$black-transparent
;
color
:
$black-transparent
;
}
}
// Code itself
// Code itself
pre
.code
,
.diff-line-num
{
pre
.code
,
.diff-line-num
{
border-color
:
$table-border-gray
;
border-color
:
$table-border-gray
;
}
}
&
,
pre
.code
,
.line_holder
.line_content
{
&
,
pre
.code
,
.line_holder
.line_content
{
background-color
:
#fff
;
background-color
:
#fff
;
color
:
#333
;
color
:
#333
;
}
}
...
...
app/assets/stylesheets/pages/admin.scss
View file @
791c9d0d
...
@@ -56,7 +56,8 @@
...
@@ -56,7 +56,8 @@
padding
:
10px
;
padding
:
10px
;
text-align
:
center
;
text-align
:
center
;
>
div
,
p
{
>
div
,
p
{
display
:
inline
;
display
:
inline
;
margin
:
0
;
margin
:
0
;
...
...
app/assets/stylesheets/pages/ci_projects.scss
View file @
791c9d0d
...
@@ -12,7 +12,8 @@
...
@@ -12,7 +12,8 @@
border-color
:
$border-color
;
border-color
:
$border-color
;
}
}
th
,
td
{
th
,
td
{
padding
:
10px
$gl-padding
;
padding
:
10px
$gl-padding
;
}
}
...
...
app/assets/stylesheets/pages/commit.scss
View file @
791c9d0d
...
@@ -2,14 +2,16 @@
...
@@ -2,14 +2,16 @@
display
:
block
;
display
:
block
;
}
}
.commit-author
,
.commit-committer
{
.commit-author
,
.commit-committer
{
display
:
block
;
display
:
block
;
color
:
#999
;
color
:
#999
;
font-weight
:
normal
;
font-weight
:
normal
;
font-style
:
italic
;
font-style
:
italic
;
}
}
.commit-author
strong
,
.commit-committer
strong
{
.commit-author
strong
,
.commit-committer
strong
{
font-weight
:
bold
;
font-weight
:
bold
;
font-style
:
normal
;
font-style
:
normal
;
}
}
...
...
app/assets/stylesheets/pages/commits.scss
View file @
791c9d0d
...
@@ -63,7 +63,8 @@
...
@@ -63,7 +63,8 @@
display
:
inline-block
;
display
:
inline-block
;
}
}
.btn-clipboard
,
.btn-transparent
{
.btn-clipboard
,
.btn-transparent
{
padding-left
:
0
;
padding-left
:
0
;
padding-right
:
0
;
padding-right
:
0
;
}
}
...
@@ -162,7 +163,8 @@
...
@@ -162,7 +163,8 @@
.branch-commit
{
.branch-commit
{
color
:
$gl-gray
;
color
:
$gl-gray
;
.commit-id
,
.commit-row-message
{
.commit-id
,
.commit-row-message
{
color
:
$gl-gray
;
color
:
$gl-gray
;
}
}
}
}
...
...
app/assets/stylesheets/pages/confirmation.scss
View file @
791c9d0d
...
@@ -2,7 +2,12 @@
...
@@ -2,7 +2,12 @@
margin-bottom
:
20px
;
margin-bottom
:
20px
;
border-bottom
:
1px
solid
#eee
;
border-bottom
:
1px
solid
#eee
;
>
h1
,
h2
,
h3
,
h4
,
h5
,
h6
{
>
h1
,
h2
,
h3
,
h4
,
h5
,
h6
{
font-weight
:
400
;
font-weight
:
400
;
}
}
...
@@ -10,7 +15,8 @@
...
@@ -10,7 +15,8 @@
margin-bottom
:
20px
;
margin-bottom
:
20px
;
}
}
ul
,
ol
{
ul
,
ol
{
padding-left
:
0
;
padding-left
:
0
;
}
}
...
...
app/assets/stylesheets/pages/detail_page.scss
View file @
791c9d0d
...
@@ -13,7 +13,8 @@
...
@@ -13,7 +13,8 @@
color
:
#5c5d5e
;
color
:
#5c5d5e
;
}
}
.issue_created_ago
,
.author_link
{
.issue_created_ago
,
.author_link
{
white-space
:
nowrap
;
white-space
:
nowrap
;
}
}
}
}
...
...
app/assets/stylesheets/pages/diff.scss
View file @
791c9d0d
...
@@ -124,7 +124,8 @@
...
@@ -124,7 +124,8 @@
}
}
}
}
.old_line
,
.new_line
{
.old_line
,
.new_line
{
margin
:
0
;
margin
:
0
;
padding
:
0
;
padding
:
0
;
border
:
none
;
border
:
none
;
...
@@ -281,7 +282,8 @@
...
@@ -281,7 +282,8 @@
position
:
relative
;
position
:
relative
;
}
}
.frame.added
,
.frame.deleted
{
.frame.added
,
.frame.deleted
{
position
:
absolute
;
position
:
absolute
;
display
:
block
;
display
:
block
;
top
:
0
;
top
:
0
;
...
@@ -347,7 +349,8 @@
...
@@ -347,7 +349,8 @@
text-align
:
center
;
text-align
:
center
;
background
:
#eee
;
background
:
#eee
;
ul
,
li
{
ul
,
li
{
list-style
:
none
;
list-style
:
none
;
margin
:
0
;
margin
:
0
;
padding
:
0
;
padding
:
0
;
...
...
app/assets/stylesheets/pages/editor.scss
View file @
791c9d0d
...
@@ -91,7 +91,9 @@
...
@@ -91,7 +91,9 @@
}
}
}
}
.gitignore-selector
,
.license-selector
,
.gitlab-ci-yml-selector
{
.gitignore-selector
,
.license-selector
,
.gitlab-ci-yml-selector
{
.dropdown
{
.dropdown
{
line-height
:
21px
;
line-height
:
21px
;
}
}
...
...
app/assets/stylesheets/pages/errors.scss
View file @
791c9d0d
...
@@ -2,7 +2,9 @@
...
@@ -2,7 +2,9 @@
max-width
:
400px
;
max-width
:
400px
;
margin
:
0
auto
;
margin
:
0
auto
;
h1
,
h2
,
h3
{
h1
,
h2
,
h3
{
text-align
:
center
;
text-align
:
center
;
}
}
...
...
app/assets/stylesheets/pages/issues.scss
View file @
791c9d0d
...
@@ -43,7 +43,8 @@ ul.related-merge-requests > li {
...
@@ -43,7 +43,8 @@ ul.related-merge-requests > li {
}
}
}
}
.merge-requests-title
,
.related-branches-title
{
.merge-requests-title
,
.related-branches-title
{
font-size
:
16px
;
font-size
:
16px
;
font-weight
:
600
;
font-weight
:
600
;
}
}
...
...
app/assets/stylesheets/pages/login.scss
View file @
791c9d0d
...
@@ -41,7 +41,8 @@
...
@@ -41,7 +41,8 @@
font-size
:
13px
;
font-size
:
13px
;
}
}
.login-box
,
.omniauth-container
{
.login-box
,
.omniauth-container
{
box-shadow
:
0
0
0
1px
$border-color
;
box-shadow
:
0
0
0
1px
$border-color
;
border-bottom-right-radius
:
2px
;
border-bottom-right-radius
:
2px
;
border-bottom-left-radius
:
2px
;
border-bottom-left-radius
:
2px
;
...
@@ -198,7 +199,8 @@
...
@@ -198,7 +199,8 @@
.form-control
{
.form-control
{
&
:active
,
&
:focus
{
&
:active
,
&
:focus
{
background-color
:
#fff
;
background-color
:
#fff
;
}
}
}
}
...
@@ -261,7 +263,8 @@
...
@@ -261,7 +263,8 @@
position
:
relative
;
position
:
relative
;
}
}
.footer-container
,
hr
.footer-fixed
{
.footer-container
,
hr
.footer-fixed
{
position
:
absolute
;
position
:
absolute
;
bottom
:
0
;
bottom
:
0
;
left
:
0
;
left
:
0
;
...
...
app/assets/stylesheets/pages/merge_conflicts.scss
View file @
791c9d0d
...
@@ -101,7 +101,8 @@ $colors: (
...
@@ -101,7 +101,8 @@ $colors: (
@mixin
color-scheme
(
$color
)
{
@mixin
color-scheme
(
$color
)
{
.header.line_content
,
.diff-line-num
{
.header.line_content
,
.diff-line-num
{
&
.origin
{
&
.origin
{
background-color
:
map-get
(
$colors
,
#{
$color
}
_header_origin_neutral
);
background-color
:
map-get
(
$colors
,
#{
$color
}
_header_origin_neutral
);
border-color
:
map-get
(
$colors
,
#{
$color
}
_header_origin_neutral
);
border-color
:
map-get
(
$colors
,
#{
$color
}
_header_origin_neutral
);
...
...
app/assets/stylesheets/pages/milestone.scss
View file @
791c9d0d
...
@@ -50,7 +50,8 @@
...
@@ -50,7 +50,8 @@
}
}
}
}
.issues-sortable-list
,
.merge_requests-sortable-list
{
.issues-sortable-list
,
.merge_requests-sortable-list
{
.issuable-detail
{
.issuable-detail
{
display
:
block
;
display
:
block
;
margin-top
:
7px
;
margin-top
:
7px
;
...
...
app/assets/stylesheets/pages/note_form.scss
View file @
791c9d0d
...
@@ -24,7 +24,8 @@
...
@@ -24,7 +24,8 @@
display
:
none
;
display
:
none
;
}
}
.new-note
,
.note-edit-form
{
.new-note
,
.note-edit-form
{
.note-form-actions
{
.note-form-actions
{
margin-top
:
$gl-padding
;
margin-top
:
$gl-padding
;
}
}
...
...
app/assets/stylesheets/pages/notes.scss
View file @
791c9d0d
...
@@ -28,7 +28,8 @@ ul.notes {
...
@@ -28,7 +28,8 @@ ul.notes {
}
}
}
}
.note-created-ago
,
.note-updated-at
{
.note-created-ago
,
.note-updated-at
{
white-space
:
nowrap
;
white-space
:
nowrap
;
}
}
...
...
app/assets/stylesheets/pages/pipelines.scss
View file @
791c9d0d
...
@@ -248,7 +248,8 @@
...
@@ -248,7 +248,8 @@
font-size
:
14px
;
font-size
:
14px
;
}
}
svg
,
.fa
{
svg
,
.fa
{
margin-right
:
0
;
margin-right
:
0
;
}
}
}
}
...
@@ -529,7 +530,8 @@
...
@@ -529,7 +530,8 @@
// Connect each build (except for first) with curved lines
// Connect each build (except for first) with curved lines
&
:not
(
:first-child
)
{
&
:not
(
:first-child
)
{
&
:
:
after
,
&::
before
{
&
:
:
after
,
&::
before
{
content
:
''
;
content
:
''
;
top
:
-49px
;
top
:
-49px
;
position
:
absolute
;
position
:
absolute
;
...
@@ -555,7 +557,8 @@
...
@@ -555,7 +557,8 @@
// Connect second build to first build with smaller curved line
// Connect second build to first build with smaller curved line
&
:nth-child
(
2
)
{
&
:nth-child
(
2
)
{
&
:
:
after
,
&::
before
{
&
:
:
after
,
&::
before
{
height
:
29px
;
height
:
29px
;
top
:
-9px
;
top
:
-9px
;
}
}
...
@@ -570,7 +573,8 @@
...
@@ -570,7 +573,8 @@
.build
{
.build
{
// Remove right connecting horizontal line from first build in last stage
// Remove right connecting horizontal line from first build in last stage
&
:first-child
{
&
:first-child
{
&
:
:
after
,
&::
before
{
&
:
:
after
,
&::
before
{
border
:
none
;
border
:
none
;
}
}
}
}
...
...
app/assets/stylesheets/pages/profile.scss
View file @
791c9d0d
...
@@ -253,7 +253,8 @@
...
@@ -253,7 +253,8 @@
}
}
table
.u2f-registrations
{
table
.u2f-registrations
{
th
:not
(
:last-child
),
td
:not
(
:last-child
)
{
th
:not
(
:last-child
),
td
:not
(
:last-child
)
{
border-right
:
solid
1px
transparent
;
border-right
:
solid
1px
transparent
;
}
}
}
}
\ No newline at end of file
app/assets/stylesheets/pages/projects.scss
View file @
791c9d0d
...
@@ -6,7 +6,8 @@
...
@@ -6,7 +6,8 @@
}
}
}
}
.no-ssh-key-message
,
.project-limit-message
{
.no-ssh-key-message
,
.project-limit-message
{
background-color
:
#f28d35
;
background-color
:
#f28d35
;
margin-bottom
:
0
;
margin-bottom
:
0
;
}
}
...
@@ -385,7 +386,8 @@ a.deploy-project-label {
...
@@ -385,7 +386,8 @@ a.deploy-project-label {
text-align
:
center
;
text-align
:
center
;
width
:
169px
;
width
:
169px
;
&
:hover
,
&
.forked
{
&
:hover
,
&
.forked
{
background-color
:
$row-hover
;
background-color
:
$row-hover
;
border-color
:
$row-hover-border
;
border-color
:
$row-hover-border
;
}
}
...
@@ -734,7 +736,8 @@ pre.light-well {
...
@@ -734,7 +736,8 @@ pre.light-well {
.table-bordered
{
.table-bordered
{
border-radius
:
1px
;
border-radius
:
1px
;
th
:not
(
:last-child
),
td
:not
(
:last-child
)
{
th
:not
(
:last-child
),
td
:not
(
:last-child
)
{
border-right
:
solid
1px
transparent
;
border-right
:
solid
1px
transparent
;
}
}
}
}
...
@@ -757,7 +760,8 @@ pre.light-well {
...
@@ -757,7 +760,8 @@ pre.light-well {
}
}
}
}
.project-refs-form
.dropdown-menu
,
.dropdown-menu-projects
{
.project-refs-form
.dropdown-menu
,
.dropdown-menu-projects
{
width
:
300px
;
width
:
300px
;
@media
(
min-width
:
$screen-sm-min
)
{
@media
(
min-width
:
$screen-sm-min
)
{
...
...
app/assets/stylesheets/pages/search.scss
View file @
791c9d0d
...
@@ -65,7 +65,8 @@
...
@@ -65,7 +65,8 @@
.search-input-wrap
{
.search-input-wrap
{
width
:
100%
;
width
:
100%
;
.search-icon
,
.clear-icon
{
.search-icon
,
.clear-icon
{
position
:
absolute
;
position
:
absolute
;
right
:
5px
;
right
:
5px
;
top
:
0
;
top
:
0
;
...
@@ -185,7 +186,8 @@
...
@@ -185,7 +186,8 @@
padding-right
:
$gl-padding
+
15px
;
padding-right
:
$gl-padding
+
15px
;
}
}
.btn-search
,
.btn-new
{
.btn-search
,
.btn-new
{
width
:
100%
;
width
:
100%
;
margin-top
:
5px
;
margin-top
:
5px
;
...
...
app/assets/stylesheets/pages/tree.scss
View file @
791c9d0d
...
@@ -23,7 +23,8 @@
...
@@ -23,7 +23,8 @@
border-bottom
:
1px
solid
$table-border-gray
;
border-bottom
:
1px
solid
$table-border-gray
;
border-top
:
1px
solid
$table-border-gray
;
border-top
:
1px
solid
$table-border-gray
;
td
,
th
{
td
,
th
{
line-height
:
21px
;
line-height
:
21px
;
}
}
...
@@ -74,7 +75,8 @@
...
@@ -74,7 +75,8 @@
max-width
:
320px
;
max-width
:
320px
;
vertical-align
:
middle
;
vertical-align
:
middle
;
i
,
a
{
i
,
a
{
color
:
$gl-dark-link-color
;
color
:
$gl-dark-link-color
;
}
}
...
...
app/assets/stylesheets/print.scss
View file @
791c9d0d
.wiki
h1
,
.wiki
h2
,
.wiki
h3
,
.wiki
h4
,
.wiki
h5
,
.wiki
h6
{
margin-top
:
17px
;
}
.wiki
h1
,
.wiki
h1
{
font-size
:
30px
;}
.wiki
h2
,
.wiki
h2
{
font-size
:
22px
;}
.wiki
h3
,
.wiki
h3
{
font-size
:
18px
;
font-weight
:
bold
;
}
.wiki
h4
,
.wiki
h5
,
.wiki
h6
{
margin-top
:
17px
;
}
.wiki
h1
{
font-size
:
30px
;
}
.wiki
h2
{
font-size
:
22px
;
}
.wiki
h3
{
font-size
:
18px
;
font-weight
:
bold
;
}
header
,
header
,
nav
,
nav
,
...
...
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