diff --git a/app/assets/fonts/korolev-medium-compressed.otf b/app/assets/fonts/korolev-medium-compressed.otf new file mode 100644 index 0000000000000000000000000000000000000000..e3817cec85765374e2853696aca7c889a849fcd0 Binary files /dev/null and b/app/assets/fonts/korolev-medium-compressed.otf differ diff --git a/app/assets/images/logo_dark.png b/app/assets/images/logo_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..fab64c2d5a9d7b46ad90daa132623a6d2046dddd Binary files /dev/null and b/app/assets/images/logo_dark.png differ diff --git a/app/assets/images/logo_white.png b/app/assets/images/logo_white.png new file mode 100644 index 0000000000000000000000000000000000000000..3f74025449c2e1a3aa4af6052098366e89ae90c2 Binary files /dev/null and b/app/assets/images/logo_white.png differ diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index 71d0988300615d7245254f2b75d28bc77e9bf385..ad8be0bc58d6bd2bead88ace9bba0116b63f7332 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -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 { diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss index c08404c324b7961d0474f40c98c1a01e46058a97..d0fb662e69e2958cd4e01afb3e1cfb2bb9593707 100644 --- a/app/assets/stylesheets/sections/header.scss +++ b/app/assets/stylesheets/sections/header.scss @@ -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 { diff --git a/app/assets/stylesheets/themes/ui_basic.scss b/app/assets/stylesheets/themes/ui_basic.scss index 09ff0747470053e3337449c9debca4fa313c6d73..cf5eda1c893c891c7cb7ec6a867778aafc043741 100644 --- a/app/assets/stylesheets/themes/ui_basic.scss +++ b/app/assets/stylesheets/themes/ui_basic.scss @@ -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); + } + } + } } diff --git a/app/assets/stylesheets/themes/ui_mars.scss b/app/assets/stylesheets/themes/ui_mars.scss index 488c2af5a8d9a5338efad1dcb2e5aac0319c49ef..2808ad32397f08622412bd932b7b24cb8c0681a9 100644 --- a/app/assets/stylesheets/themes/ui_mars.scss +++ b/app/assets/stylesheets/themes/ui_mars.scss @@ -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; } diff --git a/app/assets/stylesheets/themes/ui_modern.scss b/app/assets/stylesheets/themes/ui_modern.scss index 3fd9bb5efafcb7205dbf4f513b298b77ed0934c3..1f0d795562ba1185bf9cd57bb0217c658f22ee70 100644 --- a/app/assets/stylesheets/themes/ui_modern.scss +++ b/app/assets/stylesheets/themes/ui_modern.scss @@ -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; } diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index 3a2586a3d388573d10af4b8ed9eae88ca62785ae..c076a3a1b4510b307db7a292e2b8cccadf39804a 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -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" diff --git a/config/application.rb b/config/application.rb index 937262237e96323c514734d5bfac35fe059b5c61..ecd88b15d15d9f08b52ab452827ab0bbd3649684 100644 --- a/config/application.rb +++ b/config/application.rb @@ -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