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
2d516597
Commit
2d516597
authored
Jun 05, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix css alignment in header. Use scss variable
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
b6aa7cbc
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
17 deletions
+16
-17
app/assets/stylesheets/base/layout.scss
app/assets/stylesheets/base/layout.scss
+1
-1
app/assets/stylesheets/base/variables.scss
app/assets/stylesheets/base/variables.scss
+2
-0
app/assets/stylesheets/generic/header.scss
app/assets/stylesheets/generic/header.scss
+10
-13
app/assets/stylesheets/generic/sidebar.scss
app/assets/stylesheets/generic/sidebar.scss
+3
-3
No files found.
app/assets/stylesheets/base/layout.scss
View file @
2d516597
...
...
@@ -4,7 +4,7 @@ html {
&
.touch
.tooltip
{
display
:
none
!
important
;
}
body
{
padding-top
:
46px
;
padding-top
:
$header-height
;
}
}
...
...
app/assets/stylesheets/base/variables.scss
View file @
2d516597
...
...
@@ -12,6 +12,8 @@ $code_font_size: 13px;
$code_line_height
:
1
.5
;
$border-color
:
#E5E5E5
;
$background-color
:
#f5f5f5
;
$header-height
:
50px
;
/*
* State colors:
...
...
app/assets/stylesheets/generic/header.scss
View file @
2d516597
...
...
@@ -2,8 +2,6 @@
* Application Header
*
*/
$header-height
:
46px
;
header
{
&
.navbar-empty
{
background
:
#FFF
;
...
...
@@ -18,7 +16,7 @@ header {
&
.navbar-gitlab
{
z-index
:
100
;
margin-bottom
:
0
;
min-height
:
40px
;
min-height
:
$header-height
;
border
:
none
;
width
:
100%
;
...
...
@@ -31,15 +29,14 @@ header {
.nav
>
li
>
a
{
color
:
#888
;
font-size
:
14px
;
line-height
:
19px
;
padding
:
0
;
background-color
:
#f5f5f5
;
margin
:
9px
0
;
margin
:
(
$header-height
-
28
)
/
2
0
;
margin-left
:
10px
;
border-radius
:
40px
;
height
:
2
6
px
;
width
:
2
6
px
;
line-height
:
2
6
px
;
height
:
2
8
px
;
width
:
2
8
px
;
line-height
:
2
8
px
;
text-align
:
center
;
&
:hover
,
&
:focus
,
&
:active
{
...
...
@@ -71,15 +68,15 @@ header {
float
:
left
;
height
:
$header-height
;
width
:
100%
;
padding
:
5px
8px
;
padding
:
(
$header-height
-
36
)
/
2
8px
;
h3
{
width
:
158px
;
float
:
left
;
margin
:
0
;
margin-left
:
20
px
;
margin-left
:
14
px
;
font-size
:
18px
;
line-height
:
34px
;
line-height
:
$header-height
-
14
;
font-weight
:
normal
;
}
...
...
@@ -106,7 +103,7 @@ header {
margin
:
0
;
margin-left
:
35px
;
font-size
:
18px
;
line-height
:
44px
;
line-height
:
$header-height
;
font-weight
:
bold
;
color
:
#444
;
...
...
@@ -124,7 +121,7 @@ header {
.search
{
margin-right
:
10px
;
margin-left
:
10px
;
margin-top
:
8px
;
margin-top
:
(
$header-height
-
28
)
/
2
;
form
{
margin
:
0
;
...
...
app/assets/stylesheets/generic/sidebar.scss
View file @
2d516597
...
...
@@ -86,7 +86,7 @@
.nav-sidebar
{
margin-top
:
29px
;
position
:
fixed
;
top
:
45px
;
top
:
$header-height
;
width
:
$sidebar_width
;
}
}
...
...
@@ -105,7 +105,7 @@
.nav-sidebar
{
margin-top
:
29px
;
position
:
fixed
;
top
:
45px
;
top
:
$header-height
;
width
:
$sidebar_collapsed_width
;
li
a
{
...
...
@@ -144,7 +144,7 @@
.collapse-nav
a
{
position
:
fixed
;
top
:
46px
;
top
:
$header-height
;
left
:
198px
;
font-size
:
13px
;
background
:
transparent
;
...
...
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