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
Jérome Perrin
gitlab-ce
Commits
23035d90
Commit
23035d90
authored
Feb 13, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make active links bold; fix badge styling
parent
c780ad0e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
18 deletions
+33
-18
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+28
-12
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+5
-6
No files found.
app/assets/stylesheets/framework/header.scss
View file @
23035d90
...
@@ -100,26 +100,42 @@ header {
...
@@ -100,26 +100,42 @@ header {
}
}
}
}
}
}
}
.global-dropdown
{
.global-dropdown
{
position
:
absolute
;
position
:
absolute
;
left
:
-10px
;
left
:
-10px
;
.badge
{
font-size
:
11px
;
}
}
.global-dropdown-toggle
{
li
.active
{
margin
:
7px
0
;
a
{
font-size
:
18px
;
font-weight
:
bold
;
padding
:
6px
10px
;
}
border
:
none
;
}
background-color
:
$gray-light
;
&
:hover
{
li
:hover
{
background-color
:
$white-normal
;
.badge
{
color
:
$gl-header-nav-hover-color
;
background-color
:
$white-light
;
}
}
}
}
}
}
.global-dropdown-toggle
{
margin
:
7px
0
;
font-size
:
18px
;
padding
:
6px
10px
;
border
:
none
;
background-color
:
$gray-light
;
&
:hover
{
background-color
:
$white-normal
;
color
:
$gl-header-nav-hover-color
;
}
}
.header-content
{
.header-content
{
position
:
relative
;
position
:
relative
;
height
:
$header-height
;
height
:
$header-height
;
...
...
app/views/layouts/header/_default.html.haml
View file @
23035d90
...
@@ -6,12 +6,11 @@
...
@@ -6,12 +6,11 @@
%button
.global-dropdown-toggle
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%button
.global-dropdown-toggle
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%span
.sr-only
Toggle navigation
%span
.sr-only
Toggle navigation
=
icon
(
'bars'
)
=
icon
(
'bars'
)
.dropdown-menu-nav
.dropdown-menu-nav.global-dropdown-menu
%ul
-
if
current_user
-
if
current_user
=
render
'layouts/nav/dashboard'
=
render
'layouts/nav/dashboard'
-
else
-
else
=
render
'layouts/nav/explore'
=
render
'layouts/nav/explore'
%button
.navbar-toggle
{
type:
'button'
}
%button
.navbar-toggle
{
type:
'button'
}
%span
.sr-only
Toggle navigation
%span
.sr-only
Toggle navigation
=
icon
(
'ellipsis-v'
)
=
icon
(
'ellipsis-v'
)
...
...
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