Added font for head panel. Major restyle for header
This commit is contained in:
parent
ccdea8b80d
commit
b2b88b2ff2
BIN
app/assets/fonts/korolev-medium-compressed.otf
Normal file
BIN
app/assets/fonts/korolev-medium-compressed.otf
Normal file
Binary file not shown.
BIN
app/assets/images/logo_dark.png
Normal file
BIN
app/assets/images/logo_dark.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.8 KiB |
BIN
app/assets/images/logo_white.png
Normal file
BIN
app/assets/images/logo_white.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.6 KiB |
|
@ -23,6 +23,8 @@ $blue_link: #2fa0bb;
|
|||
$style_color: #474D57;
|
||||
$hover: #FDF5D9;
|
||||
|
||||
/** GITLAB Fonts **/
|
||||
@font-face { font-family: Korolev; src: url('korolev-medium-compressed.otf'); }
|
||||
|
||||
/** MIXINS **/
|
||||
@mixin shade {
|
||||
|
|
|
@ -26,23 +26,25 @@ header {
|
|||
float:left;
|
||||
position:relative;
|
||||
top:-5px;
|
||||
|
||||
a {
|
||||
float:left;
|
||||
|
||||
h1 {
|
||||
text-indent:-9999px;
|
||||
padding-top: 5px;
|
||||
width:102px;
|
||||
background: url('logo_text.png') no-repeat 0px -3px;
|
||||
background: url('logo_dark.png') no-repeat 0px -3px;
|
||||
float:left;
|
||||
margin-left:5px;
|
||||
font-size:20px;
|
||||
font-size:36px;
|
||||
line-height:36px;
|
||||
font-weight:bold;
|
||||
color:#aaa;
|
||||
font-weight:normal;
|
||||
color:$style_color;
|
||||
text-shadow: 0 1px 1px #FFF;
|
||||
padding-left:50px;
|
||||
height:40px;
|
||||
font-family: 'Korolev', sans-serif;
|
||||
}
|
||||
|
||||
}
|
||||
.separator {
|
||||
margin-left:20px;
|
||||
|
@ -68,14 +70,16 @@ header {
|
|||
*
|
||||
*/
|
||||
.project_name {
|
||||
position:relative;
|
||||
float:left;
|
||||
margin:0;
|
||||
margin-right:30px;
|
||||
font-size:24px;
|
||||
font-size:36px;
|
||||
line-height:36px;
|
||||
font-weight:500;
|
||||
font-weight:normal;
|
||||
color:$style_color;
|
||||
text-shadow: 0 1px 1px #FFF;
|
||||
font-family: 'Korolev', sans-serif;
|
||||
}
|
||||
|
||||
.fbtn {
|
||||
|
|
|
@ -15,4 +15,36 @@
|
|||
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 @@
|
|||
.app_logo {
|
||||
a {
|
||||
h1 {
|
||||
background: url('images.png') no-repeat -3px -6px;
|
||||
width: 65px;
|
||||
height: 26px;
|
||||
margin: 6px 0;
|
||||
padding: 0;
|
||||
float: left;
|
||||
text-indent: -1000em;
|
||||
float:left;
|
||||
background: url('logo_white.png') no-repeat 0px -3px;
|
||||
color:#fff;
|
||||
text-shadow: 0 1px 1px #111;
|
||||
}
|
||||
}
|
||||
.separator {
|
||||
|
@ -75,7 +70,6 @@
|
|||
|
||||
}
|
||||
.project_name {
|
||||
line-height:38px;
|
||||
color:#fff;
|
||||
text-shadow: 0 1px 1px #111;
|
||||
}
|
||||
|
|
|
@ -40,18 +40,11 @@
|
|||
width:160px;
|
||||
a {
|
||||
h1 {
|
||||
opacity: 0.7;
|
||||
background: url('images.png') no-repeat -3px -6px;
|
||||
width: 65px;
|
||||
height: 26px;
|
||||
margin: 6px 0;
|
||||
padding: 0;
|
||||
float: left;
|
||||
text-indent: -1000em;
|
||||
float:left;
|
||||
&:hover {
|
||||
opacity: 1.0;
|
||||
}
|
||||
background: none;
|
||||
color:#DDD;
|
||||
font-size:30px;
|
||||
text-shadow: 0 1px 1px #111;
|
||||
padding-left: 0;
|
||||
}
|
||||
}
|
||||
.separator {
|
||||
|
@ -67,18 +60,19 @@
|
|||
.fbtn {
|
||||
.btn {
|
||||
i {
|
||||
@extend .icon-white;
|
||||
position: relative;
|
||||
top: 2px;
|
||||
}
|
||||
background:none;
|
||||
margin-left:8px;
|
||||
font-size: 13px;
|
||||
font-weight:bold;
|
||||
line-height: 19px;
|
||||
color:#ccc;
|
||||
&:hover {
|
||||
color:#fff;
|
||||
i {
|
||||
@extend .icon-white;
|
||||
}
|
||||
}
|
||||
border: none;
|
||||
box-shadow:none;
|
||||
|
@ -116,9 +110,9 @@
|
|||
*
|
||||
*/
|
||||
.project_name {
|
||||
line-height:34px;
|
||||
font-size:22px;
|
||||
color:#ccc;
|
||||
line-height:36px;
|
||||
font-size:30px;
|
||||
color:#DDD;
|
||||
text-shadow: 0 1px 1px #111;
|
||||
}
|
||||
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
= favicon_link_tag 'favicon.ico'
|
||||
= stylesheet_link_tag "application"
|
||||
= javascript_include_tag "application"
|
||||
|
||||
-# Atom feed
|
||||
- if controller_name == 'projects' && action_name == 'index'
|
||||
= auto_discovery_link_tag :atom, projects_url(:atom, private_token: current_user.private_token), title: "Dashboard feed"
|
||||
|
|
|
@ -44,5 +44,8 @@ module Gitlab
|
|||
|
||||
# Version of your assets, change this if you want to expire all your assets
|
||||
config.assets.version = '1.0'
|
||||
|
||||
# Add fonts
|
||||
config.assets.paths << "#{Rails.root}/app/assets/fonts"
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue