diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-07-19 18:33:53 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2016-07-19 18:33:53 +0000 |
commit | c263c84ae471f337e02547cc1e0a1de979ef4280 (patch) | |
tree | 90a28439b59f47e7e73caa9aa171ae49635b2301 /app/assets/stylesheets | |
parent | 1d7ac1641e50938c854abf249c53e51ce1ef2ed5 (diff) | |
parent | 13c62cdbfad1cc7f140d59f018b6004f92e6d3b5 (diff) | |
download | gitlab-ce-c263c84ae471f337e02547cc1e0a1de979ef4280.tar.gz |
Merge branch 'fork-icon' into 'master'
New fork icon!
## What does this MR do?
We are using the old fork icon for branching only, so this implements our new custom fork icon
## Screenshots (if relevant)
![Screen_Shot_2016-07-15_at_9.22.33_AM](/uploads/05abaffff314e41f582189327bcca6b2/Screen_Shot_2016-07-15_at_9.22.33_AM.png)
![Screen_Shot_2016-07-15_at_9.29.14_AM](/uploads/a08c622c92da00945406bbd4b3497749/Screen_Shot_2016-07-15_at_9.29.14_AM.png)
cc @hazelyang
See merge request !5276
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/framework/buttons.scss | 18 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 11 |
2 files changed, 29 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss index 590b8f54363..f87b8a2ad1c 100644 --- a/app/assets/stylesheets/framework/buttons.scss +++ b/app/assets/stylesheets/framework/buttons.scss @@ -49,6 +49,17 @@ border-color: $border-dark; color: $color; } + + svg { + + path { + fill: $color; + } + + use { + stroke: $color; + } + } } @mixin btn-green { @@ -173,6 +184,13 @@ .caret { margin-left: 5px; } + + svg { + height: 15px; + width: auto; + position: relative; + top: 2px; + } } .btn-lg { diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index ea9f7cf0540..7c36ce85fb1 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -129,6 +129,17 @@ color: $layout-link-gray; } + svg { + + path { + fill: $layout-link-gray; + } + + use { + stroke: $layout-link-gray; + } + } + .fa-caret-down { margin-left: 3px; } |