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
Boxiang Sun
gitlab-ce
Commits
10258797
Commit
10258797
authored
Feb 17, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove badge styling in dropdown; remove blue outline
parent
05ec7f8a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
9 deletions
+7
-9
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+5
-7
app/views/layouts/nav/_dashboard.html.haml
app/views/layouts/nav/_dashboard.html.haml
+2
-2
No files found.
app/assets/stylesheets/framework/header.scss
View file @
10258797
...
@@ -114,12 +114,6 @@ header {
...
@@ -114,12 +114,6 @@ header {
&
.active
a
{
&
.active
a
{
font-weight
:
bold
;
font-weight
:
bold
;
}
}
&
:hover
{
.badge
{
background-color
:
$white-light
;
}
}
}
}
}
}
...
@@ -132,7 +126,11 @@ header {
...
@@ -132,7 +126,11 @@ header {
&
:hover
{
&
:hover
{
background-color
:
$white-normal
;
background-color
:
$white-normal
;
color
:
$gl-header-nav-hover-color
;
}
&
:focus
{
outline
:
none
;
background-color
:
$white-normal
;
}
}
}
}
...
...
app/views/layouts/nav/_dashboard.html.haml
View file @
10258797
...
@@ -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
%span
.badge
=
number_with_delimiter
(
cached_assigned_issuables_count
(
current_user
,
:issues
,
:opened
)
)
(
#{
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
%span
.badge
=
number_with_delimiter
(
cached_assigned_issuables_count
(
current_user
,
:merge_requests
,
:opened
)
)
(
#{
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
...
...
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