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
b2b88b2f
Commit
b2b88b2f
authored
Aug 20, 2012
by
randx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added font for head panel. Major restyle for header
parent
ccdea8b8
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
63 additions
and
35 deletions
+63
-35
app/assets/fonts/korolev-medium-compressed.otf
app/assets/fonts/korolev-medium-compressed.otf
+0
-0
app/assets/images/logo_dark.png
app/assets/images/logo_dark.png
+0
-0
app/assets/images/logo_white.png
app/assets/images/logo_white.png
+0
-0
app/assets/stylesheets/main.scss
app/assets/stylesheets/main.scss
+2
-0
app/assets/stylesheets/sections/header.scss
app/assets/stylesheets/sections/header.scss
+12
-8
app/assets/stylesheets/themes/ui_basic.scss
app/assets/stylesheets/themes/ui_basic.scss
+32
-0
app/assets/stylesheets/themes/ui_mars.scss
app/assets/stylesheets/themes/ui_mars.scss
+3
-9
app/assets/stylesheets/themes/ui_modern.scss
app/assets/stylesheets/themes/ui_modern.scss
+11
-17
app/views/layouts/_head.html.haml
app/views/layouts/_head.html.haml
+0
-1
config/application.rb
config/application.rb
+3
-0
No files found.
app/assets/fonts/korolev-medium-compressed.otf
0 → 100644
View file @
b2b88b2f
File added
app/assets/images/logo_dark.png
0 → 100644
View file @
b2b88b2f
2.79 KB
app/assets/images/logo_white.png
0 → 100644
View file @
b2b88b2f
1.64 KB
app/assets/stylesheets/main.scss
View file @
b2b88b2f
...
@@ -23,6 +23,8 @@ $blue_link: #2fa0bb;
...
@@ -23,6 +23,8 @@ $blue_link: #2fa0bb;
$style_color
:
#474D57
;
$style_color
:
#474D57
;
$hover
:
#FDF5D9
;
$hover
:
#FDF5D9
;
/** GITLAB Fonts **/
@font-face
{
font-family
:
Korolev
;
src
:
url('korolev-medium-compressed.otf')
;
}
/** MIXINS **/
/** MIXINS **/
@mixin
shade
{
@mixin
shade
{
...
...
app/assets/stylesheets/sections/header.scss
View file @
b2b88b2f
...
@@ -26,23 +26,25 @@ header {
...
@@ -26,23 +26,25 @@ header {
float
:left
;
float
:left
;
position
:relative
;
position
:relative
;
top
:
-5px
;
top
:
-5px
;
a
{
a
{
float
:left
;
float
:left
;
h1
{
h1
{
text-indent
:
-9999
px
;
padding-top
:
5
px
;
width
:
102px
;
width
:
102px
;
background
:
url('logo_
text
.png')
no-repeat
0px
-3px
;
background
:
url('logo_
dark
.png')
no-repeat
0px
-3px
;
float
:left
;
float
:left
;
margin-left
:
5px
;
margin-left
:
5px
;
font-size
:
20
px
;
font-size
:
36
px
;
line-height
:
36px
;
line-height
:
36px
;
font-weight
:
bold
;
font-weight
:
normal
;
color
:
#aaa
;
color
:
$style_color
;
text-shadow
:
0
1px
1px
#FFF
;
text-shadow
:
0
1px
1px
#FFF
;
padding-left
:
50px
;
padding-left
:
50px
;
height
:
40px
;
font-family
:
'Korolev'
,
sans-serif
;
}
}
}
}
.separator
{
.separator
{
margin-left
:
20px
;
margin-left
:
20px
;
...
@@ -68,14 +70,16 @@ header {
...
@@ -68,14 +70,16 @@ header {
*
*
*/
*/
.project_name
{
.project_name
{
position
:relative
;
float
:left
;
float
:left
;
margin
:
0
;
margin
:
0
;
margin-right
:
30px
;
margin-right
:
30px
;
font-size
:
24
px
;
font-size
:
36
px
;
line-height
:
36px
;
line-height
:
36px
;
font-weight
:
500
;
font-weight
:
normal
;
color
:
$style_color
;
color
:
$style_color
;
text-shadow
:
0
1px
1px
#FFF
;
text-shadow
:
0
1px
1px
#FFF
;
font-family
:
'Korolev'
,
sans-serif
;
}
}
.fbtn
{
.fbtn
{
...
...
app/assets/stylesheets/themes/ui_basic.scss
View file @
b2b88b2f
...
@@ -15,4 +15,36 @@
...
@@ -15,4 +15,36 @@
color
:
$blue_link
;
color
:
$blue_link
;
}
}
}
}
header
{
.fbtn
{
.btn
{
background-color
:
#F8F8F8
;
background-image
:
-webkit-gradient
(
linear
,
left
top
,
left
bottom
,
from
(
#F8F8F8
)
,
to
(
#ECECEC
));
background-image
:
-webkit-linear-gradient
(
top
,
#F8F8F8
,
#ECECEC
);
background-image
:
-moz-linear-gradient
(
top
,
#F8F8F8
,
#ECECEC
);
background-image
:
-ms-linear-gradient
(
top
,
#F8F8F8
,
#ECECEC
);
background-image
:
-o-linear-gradient
(
top
,
#F8F8F8
,
#ECECEC
);
background-image
:
linear-gradient
(
top
,
#F8F8F8
,
#ECECEC
);
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorStr
=
'#f8f8f8'
,
EndColorStr
=
'#ececec'
);
border-color
:
#C6C6C6
;
margin-left
:
7px
;
@include
border-radius
(
3px
);
box-shadow
:none
;
color
:
#666
;
}
}
.search
{
.search-input
{
@include
border-radius
(
3px
);
border-color
:
#C6C6C6
;
box-shadow
:none
;
}
}
.pic
{
img
{
@include
border-radius
(
3px
);
}
}
}
}
}
app/assets/stylesheets/themes/ui_mars.scss
View file @
b2b88b2f
...
@@ -59,14 +59,9 @@
...
@@ -59,14 +59,9 @@
.app_logo
{
.app_logo
{
a
{
a
{
h1
{
h1
{
background
:
url('images.png')
no-repeat
-3px
-6px
;
background
:
url('logo_white.png')
no-repeat
0px
-3px
;
width
:
65px
;
color
:
#fff
;
height
:
26px
;
text-shadow
:
0
1px
1px
#111
;
margin
:
6px
0
;
padding
:
0
;
float
:
left
;
text-indent
:
-1000em
;
float
:left
;
}
}
}
}
.separator
{
.separator
{
...
@@ -75,7 +70,6 @@
...
@@ -75,7 +70,6 @@
}
}
.project_name
{
.project_name
{
line-height
:
38px
;
color
:
#fff
;
color
:
#fff
;
text-shadow
:
0
1px
1px
#111
;
text-shadow
:
0
1px
1px
#111
;
}
}
...
...
app/assets/stylesheets/themes/ui_modern.scss
View file @
b2b88b2f
...
@@ -40,18 +40,11 @@
...
@@ -40,18 +40,11 @@
width
:
160px
;
width
:
160px
;
a
{
a
{
h1
{
h1
{
opacity
:
0
.7
;
background
:
none
;
background
:
url('images.png')
no-repeat
-3px
-6px
;
color
:
#DDD
;
width
:
65px
;
font-size
:
30px
;
height
:
26px
;
text-shadow
:
0
1px
1px
#111
;
margin
:
6px
0
;
padding-left
:
0
;
padding
:
0
;
float
:
left
;
text-indent
:
-1000em
;
float
:left
;
&
:hover
{
opacity
:
1
.0
;
}
}
}
}
}
.separator
{
.separator
{
...
@@ -67,18 +60,19 @@
...
@@ -67,18 +60,19 @@
.fbtn
{
.fbtn
{
.btn
{
.btn
{
i
{
i
{
@extend
.icon-white
;
position
:
relative
;
position
:
relative
;
top
:
2px
;
top
:
2px
;
}
}
background
:none
;
background
:none
;
margin-left
:
8px
;
margin-left
:
8px
;
font-size
:
13px
;
font-size
:
13px
;
font-weight
:bold
;
line-height
:
19px
;
line-height
:
19px
;
color
:
#ccc
;
color
:
#ccc
;
&
:hover
{
&
:hover
{
color
:
#fff
;
color
:
#fff
;
i
{
@extend
.icon-white
;
}
}
}
border
:
none
;
border
:
none
;
box-shadow
:none
;
box-shadow
:none
;
...
@@ -116,9 +110,9 @@
...
@@ -116,9 +110,9 @@
*
*
*/
*/
.project_name
{
.project_name
{
line-height
:
3
4
px
;
line-height
:
3
6
px
;
font-size
:
22
px
;
font-size
:
30
px
;
color
:
#
ccc
;
color
:
#
DDD
;
text-shadow
:
0
1px
1px
#111
;
text-shadow
:
0
1px
1px
#111
;
}
}
...
...
app/views/layouts/_head.html.haml
View file @
b2b88b2f
...
@@ -6,7 +6,6 @@
...
@@ -6,7 +6,6 @@
=
favicon_link_tag
'favicon.ico'
=
favicon_link_tag
'favicon.ico'
=
stylesheet_link_tag
"application"
=
stylesheet_link_tag
"application"
=
javascript_include_tag
"application"
=
javascript_include_tag
"application"
-# Atom feed
-# Atom feed
-
if
controller_name
==
'projects'
&&
action_name
==
'index'
-
if
controller_name
==
'projects'
&&
action_name
==
'index'
=
auto_discovery_link_tag
:atom
,
projects_url
(
:atom
,
private_token:
current_user
.
private_token
),
title:
"Dashboard feed"
=
auto_discovery_link_tag
:atom
,
projects_url
(
:atom
,
private_token:
current_user
.
private_token
),
title:
"Dashboard feed"
...
...
config/application.rb
View file @
b2b88b2f
...
@@ -44,5 +44,8 @@ module Gitlab
...
@@ -44,5 +44,8 @@ module Gitlab
# Version of your assets, change this if you want to expire all your assets
# Version of your assets, change this if you want to expire all your assets
config
.
assets
.
version
=
'1.0'
config
.
assets
.
version
=
'1.0'
# Add fonts
config
.
assets
.
paths
<<
"
#{
Rails
.
root
}
/app/assets/fonts"
end
end
end
end
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