From 5e9e9a1e8284a8d87780725f765a6c04ab100117 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Date: Mon, 23 May 2016 18:35:18 -0500 Subject: Add SVG icons to side bar --- app/assets/stylesheets/framework/gitlab-theme.scss | 27 ++++++++++--- app/assets/stylesheets/framework/sidebar.scss | 4 -- app/views/shared/icons/_contributionanalytics.svg | 26 ++++-------- app/views/shared/icons/_group.svg | 44 +++++--------------- app/views/shared/icons/_issues.svg | 35 +++------------- app/views/shared/icons/_members.svg | 12 ++---- app/views/shared/icons/_milestones.svg | 47 ++++------------------ app/views/shared/icons/_mr.svg | 44 +++----------------- 8 files changed, 60 insertions(+), 179 deletions(-) diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss index cd2eba59f90..2540ff497f2 100644 --- a/app/assets/stylesheets/framework/gitlab-theme.scss +++ b/app/assets/stylesheets/framework/gitlab-theme.scss @@ -22,17 +22,17 @@ &:hover { background-color: $color-dark; a { - color: #fff; + color: $white-light; h3 { - color: #fff; + color: $white-light; } } } } .collapse-nav a { - color: #fff; + color: $white-light; background: $color; } @@ -45,7 +45,7 @@ &:hover { background-color: $color-dark; - color: #fff; + color: $white-light; text-decoration: none; } } @@ -63,10 +63,20 @@ color: $color-light; } + path, + polygon { + fill: $color-light; + } + .count { color: $color-light; background: $color-dark; } + + svg { + position: relative; + top: 3px; + } } &.separate-item { @@ -74,7 +84,7 @@ } &.active a { - color: #fff; + color: $white-light; background: $color-dark; &.no-highlight { @@ -82,7 +92,12 @@ } i { - color: #fff + color: $white-light + } + + path, + polygon { + fill: $white-light; } } } diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index fa9cddef0ad..12a342bf0b3 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -113,10 +113,6 @@ color: $gray-light; } - path { - fill: $gray-light; - } - svg { margin-right: 13px; } diff --git a/app/views/shared/icons/_contributionanalytics.svg b/app/views/shared/icons/_contributionanalytics.svg index 33edf0f9320..adf09a14964 100644 --- a/app/views/shared/icons/_contributionanalytics.svg +++ b/app/views/shared/icons/_contributionanalytics.svg @@ -1,27 +1,17 @@ - Pasted Image 234 + Group Created with Sketch. - - - + - + - - - - - - - - - - - - - + + + + + \ No newline at end of file diff --git a/app/views/shared/icons/_group.svg b/app/views/shared/icons/_group.svg index 6f2c530c9ba..75cae0d16c8 100644 --- a/app/views/shared/icons/_group.svg +++ b/app/views/shared/icons/_group.svg @@ -1,42 +1,18 @@ - Pasted Image 232 + Group Created with Sketch. - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/app/views/shared/icons/_issues.svg b/app/views/shared/icons/_issues.svg index 92f48b897b2..2682c27ade9 100644 --- a/app/views/shared/icons/_issues.svg +++ b/app/views/shared/icons/_issues.svg @@ -1,38 +1,13 @@ - Pasted Image 227 + Group Created with Sketch. - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/app/views/shared/icons/_members.svg b/app/views/shared/icons/_members.svg index 98635108d0f..f8043b31fe8 100644 --- a/app/views/shared/icons/_members.svg +++ b/app/views/shared/icons/_members.svg @@ -1,17 +1,13 @@ - Pasted Image 233 + Group Created with Sketch. - - - - - - - + + + \ No newline at end of file diff --git a/app/views/shared/icons/_milestones.svg b/app/views/shared/icons/_milestones.svg index f4f5b0c8671..3d62ecc0631 100644 --- a/app/views/shared/icons/_milestones.svg +++ b/app/views/shared/icons/_milestones.svg @@ -1,48 +1,15 @@ - Pasted Image 226 + Group Created with Sketch. - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + \ No newline at end of file diff --git a/app/views/shared/icons/_mr.svg b/app/views/shared/icons/_mr.svg index c14a5c28163..dd3dbcc4473 100644 --- a/app/views/shared/icons/_mr.svg +++ b/app/views/shared/icons/_mr.svg @@ -1,47 +1,13 @@ - Pasted Image 228 + Group Created with Sketch. - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + \ No newline at end of file -- cgit v1.2.1