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
7054a3cb
Commit
7054a3cb
authored
Nov 21, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'svg-color' into 'master'
default fill color for SVGs See merge request gitlab-org/gitlab-ce!15476
parents
b462edfd
a82b9df5
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
2 additions
and
108 deletions
+2
-108
app/assets/stylesheets/framework/contextual-sidebar.scss
app/assets/stylesheets/framework/contextual-sidebar.scss
+0
-19
app/assets/stylesheets/framework/filters.scss
app/assets/stylesheets/framework/filters.scss
+0
-5
app/assets/stylesheets/framework/gitlab-theme.scss
app/assets/stylesheets/framework/gitlab-theme.scss
+0
-8
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+0
-20
app/assets/stylesheets/framework/icons.scss
app/assets/stylesheets/framework/icons.scss
+0
-28
app/assets/stylesheets/framework/images.scss
app/assets/stylesheets/framework/images.scss
+2
-0
app/assets/stylesheets/framework/mixins.scss
app/assets/stylesheets/framework/mixins.scss
+0
-8
app/assets/stylesheets/framework/zen.scss
app/assets/stylesheets/framework/zen.scss
+0
-8
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+0
-8
app/assets/stylesheets/pages/status.scss
app/assets/stylesheets/pages/status.scss
+0
-4
No files found.
app/assets/stylesheets/framework/contextual-sidebar.scss
View file @
7054a3cb
...
@@ -40,12 +40,6 @@
...
@@ -40,12 +40,6 @@
a
:hover
{
a
:hover
{
background-color
:
$link-hover-background
;
background-color
:
$link-hover-background
;
color
:
$gl-text-color
;
color
:
$gl-text-color
;
.settings-avatar
{
svg
{
fill
:
$gl-text-color
;
}
}
}
}
.avatar-container
{
.avatar-container
{
...
@@ -138,10 +132,6 @@
...
@@ -138,10 +132,6 @@
color
:
$gl-text-color-secondary
;
color
:
$gl-text-color-secondary
;
}
}
svg
{
fill
:
$gl-text-color-secondary
;
}
.nav-item-name
{
.nav-item-name
{
flex
:
1
;
flex
:
1
;
}
}
...
@@ -224,10 +214,6 @@
...
@@ -224,10 +214,6 @@
&
:hover
{
&
:hover
{
color
:
$gl-text-color
;
color
:
$gl-text-color
;
svg
{
fill
:
$gl-text-color
;
}
}
}
}
}
...
@@ -338,7 +324,6 @@
...
@@ -338,7 +324,6 @@
align-items
:
center
;
align-items
:
center
;
svg
{
svg
{
fill
:
$gl-text-color-secondary
;
margin-right
:
8px
;
margin-right
:
8px
;
}
}
...
@@ -349,10 +334,6 @@
...
@@ -349,10 +334,6 @@
&
:hover
{
&
:hover
{
background-color
:
$border-color
;
background-color
:
$border-color
;
color
:
$gl-text-color
;
color
:
$gl-text-color
;
svg
{
fill
:
$gl-text-color
;
}
}
}
}
}
...
...
app/assets/stylesheets/framework/filters.scss
View file @
7054a3cb
...
@@ -305,16 +305,11 @@
...
@@ -305,16 +305,11 @@
color
:
$gl-text-color
;
color
:
$gl-text-color
;
border-color
:
$dropdown-input-focus-border
;
border-color
:
$dropdown-input-focus-border
;
outline
:
none
;
outline
:
none
;
svg
{
fill
:
$gl-text-color
;
}
}
}
svg
{
svg
{
height
:
14px
;
height
:
14px
;
width
:
14px
;
width
:
14px
;
fill
:
$gl-text-color-secondary
;
vertical-align
:
middle
;
vertical-align
:
middle
;
}
}
...
...
app/assets/stylesheets/framework/gitlab-theme.scss
View file @
7054a3cb
...
@@ -30,10 +30,6 @@
...
@@ -30,10 +30,6 @@
&
.dropdown.open
>
a
{
&
.dropdown.open
>
a
{
color
:
$color-900
;
color
:
$color-900
;
background-color
:
$color-alternate
;
background-color
:
$color-alternate
;
svg
{
fill
:
currentColor
;
}
}
}
&
.line-separator
{
&
.line-separator
{
...
@@ -51,10 +47,6 @@
...
@@ -51,10 +47,6 @@
color
:
$color-200
;
color
:
$color-200
;
>
a
{
>
a
{
svg
{
fill
:
$color-200
;
}
&
.header-user-dropdown-toggle
{
&
.header-user-dropdown-toggle
{
.header-user-avatar
{
.header-user-avatar
{
border-color
:
$color-200
;
border-color
:
$color-200
;
...
...
app/assets/stylesheets/framework/header.scss
View file @
7054a3cb
...
@@ -235,10 +235,6 @@
...
@@ -235,10 +235,6 @@
opacity
:
1
;
opacity
:
1
;
color
:
$white-light
;
color
:
$white-light
;
svg
{
fill
:
currentColor
;
}
&
.header-user-dropdown-toggle
.header-user-avatar
{
&
.header-user-dropdown-toggle
.header-user-avatar
{
border-color
:
$white-light
;
border-color
:
$white-light
;
}
}
...
@@ -269,14 +265,6 @@
...
@@ -269,14 +265,6 @@
font-size
:
20px
;
font-size
:
20px
;
}
}
}
}
&
.active
>
a
,
&
.dropdown.open
>
a
{
svg
{
fill
:
currentColor
;
}
}
}
}
}
}
}
}
...
@@ -289,10 +277,6 @@
...
@@ -289,10 +277,6 @@
text-decoration
:
none
;
text-decoration
:
none
;
outline
:
0
;
outline
:
0
;
color
:
$white-light
;
color
:
$white-light
;
svg
{
fill
:
currentColor
;
}
}
}
>
a
{
>
a
{
...
@@ -307,10 +291,6 @@
...
@@ -307,10 +291,6 @@
border-radius
:
$border-radius-default
;
border-radius
:
$border-radius-default
;
height
:
32px
;
height
:
32px
;
font-weight
:
$gl-font-weight-bold
;
font-weight
:
$gl-font-weight-bold
;
svg
{
fill
:
currentColor
;
}
}
}
&
.line-separator
{
&
.line-separator
{
...
...
app/assets/stylesheets/framework/icons.scss
View file @
7054a3cb
.ci-status-icon-success
,
.ci-status-icon-success
,
.ci-status-icon-passed
{
.ci-status-icon-passed
{
color
:
$green-500
;
color
:
$green-500
;
svg
{
fill
:
$green-500
;
}
}
}
.ci-status-icon-failed
{
.ci-status-icon-failed
{
color
:
$gl-danger
;
color
:
$gl-danger
;
svg
{
fill
:
$gl-danger
;
}
}
}
.ci-status-icon-pending
,
.ci-status-icon-pending
,
.ci-status-icon-failed_with_warnings
,
.ci-status-icon-failed_with_warnings
,
.ci-status-icon-success_with_warnings
{
.ci-status-icon-success_with_warnings
{
color
:
$orange-500
;
color
:
$orange-500
;
svg
{
fill
:
$orange-500
;
}
}
}
.ci-status-icon-running
{
.ci-status-icon-running
{
color
:
$blue-400
;
color
:
$blue-400
;
svg
{
fill
:
$blue-400
;
}
}
}
.ci-status-icon-canceled
,
.ci-status-icon-canceled
,
.ci-status-icon-disabled
,
.ci-status-icon-disabled
,
.ci-status-icon-not-found
{
.ci-status-icon-not-found
{
color
:
$gl-text-color
;
color
:
$gl-text-color
;
svg
{
fill
:
$gl-text-color
;
}
}
}
.ci-status-icon-created
,
.ci-status-icon-created
,
.ci-status-icon-skipped
{
.ci-status-icon-skipped
{
color
:
$gray-darkest
;
color
:
$gray-darkest
;
svg
{
fill
:
$gray-darkest
;
}
}
}
.ci-status-icon-manual
{
.ci-status-icon-manual
{
color
:
$gl-text-color
;
color
:
$gl-text-color
;
svg
{
fill
:
$gl-text-color
;
}
}
}
.icon-link
{
.icon-link
{
...
...
app/assets/stylesheets/framework/images.scss
View file @
7054a3cb
...
@@ -27,6 +27,8 @@
...
@@ -27,6 +27,8 @@
}
}
svg
{
svg
{
fill
:
currentColor
;
&
.s8
{
@include
svg-size
(
8px
);
}
&
.s8
{
@include
svg-size
(
8px
);
}
&
.s12
{
@include
svg-size
(
12px
);
}
&
.s12
{
@include
svg-size
(
12px
);
}
&
.s16
{
@include
svg-size
(
16px
);
}
&
.s16
{
@include
svg-size
(
16px
);
}
...
...
app/assets/stylesheets/framework/mixins.scss
View file @
7054a3cb
...
@@ -130,14 +130,6 @@
...
@@ -130,14 +130,6 @@
background-color
:
$color-light
;
background-color
:
$color-light
;
color
:
$color-dark
;
color
:
$color-dark
;
border-color
:
$color-dark
;
border-color
:
$color-dark
;
svg
{
fill
:
$color-dark
;
}
}
svg
{
fill
:
$color-main
;
}
}
}
}
...
...
app/assets/stylesheets/framework/zen.scss
View file @
7054a3cb
...
@@ -57,15 +57,7 @@
...
@@ -57,15 +57,7 @@
padding
:
5px
;
padding
:
5px
;
font-size
:
36px
;
font-size
:
36px
;
svg
{
fill
:
$gl-text-color
;
}
&
:hover
{
&
:hover
{
color
:
$black
;
color
:
$black
;
svg
{
fill
:
$black
;
}
}
}
}
}
app/assets/stylesheets/pages/notes.scss
View file @
7054a3cb
...
@@ -547,10 +547,6 @@ ul.notes {
...
@@ -547,10 +547,6 @@ ul.notes {
width
:
16px
;
width
:
16px
;
top
:
0
;
top
:
0
;
vertical-align
:
text-top
;
vertical-align
:
text-top
;
path
{
fill
:
currentColor
;
}
}
}
.award-control-icon-positive
,
.award-control-icon-positive
,
...
@@ -570,10 +566,6 @@ ul.notes {
...
@@ -570,10 +566,6 @@ ul.notes {
.link-highlight
{
.link-highlight
{
color
:
$gl-link-color
;
color
:
$gl-link-color
;
fill
:
$gl-link-color
;
fill
:
$gl-link-color
;
svg
{
fill
:
$gl-link-color
;
}
}
}
.award-control-icon-neutral
{
.award-control-icon-neutral
{
...
...
app/assets/stylesheets/pages/status.scss
View file @
7054a3cb
...
@@ -55,10 +55,6 @@
...
@@ -55,10 +55,6 @@
&
:not
(
span
)
:hover
{
&
:not
(
span
)
:hover
{
background-color
:
rgba
(
$gl-text-color-secondary
,
.07
);
background-color
:
rgba
(
$gl-text-color-secondary
,
.07
);
}
}
svg
{
fill
:
$gl-text-color-secondary
;
}
}
}
}
}
...
...
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