Commit b2b88b2f authored by randx's avatar randx

Added font for head panel. Major restyle for header

parent ccdea8b8
...@@ -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 {
......
...@@ -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:-9999px; padding-top: 5px;
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:20px; font-size:36px;
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:24px; font-size:36px;
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 {
......
...@@ -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);
}
}
}
} }
...@@ -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;
} }
......
...@@ -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:34px; line-height:36px;
font-size:22px; font-size:30px;
color:#ccc; color:#DDD;
text-shadow: 0 1px 1px #111; text-shadow: 0 1px 1px #111;
} }
......
...@@ -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"
......
...@@ -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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment