Merge branch 'ui-improvements' into 'master'

Ui improvements

7 files changed, 42 insertions, 30 deletions

diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss
index 0cb2090f53d..3b034b757b4 100644
--- a/app/assets/stylesheets/generic/common.scss
+++ b/app/assets/stylesheets/generic/common.scss
@@ -3,12 +3,7 @@
 .clgray { color: #BBB }
 .cred { color: #D12F19 }
 .cgreen { color: #4a2 }
-.cblue { color: #29A }
-.cblack { color: #111 }
 .cdark { color: #444 }
-.camber { color: #ffc000 }
-.cwhite { color: #fff!important }
-.bgred { background: #F2DEDE!important }
 
 /** COMMON CLASSES **/
 .prepend-top-10 { margin-top:10px }
diff --git a/app/assets/stylesheets/sections/notifications.scss b/app/assets/stylesheets/sections/notifications.scss
new file mode 100644
index 00000000000..f11c5dff4ab
--- /dev/null
+++ b/app/assets/stylesheets/sections/notifications.scss
@@ -0,0 +1,22 @@
+.global-notifications-form .level-title {
+  font-size: 15px;
+  color: #333;
+  font-weight: bold;
+}
+
+.notification-icon-holder {
+  width: 20px;
+  float: left;
+}
+
+.ns-part {
+  color: $bg_primary;
+}
+
+.ns-watch {
+  color: $bg_success;
+}
+
+.ns-mute {
+  color: $bg_danger;
+}
diff --git a/app/assets/stylesheets/sections/profile.scss b/app/assets/stylesheets/sections/profile.scss
index 67aaa369381..ed73e1630f2 100644
--- a/app/assets/stylesheets/sections/profile.scss
+++ b/app/assets/stylesheets/sections/profile.scss
@@ -1,9 +1,3 @@
-.update-notifications {
-  .radio-inline {
-    margin-right: 9%;
-  }
-}
-
 .account-page {
   fieldset {
     margin-bottom: 15px;
@@ -114,14 +108,3 @@
     height: 50px;
   }
 }
-
-.global-notifications-form .level-title {
-  font-size: 15px;
-  color: #333;
-  font-weight: bold;
-}
-
-.notification-icon-holder {
-  width: 20px;
-  float: left;
-}
diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss
index 949d646afcd..35279bff6a5 100644
--- a/app/assets/stylesheets/sections/projects.scss
+++ b/app/assets/stylesheets/sections/projects.scss
@@ -232,3 +232,15 @@ ul.nav.nav-projects-tabs {
 .deploy-project-label {
   margin: 1px;
 }
+
+.vs-public {
+  color: $bg_primary;
+}
+
+.vs-internal {
+  color: $bg_warning;
+}
+
+.vs-private {
+  color: $bg_success;
+}
diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index b2399bb6db1..6c43f97446b 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -1,13 +1,13 @@
 module NotificationsHelper
   def notification_icon(notification)
     if notification.disabled?
-      content_tag :i, nil, class: 'icon-volume-off cred'
+      content_tag :i, nil, class: 'icon-volume-off ns-mute'
     elsif notification.participating?
-      content_tag :i, nil, class: 'icon-volume-down cblue'
+      content_tag :i, nil, class: 'icon-volume-down ns-part'
     elsif notification.watch?
-      content_tag :i, nil, class: 'icon-volume-up cgreen'
+      content_tag :i, nil, class: 'icon-volume-up ns-watch'
     else
-      content_tag :i, nil, class: 'icon-circle-blank cblue'
+      content_tag :i, nil, class: 'icon-circle-blank ns-default'
     end
   end
 end
diff --git a/app/helpers/visibility_level_helper.rb b/app/helpers/visibility_level_helper.rb
index 81e10f3685c..8b83b8ff640 100644
--- a/app/helpers/visibility_level_helper.rb
+++ b/app/helpers/visibility_level_helper.rb
@@ -2,11 +2,11 @@ module VisibilityLevelHelper
   def visibility_level_color(level)
     case level
     when Gitlab::VisibilityLevel::PRIVATE
-      'cgreen'
+      'vs-private'
     when Gitlab::VisibilityLevel::INTERNAL
-      'camber'
+      'vs-internal'
     when Gitlab::VisibilityLevel::PUBLIC
-      'cblue'
+      'vs-public'
     end
   end
 
diff --git a/app/views/projects/blob/_blob.html.haml b/app/views/projects/blob/_blob.html.haml
index 863e4e3de53..b0cac828f3b 100644
--- a/app/views/projects/blob/_blob.html.haml
+++ b/app/views/projects/blob/_blob.html.haml
@@ -8,7 +8,7 @@
       - if path
         - if path.end_with?(@path)
           = link_to project_blob_path(@project, path) do
-            %span.cblue
+            %strong
               = truncate(title, length: 40)
         - else
           = link_to truncate(title, length: 40), project_tree_path(@project, path)