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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
d6c388da
Commit
d6c388da
authored
Mar 02, 2017
by
Annabel Dunstone Gray
Committed by
Alfredo Sumaran
Mar 02, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "missing count badge styling in new sidebar dropdown"
parent
12592ac7
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
2 deletions
+16
-2
app/assets/stylesheets/framework/dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+10
-0
app/views/layouts/nav/_dashboard.html.haml
app/views/layouts/nav/_dashboard.html.haml
+2
-2
changelogs/unreleased/28410-dropdown-styling.yml
changelogs/unreleased/28410-dropdown-styling.yml
+4
-0
No files found.
app/assets/stylesheets/framework/dropdowns.scss
View file @
d6c388da
...
@@ -193,6 +193,10 @@
...
@@ -193,6 +193,10 @@
&
.is-focused
{
&
.is-focused
{
background-color
:
$dropdown-link-hover-bg
;
background-color
:
$dropdown-link-hover-bg
;
text-decoration
:
none
;
text-decoration
:
none
;
.badge
{
background-color
:
darken
(
$row-hover
,
5%
);
}
}
}
&
.dropdown-menu-empty-link
{
&
.dropdown-menu-empty-link
{
...
@@ -229,6 +233,12 @@
...
@@ -229,6 +233,12 @@
padding
:
5px
8px
;
padding
:
5px
8px
;
color
:
$gl-text-color-secondary
;
color
:
$gl-text-color-secondary
;
}
}
.badge
{
position
:
absolute
;
right
:
8px
;
top
:
5px
;
}
}
}
.dropdown-menu-drop-up
{
.dropdown-menu-drop-up
{
...
...
app/views/layouts/nav/_dashboard.html.haml
View file @
d6c388da
...
@@ -24,12 +24,12 @@
...
@@ -24,12 +24,12 @@
=
link_to
assigned_issues_dashboard_path
,
title:
'Issues'
,
class:
'dashboard-shortcuts-issues'
do
=
link_to
assigned_issues_dashboard_path
,
title:
'Issues'
,
class:
'dashboard-shortcuts-issues'
do
%span
%span
Issues
Issues
(
#{
number_with_delimiter
(
cached_assigned_issuables_count
(
current_user
,
:issues
,
:opened
))
}
)
.badge
=
number_with_delimiter
(
cached_assigned_issuables_count
(
current_user
,
:issues
,
:opened
)
)
=
nav_link
(
path:
'dashboard#merge_requests'
)
do
=
nav_link
(
path:
'dashboard#merge_requests'
)
do
=
link_to
assigned_mrs_dashboard_path
,
title:
'Merge Requests'
,
class:
'dashboard-shortcuts-merge_requests'
do
=
link_to
assigned_mrs_dashboard_path
,
title:
'Merge Requests'
,
class:
'dashboard-shortcuts-merge_requests'
do
%span
%span
Merge Requests
Merge Requests
(
#{
number_with_delimiter
(
cached_assigned_issuables_count
(
current_user
,
:merge_requests
,
:opened
))
}
)
.badge
=
number_with_delimiter
(
cached_assigned_issuables_count
(
current_user
,
:merge_requests
,
:opened
)
)
=
nav_link
(
controller:
'dashboard/snippets'
)
do
=
nav_link
(
controller:
'dashboard/snippets'
)
do
=
link_to
dashboard_snippets_path
,
title:
'Snippets'
do
=
link_to
dashboard_snippets_path
,
title:
'Snippets'
do
%span
%span
...
...
changelogs/unreleased/28410-dropdown-styling.yml
0 → 100644
View file @
d6c388da
---
title
:
Add badges to global dropdown
merge_request
:
author
:
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