BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
32e22d13
Commit
32e22d13
authored
Jun 23, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mobile spacing improvements
removed random colors left over from the original nav
parent
5a93b6f2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
45 additions
and
21 deletions
+45
-21
main.js
app/assets/javascripts/main.js
+1
-1
new_nav.scss
app/assets/stylesheets/new_nav.scss
+44
-20
No files found.
app/assets/javascripts/main.js
View file @
32e22d13
...
...
@@ -302,7 +302,7 @@ $(function () {
$
(
'.header-content .title, .header-content .navbar-sub-nav'
).
toggle
();
$
(
'.header-content .header-logo'
).
toggle
();
$
(
'.header-content .navbar-collapse'
).
toggle
();
$
(
'.js-navbar-toggle-left, .js-navbar-toggle-right'
).
toggle
();
$
(
'.js-navbar-toggle-left, .js-navbar-toggle-right
, .title-container
'
).
toggle
();
return
$
(
'.navbar-toggle'
).
toggleClass
(
'active'
);
});
// Show/hide comments on diff
...
...
app/assets/stylesheets/new_nav.scss
View file @
32e22d13
...
...
@@ -3,7 +3,7 @@
@import
"bootstrap/variables"
;
header
.navbar-gitlab-new
{
color
:
$
gray-normal
;
color
:
$
white-light
;
background-color
:
$purple-900
;
border-bottom
:
0
;
...
...
@@ -26,20 +26,22 @@ header.navbar-gitlab-new {
align-items
:
center
;
height
:
100%
;
padding-top
:
3px
;
padding-
left
:
9px
;
padding-
right
:
9px
;
margin-left
:
-
9px
;
padding-
right
:
$gl-padding
;
padding-
left
:
$gl-padding
;
margin-left
:
-
$gl-padding
;
border-bottom
:
3px
solid
transparent
;
@media
(
min-width
:
$screen-sm-min
)
{
padding-right
:
$gl-padding
;
padding-left
:
$gl-padding
;
margin-left
:
-16px
;
}
svg
{
margin-top
:
-3px
;
margin-right
:
10px
;
@media
(
min-width
:
$screen-sm-min
)
{
margin-right
:
10px
;
}
}
&
:hover
,
...
...
@@ -71,12 +73,17 @@ header.navbar-gitlab-new {
.navbar-collapse
{
padding-left
:
0
;
color
:
$white-light
;
box-shadow
:
0
;
@media
(
max-width
:
$screen-xs-max
)
{
margin-left
:
-
$gl-padding
;
margin-right
:
-10px
;
}
.dropdown-bold-header
{
color
:
initial
;
}
.nav
{
>
li
:not
(
.hidden-xs
)
a
{
@media
(
max-width
:
$screen-xs-max
)
{
...
...
@@ -91,7 +98,7 @@ header.navbar-gitlab-new {
.navbar-toggle
{
min-width
:
45px
;
padding
:
6px
$gl-padding
;
margin-right
:
-
5
px
;
margin-right
:
-
7
px
;
font-size
:
14px
;
text-align
:
center
;
color
:
currentColor
;
...
...
@@ -107,6 +114,7 @@ header.navbar-gitlab-new {
.navbar-nav
{
@media
(
max-width
:
$screen-xs-max
)
{
display
:
flex
;
padding-right
:
10px
;
}
...
...
@@ -117,22 +125,37 @@ header.navbar-gitlab-new {
}
}
.nav
>
li
>
a
{
opacity
:
.9
;
will-change
:
opacity
;
&
:hover
,
&
:focus
{
color
:
$white-light
;
opacity
:
1
;
>
svg
{
fill
:
$white-light
;
.nav
>
li
{
&
.header-user
{
@media
(
max-width
:
$screen-xs-max
)
{
padding-left
:
10px
;
}
}
>
a
{
background
:
none
;
opacity
:
.9
;
will-change
:
opacity
;
&
.header-user-dropdown-toggle
{
.header-user-avatar
{
border
:
0
;
border-color
:
$white-light
;
}
}
&
:hover
,
&
:focus
{
color
:
$white-light
;
opacity
:
1
;
>
svg
{
fill
:
$white-light
;
}
&
.header-user-dropdown-toggle
{
.header-user-avatar
{
border-color
:
$white-light
;
}
}
}
}
...
...
@@ -219,7 +242,8 @@ header.navbar-gitlab-new {
}
.search-input-wrap
{
.search-icon
{
.search-icon
,
.clear-icon
{
color
:
rgba
(
$white-light
,
.6
);
}
}
...
...
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