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
2b0a1ca0
Commit
2b0a1ca0
authored
Apr 29, 2015
by
Sullivan SENECHAL
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix .container position on navbar (reloaded)
parent
18a9151b
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
73 additions
and
80 deletions
+73
-80
app/assets/stylesheets/generic/header.scss
app/assets/stylesheets/generic/header.scss
+4
-6
app/assets/stylesheets/generic/mobile.scss
app/assets/stylesheets/generic/mobile.scss
+1
-1
app/assets/stylesheets/themes/gitlab-theme.scss
app/assets/stylesheets/themes/gitlab-theme.scss
+9
-11
app/views/layouts/_empty_head_panel.html.haml
app/views/layouts/_empty_head_panel.html.haml
+3
-4
app/views/layouts/_head_panel.html.haml
app/views/layouts/_head_panel.html.haml
+40
-41
app/views/layouts/_public_head_panel.html.haml
app/views/layouts/_public_head_panel.html.haml
+16
-17
No files found.
app/assets/stylesheets/generic/header.scss
View file @
2b0a1ca0
...
@@ -10,7 +10,10 @@ header {
...
@@ -10,7 +10,10 @@ header {
border
:
none
;
border
:
none
;
width
:
100%
;
width
:
100%
;
.navbar-inner
{
.container
{
width
:
100%
!
important
;
padding
:
0
;
background
:
#FFF
;
background
:
#FFF
;
border-bottom
:
1px
solid
#DDD
;
border-bottom
:
1px
solid
#DDD
;
filter
:
none
;
filter
:
none
;
...
@@ -123,11 +126,6 @@ header {
...
@@ -123,11 +126,6 @@ header {
}
}
}
}
.container
{
width
:
100%
!
important
;
padding
:
0px
;
}
/**
/**
*
*
* Logo holder
* Logo holder
...
...
app/assets/stylesheets/generic/mobile.scss
View file @
2b0a1ca0
...
@@ -56,7 +56,7 @@
...
@@ -56,7 +56,7 @@
}
}
}
}
.
navbar-in
ner
.title
{
.
contai
ner
.title
{
margin-left
:
6px
!
important
;
margin-left
:
6px
!
important
;
max-width
:
70%
!
important
;
max-width
:
70%
!
important
;
}
}
...
...
app/assets/stylesheets/themes/gitlab-theme.scss
View file @
2b0a1ca0
@mixin
gitlab-theme
(
$color-light
,
$color
,
$color-darker
,
$color-dark
)
{
@mixin
gitlab-theme
(
$color-light
,
$color
,
$color-darker
,
$color-dark
)
{
header
{
header
{
&
.navbar-gitlab
{
&
.navbar-gitlab
{
.navbar-inner
{
.app_logo
{
.app_logo
{
background-color
:
$color-darker
;
background-color
:
$color-darker
;
...
@@ -18,7 +17,6 @@
...
@@ -18,7 +17,6 @@
}
}
}
}
}
}
}
.page-with-sidebar
{
.page-with-sidebar
{
background
:
$color-darker
;
background
:
$color-darker
;
...
...
app/views/layouts/_empty_head_panel.html.haml
View file @
2b0a1ca0
%header
.navbar.navbar-fixed-top.navbar-gitlab
%header
.navbar.navbar-fixed-top.navbar-gitlab
.navbar-inner
.container
.container
%h4
.center
%h4
.center
=
image_tag
'logo-white.png'
,
width:
32
,
height:
32
=
image_tag
'logo-white.png'
,
width:
32
,
height:
32
app/views/layouts/_head_panel.html.haml
View file @
2b0a1ca0
%header
.navbar.navbar-fixed-top.navbar-gitlab
{
class:
nav_header_class
}
%header
.navbar.navbar-fixed-top.navbar-gitlab
{
class:
nav_header_class
}
.navbar-inner
.container
.container
%div
.app_logo
%div
.app_logo
=
link_to
root_path
,
class:
'home'
,
title:
'Dashboard'
,
id:
'js-shortcuts-home'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
link_to
root_path
,
class:
'home'
,
title:
'Dashboard'
,
id:
'js-shortcuts-home'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
...
...
app/views/layouts/_public_head_panel.html.haml
View file @
2b0a1ca0
%header
.navbar.navbar-fixed-top.navbar-gitlab
{
class:
nav_header_class
}
%header
.navbar.navbar-fixed-top.navbar-gitlab
{
class:
nav_header_class
}
.navbar-inner
.container
.container
%div
.app_logo
%div
.app_logo
=
link_to
explore_root_path
,
class:
"home"
do
=
link_to
explore_root_path
,
class:
"home"
do
...
...
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