Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
cad76726
Commit
cad76726
authored
Aug 04, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '35275-change-issue-icon' into 'master'
Update top bar issues icon Closes #35275 See merge request !13263
parents
0b102591
94168d5a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
5 deletions
+13
-5
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+2
-2
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+8
-0
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+1
-1
app/views/layouts/header/_new.html.haml
app/views/layouts/header/_new.html.haml
+1
-1
app/views/shared/milestones/_sidebar.html.haml
app/views/shared/milestones/_sidebar.html.haml
+1
-1
No files found.
app/assets/stylesheets/framework/header.scss
View file @
cad76726
...
@@ -325,9 +325,9 @@ header {
...
@@ -325,9 +325,9 @@ header {
li
{
li
{
.badge
{
.badge
{
position
:
inherit
;
position
:
inherit
;
top
:
-
3
px
;
top
:
-
8
px
;
font-weight
:
normal
;
font-weight
:
normal
;
margin-left
:
-1
2
px
;
margin-left
:
-1
1
px
;
font-size
:
11px
;
font-size
:
11px
;
color
:
$white-light
;
color
:
$white-light
;
padding
:
1px
5px
2px
;
padding
:
1px
5px
2px
;
...
...
app/assets/stylesheets/pages/issuable.scss
View file @
cad76726
...
@@ -328,9 +328,17 @@
...
@@ -328,9 +328,17 @@
margin-bottom
:
10px
;
margin-bottom
:
10px
;
color
:
$issuable-sidebar-color
;
color
:
$issuable-sidebar-color
;
svg
{
fill
:
$issuable-sidebar-color
;
}
&
:hover
,
&
:hover
,
&
:hover
.todo-undone
{
&
:hover
.todo-undone
{
color
:
$gl-text-color
;
color
:
$gl-text-color
;
svg
{
fill
:
$gl-text-color
;
}
}
}
span
{
span
{
...
...
app/views/layouts/header/_default.html.haml
View file @
cad76726
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
=
icon
(
'tachometer fw'
)
=
icon
(
'tachometer fw'
)
%li
%li
=
link_to
assigned_issues_dashboard_path
,
title:
'Issues'
,
aria:
{
label:
"Issues"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
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
)
-
issues_count
=
assigned_issuables_count
(
:issues
)
%span
.badge.issues-count
{
class:
(
'hidden'
if
issues_count
.
zero?
)
}
%span
.badge.issues-count
{
class:
(
'hidden'
if
issues_count
.
zero?
)
}
=
number_with_delimiter
(
issues_count
)
=
number_with_delimiter
(
issues_count
)
...
...
app/views/layouts/header/_new.html.haml
View file @
cad76726
...
@@ -38,7 +38,7 @@
...
@@ -38,7 +38,7 @@
=
icon
(
'tachometer fw'
)
=
icon
(
'tachometer fw'
)
%li
%li
=
link_to
assigned_issues_dashboard_path
,
title:
'Issues'
,
aria:
{
label:
"Issues"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
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
)
-
issues_count
=
assigned_issuables_count
(
:issues
)
%span
.badge.issues-count
{
class:
(
'hidden'
if
issues_count
.
zero?
)
}
%span
.badge.issues-count
{
class:
(
'hidden'
if
issues_count
.
zero?
)
}
=
number_with_delimiter
(
issues_count
)
=
number_with_delimiter
(
issues_count
)
...
...
app/views/shared/milestones/_sidebar.html.haml
View file @
cad76726
...
@@ -67,7 +67,7 @@
...
@@ -67,7 +67,7 @@
.block.issues
.block.issues
.sidebar-collapsed-icon
.sidebar-collapsed-icon
%strong
%strong
=
icon
(
'hashtag'
,
'aria-hidden'
:
'true
'
)
=
custom_icon
(
'issues
'
)
%span
=
milestone
.
issues_visible_to_user
(
current_user
).
count
%span
=
milestone
.
issues_visible_to_user
(
current_user
).
count
.title.hide-collapsed
.title.hide-collapsed
Issues
Issues
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment