Commit d7960bca authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'ui-improvements' into 'master'

Ui improvements
parents fe302d4c 55ab7a2a
......@@ -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 }
......
.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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment