summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorAnnabel Dunstone <annabel.dunstone@gmail.com>2016-05-23 18:35:18 -0500
committerAnnabel Dunstone <annabel.dunstone@gmail.com>2016-06-08 12:56:02 -0500
commit5e9e9a1e8284a8d87780725f765a6c04ab100117 (patch)
treeaca8b31e11dd17465cc1ed0fce7602723a540124 /app/assets
parentf3637ed782dace291473f56967c26bde42dd9bf9 (diff)
downloadgitlab-ce-5e9e9a1e8284a8d87780725f765a6c04ab100117.tar.gz
Add SVG icons to side bar
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/framework/gitlab-theme.scss27
-rw-r--r--app/assets/stylesheets/framework/sidebar.scss4
2 files changed, 21 insertions, 10 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;
}