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
18a49614
Commit
18a49614
authored
Feb 16, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reduce size of nav panel. Fixed nav background for IE. Refactored mars theme
parent
fa3cc1dd
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
32 additions
and
64 deletions
+32
-64
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
+2
-2
app/assets/stylesheets/sections/commits.scss
app/assets/stylesheets/sections/commits.scss
+13
-14
app/assets/stylesheets/sections/header.scss
app/assets/stylesheets/sections/header.scss
+12
-13
app/assets/stylesheets/themes/ui_mars.scss
app/assets/stylesheets/themes/ui_mars.scss
+4
-34
app/views/commits/_commit.html.haml
app/views/commits/_commit.html.haml
+1
-1
No files found.
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
View file @
18a49614
...
@@ -63,7 +63,7 @@
...
@@ -63,7 +63,7 @@
color
:
$style_color
;
color
:
$style_color
;
text-shadow
:
0
1px
1px
#FFF
;
text-shadow
:
0
1px
1px
#FFF
;
font-family
:
'Yanone'
,
sans-serif
;
font-family
:
'Yanone'
,
sans-serif
;
font-size
:
2
6
px
;
font-size
:
2
4
px
;
line-height
:
42
px
;
line-height
:
36
px
;
font-weight
:
normal
;
font-weight
:
normal
;
}
}
app/assets/stylesheets/sections/commits.scss
View file @
18a49614
...
@@ -337,7 +337,6 @@
...
@@ -337,7 +337,6 @@
*/
*/
.commit
{
.commit
{
.browse_code_link_holder
{
.browse_code_link_holder
{
@extend
.span2
;
float
:
right
;
float
:
right
;
}
}
...
...
app/assets/stylesheets/sections/header.scss
View file @
18a49614
...
@@ -5,15 +5,16 @@
...
@@ -5,15 +5,16 @@
header
{
header
{
&
.navbar-gitlab
{
&
.navbar-gitlab
{
.navbar-inner
{
.navbar-inner
{
height
:
4
5
px
;
height
:
4
0
px
;
padding
:
5
px
;
padding
:
3
px
;
background
:
#F1F1F1
;
background
:
#F1F1F1
;
filter
:
none
;
.nav
>
li
>
a
{
.nav
>
li
>
a
{
color
:
$style_color
;
color
:
$style_color
;
text-shadow
:
0
1px
0
#fff
;
text-shadow
:
0
1px
0
#fff
;
font-size
:
1
8
px
;
font-size
:
1
6
px
;
padding
:
1
2
px
;
padding
:
1
0
px
;
}
}
/** NAV block with links and profile **/
/** NAV block with links and profile **/
...
@@ -25,7 +26,6 @@ header {
...
@@ -25,7 +26,6 @@ header {
}
}
z-index
:
10
;
z-index
:
10
;
/*height: 60px;*/
/**
/**
*
*
...
@@ -34,7 +34,7 @@ header {
...
@@ -34,7 +34,7 @@ header {
*/
*/
.app_logo
{
.app_logo
{
float
:
left
;
float
:
left
;
margin-right
:
15
px
;
margin-right
:
9
px
;
position
:
relative
;
position
:
relative
;
top
:
-5px
;
top
:
-5px
;
padding-top
:
5px
;
padding-top
:
5px
;
...
@@ -42,10 +42,10 @@ header {
...
@@ -42,10 +42,10 @@ header {
a
{
a
{
float
:
left
;
float
:
left
;
padding
:
0px
;
padding
:
0px
;
margin
:
0
10
px
;
margin
:
0
6
px
;
h1
{
h1
{
background
:
url('logo_dark.png')
no-repeat
0px
2
px
;
background
:
url('logo_dark.png')
no-repeat
0px
1
px
;
float
:
left
;
float
:
left
;
height
:
40px
;
height
:
40px
;
width
:
40px
;
width
:
40px
;
...
@@ -79,7 +79,6 @@ header {
...
@@ -79,7 +79,6 @@ header {
.search
{
.search
{
margin-right
:
45px
;
margin-right
:
45px
;
margin-left
:
10px
;
margin-left
:
10px
;
margin-top
:
2px
;
.search-input
{
.search-input
{
@extend
.span2
;
@extend
.span2
;
...
@@ -105,7 +104,7 @@ header {
...
@@ -105,7 +104,7 @@ header {
.account-box
{
.account-box
{
position
:
absolute
;
position
:
absolute
;
right
:
0
;
right
:
0
;
top
:
6
px
;
top
:
4
px
;
z-index
:
10000
;
z-index
:
10000
;
width
:
128px
;
width
:
128px
;
font-size
:
11px
;
font-size
:
11px
;
...
@@ -240,7 +239,7 @@ header {
...
@@ -240,7 +239,7 @@ header {
.app_logo
{
.app_logo
{
a
{
a
{
h1
{
h1
{
background
:
url('logo_white.png')
no-repeat
center
center
;
background
:
url('logo_white.png')
no-repeat
center
1px
;
color
:
#fff
;
color
:
#fff
;
text-shadow
:
0
1px
1px
#111
;
text-shadow
:
0
1px
1px
#111
;
}
}
...
@@ -261,11 +260,11 @@ header {
...
@@ -261,11 +260,11 @@ header {
.separator
{
.separator
{
float
:
left
;
float
:
left
;
height
:
60
px
;
height
:
46
px
;
width
:
1px
;
width
:
1px
;
background
:
white
;
background
:
white
;
border-left
:
1px
solid
#DDD
;
border-left
:
1px
solid
#DDD
;
margin-top
:
-
10
px
;
margin-top
:
-
3
px
;
margin-left
:
10px
;
margin-left
:
10px
;
margin-right
:
10px
;
margin-right
:
10px
;
}
}
...
...
app/assets/stylesheets/themes/ui_mars.scss
View file @
18a49614
...
@@ -8,28 +8,20 @@
...
@@ -8,28 +8,20 @@
*
*
*/
*/
.ui_mars
{
.ui_mars
{
/*
/*
* Application Header
* Application Header
*
*
*/
*/
header
{
header
{
@extend
.header-dark
;
&
.navbar-gitlab
{
&
.navbar-gitlab
{
.navbar-inner
{
.navbar-inner
{
background
:
#474D57
url('bg-header.png')
repeat-x
bottom
;
background
:
#474D57
url('bg-header.png')
repeat-x
bottom
;
border-bottom
:
1px
solid
#444
;
border-bottom
:
1px
solid
#444
;
.nav
>
li
>
a
{
color
:
#eee
;
text-shadow
:
0
1px
0
#444
;
}
}
}
}
}
.search
{
.search
{
float
:
right
;
margin-right
:
45px
;
.search-input
{
.search-input
{
border
:
1px
solid
rgba
(
0
,
0
,
0
,
0
.7
);
border
:
1px
solid
rgba
(
0
,
0
,
0
,
0
.7
);
background-color
:
#D2D5DA
;
background-color
:
#D2D5DA
;
...
@@ -43,31 +35,9 @@
...
@@ -43,31 +35,9 @@
.
search-input
:
:-
webkit-input-placeholder
{
.
search-input
:
:-
webkit-input-placeholder
{
color
:
#666
;
color
:
#666
;
}
}
.app_logo
{
a
{
h1
{
background
:
url('logo_white.png')
no-repeat
center
center
;
color
:
#eee
;
text-shadow
:
0
1px
1px
#111
;
}
}
&
:hover
{
background-color
:
#41464e
;
}
}
.project_name
{
color
:
#eee
;
text-shadow
:
0
1px
1px
#111
;
}
}
.separator
{
.separator
{
background
:
#31363E
;
background
:
#31363E
;
border-left
:
1px
solid
#666
;
border-left
:
1px
solid
#666
;
}
}
}
/*
* End of Application Header
*
*/
}
}
app/views/commits/_commit.html.haml
View file @
18a49614
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
=
link_to
commit
.
short_id
(
8
),
project_commit_path
(
@project
,
commit
),
class:
"commit_short_id"
=
link_to
commit
.
short_id
(
8
),
project_commit_path
(
@project
,
commit
),
class:
"commit_short_id"
=
commit
.
author_link
avatar:
true
,
size:
24
=
commit
.
author_link
avatar:
true
,
size:
24
=
link_to_gfm
truncate
(
commit
.
title
,
length:
5
0
),
project_commit_path
(
@project
,
commit
.
id
),
class:
"row_title"
=
link_to_gfm
truncate
(
commit
.
title
,
length:
7
0
),
project_commit_path
(
@project
,
commit
.
id
),
class:
"row_title"
%span
.committed_ago
%span
.committed_ago
=
time_ago_in_words
(
commit
.
committed_date
)
=
time_ago_in_words
(
commit
.
committed_date
)
...
...
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