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
9b27f62d
Commit
9b27f62d
authored
Oct 06, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Specify gitlab nav
parent
7312b870
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
app/assets/stylesheets/framework/gitlab-theme.scss
app/assets/stylesheets/framework/gitlab-theme.scss
+3
-3
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+3
-3
No files found.
app/assets/stylesheets/framework/gitlab-theme.scss
View file @
9b27f62d
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
@mixin
gitlab-theme
(
$color-100
,
$color-200
,
$color-500
,
$color-700
,
$color-800
,
$color-900
,
$color-alternate
)
{
@mixin
gitlab-theme
(
$color-100
,
$color-200
,
$color-500
,
$color-700
,
$color-800
,
$color-900
,
$color-alternate
)
{
// Header
// Header
header
{
.navbar-gitlab
{
background-color
:
$color-900
;
background-color
:
$color-900
;
.navbar-collapse
{
.navbar-collapse
{
...
@@ -200,9 +200,9 @@ body {
...
@@ -200,9 +200,9 @@ body {
&
.ui_light
{
&
.ui_light
{
@include
gitlab-theme
(
$theme-gray-900
,
$theme-gray-700
,
$theme-gray-800
,
$theme-gray-700
,
$theme-gray-700
,
$theme-gray-100
,
$theme-gray-700
);
@include
gitlab-theme
(
$theme-gray-900
,
$theme-gray-700
,
$theme-gray-800
,
$theme-gray-700
,
$theme-gray-700
,
$theme-gray-100
,
$theme-gray-700
);
header
{
.navbar-gitlab
{
background-color
:
$theme-gray-100
;
background-color
:
$theme-gray-100
;
box-shadow
:
0
2
px
0
0
$border-color
;
box-shadow
:
0
1
px
0
0
$border-color
;
.logo-text
svg
{
.logo-text
svg
{
fill
:
$theme-gray-900
;
fill
:
$theme-gray-900
;
...
...
app/assets/stylesheets/framework/header.scss
View file @
9b27f62d
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
margin-top
:
$header-height
;
margin-top
:
$header-height
;
}
}
header
{
.navbar-gitlab
{
@include
new-style-dropdown
;
@include
new-style-dropdown
;
&
.navbar-empty
{
&
.navbar-empty
{
...
@@ -508,7 +508,7 @@ header {
...
@@ -508,7 +508,7 @@ header {
}
}
@media
(
max-width
:
$screen-xs-max
)
{
@media
(
max-width
:
$screen-xs-max
)
{
header
.container-fluid
{
.navbar-gitlab
.container-fluid
{
font-size
:
18px
;
font-size
:
18px
;
.navbar-nav
{
.navbar-nav
{
...
@@ -567,6 +567,6 @@ header {
...
@@ -567,6 +567,6 @@ header {
border
:
1px
solid
$avatar-border
;
border
:
1px
solid
$avatar-border
;
}
}
.with-performance-bar
header
.navbar-gitlab
{
.with-performance-bar
.navbar-gitlab
{
top
:
$performance-bar-height
;
top
:
$performance-bar-height
;
}
}
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