Merge branch 'ui-improvements' into 'master'

Ui improvements

Merge branch 'ui-improvements' into 'master'
Ui improvements
Dmitriy Zaporozhets
2 parents fe302d4c 55ab7a2a
Showing 7 changed files with 42 additions and 30 deletions Show diff stats
app/assets/stylesheets/generic/common.scss
app/assets/stylesheets/sections/notifications.scss
app/assets/stylesheets/sections/profile.scss
app/assets/stylesheets/sections/projects.scss
app/helpers/notifications_helper.rb
app/helpers/visibility_level_helper.rb
app/views/projects/blob/_blob.html.haml
@@ -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 }
@@ -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;
+}
-.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;
-}
@@ -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;
+}
 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
@@ -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
  
@@ -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)
...	...	@@ -3,12 +3,7 @@
3	3	.clgray { color: #BBB }
4	4	.cred { color: #D12F19 }
5	5	.cgreen { color: #4a2 }
6		-.cblue { color: #29A }
7		-.cblack { color: #111 }
8	6	.cdark { color: #444 }
9		-.camber { color: #ffc000 }
10		-.cwhite { color: #fff!important }
11		-.bgred { background: #F2DEDE!important }
12	7
13	8	/ COMMON CLASSES /
14	9	.prepend-top-10 { margin-top:10px }
...	...
...	...	@@ -0,0 +1,22 @@
	1	+.global-notifications-form .level-title {
	2	+ font-size: 15px;
	3	+ color: #333;
	4	+ font-weight: bold;
	5	+}
	6	+
	7	+.notification-icon-holder {
	8	+ width: 20px;
	9	+ float: left;
	10	+}
	11	+
	12	+.ns-part {
	13	+ color: $bg_primary;
	14	+}
	15	+
	16	+.ns-watch {
	17	+ color: $bg_success;
	18	+}
	19	+
	20	+.ns-mute {
	21	+ color: $bg_danger;
	22	+}
...	...
1		-.update-notifications {
2		- .radio-inline {
3		- margin-right: 9%;
4		- }
5		-}
6		-
7	1	.account-page {
8	2	fieldset {
9	3	margin-bottom: 15px;
...	...	@@ -114,14 +108,3 @@
114	108	height: 50px;
115	109	}
116	110	}
117		-
118		-.global-notifications-form .level-title {
119		- font-size: 15px;
120		- color: #333;
121		- font-weight: bold;
122		-}
123		-
124		-.notification-icon-holder {
125		- width: 20px;
126		- float: left;
127		-}
...	...
...	...	@@ -232,3 +232,15 @@ ul.nav.nav-projects-tabs {
232	232	.deploy-project-label {
233	233	margin: 1px;
234	234	}
	235	+
	236	+.vs-public {
	237	+ color: $bg_primary;
	238	+}
	239	+
	240	+.vs-internal {
	241	+ color: $bg_warning;
	242	+}
	243	+
	244	+.vs-private {
	245	+ color: $bg_success;
	246	+}
...	...
1	1	module NotificationsHelper
2	2	def notification_icon(notification)
3	3	if notification.disabled?
4		- content_tag :i, nil, class: 'icon-volume-off cred'
	4	+ content_tag :i, nil, class: 'icon-volume-off ns-mute'
5	5	elsif notification.participating?
6		- content_tag :i, nil, class: 'icon-volume-down cblue'
	6	+ content_tag :i, nil, class: 'icon-volume-down ns-part'
7	7	elsif notification.watch?
8		- content_tag :i, nil, class: 'icon-volume-up cgreen'
	8	+ content_tag :i, nil, class: 'icon-volume-up ns-watch'
9	9	else
10		- content_tag :i, nil, class: 'icon-circle-blank cblue'
	10	+ content_tag :i, nil, class: 'icon-circle-blank ns-default'
11	11	end
12	12	end
13	13	end
...	...
...	...	@@ -2,11 +2,11 @@ module VisibilityLevelHelper
2	2	def visibility_level_color(level)
3	3	case level
4	4	when Gitlab::VisibilityLevel::PRIVATE
5		- 'cgreen'
	5	+ 'vs-private'
6	6	when Gitlab::VisibilityLevel::INTERNAL
7		- 'camber'
	7	+ 'vs-internal'
8	8	when Gitlab::VisibilityLevel::PUBLIC
9		- 'cblue'
	9	+ 'vs-public'
10	10	end
11	11	end
12	12
...	...
...	...	@@ -8,7 +8,7 @@
8	8	- if path
9	9	- if path.end_with?(@path)
10	10	= link_to project_blob_path(@project, path) do
11		- %span.cblue
	11	+ %strong
12	12	= truncate(title, length: 40)
13	13	- else
14	14	= link_to truncate(title, length: 40), project_tree_path(@project, path)
...	...