Merge branch '35275-change-issue-icon' into 'master'

Update top bar issues icon

Closes #35275

See merge request !13263
This commit is contained in:
Phil Hughes 2017-08-04 19:37:00 +00:00
commit cad767260d
5 changed files with 13 additions and 5 deletions

View file

@ -325,9 +325,9 @@ header {
li {
.badge {
position: inherit;
top: -3px;
top: -8px;
font-weight: normal;
margin-left: -12px;
margin-left: -11px;
font-size: 11px;
color: $white-light;
padding: 1px 5px 2px;

View file

@ -328,9 +328,17 @@
margin-bottom: 10px;
color: $issuable-sidebar-color;
svg {
fill: $issuable-sidebar-color;
}
&:hover,
&:hover .todo-undone {
color: $gl-text-color;
svg {
fill: $gl-text-color;
}
}
span {

View file

@ -44,7 +44,7 @@
= icon('tachometer fw')
%li
= link_to assigned_issues_dashboard_path, title: 'Issues', aria: { label: "Issues" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
= icon('hashtag fw')
= custom_icon('issues')
- issues_count = assigned_issuables_count(:issues)
%span.badge.issues-count{ class: ('hidden' if issues_count.zero?) }
= number_with_delimiter(issues_count)

View file

@ -38,7 +38,7 @@
= icon('tachometer fw')
%li
= link_to assigned_issues_dashboard_path, title: 'Issues', aria: { label: "Issues" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
= icon('hashtag fw')
= custom_icon('issues')
- issues_count = assigned_issuables_count(:issues)
%span.badge.issues-count{ class: ('hidden' if issues_count.zero?) }
= number_with_delimiter(issues_count)

View file

@ -67,7 +67,7 @@
.block.issues
.sidebar-collapsed-icon
%strong
= icon('hashtag', 'aria-hidden': 'true')
= custom_icon('issues')
%span= milestone.issues_visible_to_user(current_user).count
.title.hide-collapsed
Issues