Commit d7960bca8d2dbc67d369e70fee468364c4850481
Exists in
spb-stable
and in
2 other branches
Merge branch 'ui-improvements' into 'master'
Ui improvements
Showing
7 changed files
with
42 additions
and
30 deletions
Show diff stats
app/assets/stylesheets/generic/common.scss
| @@ -3,12 +3,7 @@ | @@ -3,12 +3,7 @@ | ||
| 3 | .clgray { color: #BBB } | 3 | .clgray { color: #BBB } |
| 4 | .cred { color: #D12F19 } | 4 | .cred { color: #D12F19 } |
| 5 | .cgreen { color: #4a2 } | 5 | .cgreen { color: #4a2 } |
| 6 | -.cblue { color: #29A } | ||
| 7 | -.cblack { color: #111 } | ||
| 8 | .cdark { color: #444 } | 6 | .cdark { color: #444 } |
| 9 | -.camber { color: #ffc000 } | ||
| 10 | -.cwhite { color: #fff!important } | ||
| 11 | -.bgred { background: #F2DEDE!important } | ||
| 12 | 7 | ||
| 13 | /** COMMON CLASSES **/ | 8 | /** COMMON CLASSES **/ |
| 14 | .prepend-top-10 { margin-top:10px } | 9 | .prepend-top-10 { margin-top:10px } |
| @@ -0,0 +1,22 @@ | @@ -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 | +} |
app/assets/stylesheets/sections/profile.scss
| 1 | -.update-notifications { | ||
| 2 | - .radio-inline { | ||
| 3 | - margin-right: 9%; | ||
| 4 | - } | ||
| 5 | -} | ||
| 6 | - | ||
| 7 | .account-page { | 1 | .account-page { |
| 8 | fieldset { | 2 | fieldset { |
| 9 | margin-bottom: 15px; | 3 | margin-bottom: 15px; |
| @@ -114,14 +108,3 @@ | @@ -114,14 +108,3 @@ | ||
| 114 | height: 50px; | 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 | -} |
app/assets/stylesheets/sections/projects.scss
| @@ -232,3 +232,15 @@ ul.nav.nav-projects-tabs { | @@ -232,3 +232,15 @@ ul.nav.nav-projects-tabs { | ||
| 232 | .deploy-project-label { | 232 | .deploy-project-label { |
| 233 | margin: 1px; | 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 | +} |
app/helpers/notifications_helper.rb
| 1 | module NotificationsHelper | 1 | module NotificationsHelper |
| 2 | def notification_icon(notification) | 2 | def notification_icon(notification) |
| 3 | if notification.disabled? | 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 | elsif notification.participating? | 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 | elsif notification.watch? | 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 | else | 9 | else |
| 10 | - content_tag :i, nil, class: 'icon-circle-blank cblue' | 10 | + content_tag :i, nil, class: 'icon-circle-blank ns-default' |
| 11 | end | 11 | end |
| 12 | end | 12 | end |
| 13 | end | 13 | end |
app/helpers/visibility_level_helper.rb
| @@ -2,11 +2,11 @@ module VisibilityLevelHelper | @@ -2,11 +2,11 @@ module VisibilityLevelHelper | ||
| 2 | def visibility_level_color(level) | 2 | def visibility_level_color(level) |
| 3 | case level | 3 | case level |
| 4 | when Gitlab::VisibilityLevel::PRIVATE | 4 | when Gitlab::VisibilityLevel::PRIVATE |
| 5 | - 'cgreen' | 5 | + 'vs-private' |
| 6 | when Gitlab::VisibilityLevel::INTERNAL | 6 | when Gitlab::VisibilityLevel::INTERNAL |
| 7 | - 'camber' | 7 | + 'vs-internal' |
| 8 | when Gitlab::VisibilityLevel::PUBLIC | 8 | when Gitlab::VisibilityLevel::PUBLIC |
| 9 | - 'cblue' | 9 | + 'vs-public' |
| 10 | end | 10 | end |
| 11 | end | 11 | end |
| 12 | 12 |
app/views/projects/blob/_blob.html.haml
| @@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
| 8 | - if path | 8 | - if path |
| 9 | - if path.end_with?(@path) | 9 | - if path.end_with?(@path) |
| 10 | = link_to project_blob_path(@project, path) do | 10 | = link_to project_blob_path(@project, path) do |
| 11 | - %span.cblue | 11 | + %strong |
| 12 | = truncate(title, length: 40) | 12 | = truncate(title, length: 40) |
| 13 | - else | 13 | - else |
| 14 | = link_to truncate(title, length: 40), project_tree_path(@project, path) | 14 | = link_to truncate(title, length: 40), project_tree_path(@project, path) |