Download as
Browse Code »

Commit b2b88b2ff2a3044efa259d06c630dc903d0851bd

Authored by randx
1 parent ccdea8b8
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Added font for head panel. Major restyle for header

Showing 10 changed files with 63 additions and 35 deletions   Show diff stats
app/assets/fonts/korolev-medium-compressed.otf 0 → 100644
View file @b2b88b2
No preview for this file type
app/assets/images/logo_dark.png 0 → 100644
View file @b2b88b2

2.79 KB
app/assets/images/logo_white.png 0 → 100644
View file @b2b88b2

1.64 KB
app/assets/stylesheets/main.scss
  Diff comments   View file @b2b88b2
@@ -23,6 +23,8 @@ $blue_link: #2fa0bb; @@ -23,6 +23,8 @@ $blue_link: #2fa0bb;
23 $style_color: #474D57; 23 $style_color: #474D57;
24 $hover: #FDF5D9; 24 $hover: #FDF5D9;
25 25
  26 +/** GITLAB Fonts **/
  27 +@font-face { font-family: Korolev; src: url('korolev-medium-compressed.otf'); }
26 28
27 /** MIXINS **/ 29 /** MIXINS **/
28 @mixin shade { 30 @mixin shade {
app/assets/stylesheets/sections/header.scss
  Diff comments   View file @b2b88b2
@@ -26,23 +26,25 @@ header { @@ -26,23 +26,25 @@ header {
26 float:left; 26 float:left;
27 position:relative; 27 position:relative;
28 top:-5px; 28 top:-5px;
29 -  
30 a { 29 a {
31 float:left; 30 float:left;
32 31
33 h1 { 32 h1 {
34 - text-indent:-9999px; 33 + padding-top: 5px;
35 width:102px; 34 width:102px;
36 - background: url('logo_text.png') no-repeat 0px -3px; 35 + background: url('logo_dark.png') no-repeat 0px -3px;
37 float:left; 36 float:left;
38 margin-left:5px; 37 margin-left:5px;
39 - font-size:20px; 38 + font-size:36px;
40 line-height:36px; 39 line-height:36px;
41 - font-weight:bold;  
42 - color:#aaa; 40 + font-weight:normal;
  41 + color:$style_color;
43 text-shadow: 0 1px 1px #FFF; 42 text-shadow: 0 1px 1px #FFF;
44 padding-left:50px; 43 padding-left:50px;
  44 + height:40px;
  45 + font-family: 'Korolev', sans-serif;
45 } 46 }
  47 +
46 } 48 }
47 .separator { 49 .separator {
48 margin-left:20px; 50 margin-left:20px;
@@ -68,14 +70,16 @@ header { @@ -68,14 +70,16 @@ header {
68 * 70 *
69 */ 71 */
70 .project_name { 72 .project_name {
  73 + position:relative;
71 float:left; 74 float:left;
72 margin:0; 75 margin:0;
73 margin-right:30px; 76 margin-right:30px;
74 - font-size:24px; 77 + font-size:36px;
75 line-height:36px; 78 line-height:36px;
76 - font-weight:500; 79 + font-weight:normal;
77 color:$style_color; 80 color:$style_color;
78 text-shadow: 0 1px 1px #FFF; 81 text-shadow: 0 1px 1px #FFF;
  82 + font-family: 'Korolev', sans-serif;
79 } 83 }
80 84
81 .fbtn { 85 .fbtn {
app/assets/stylesheets/themes/ui_basic.scss
  Diff comments   View file @b2b88b2
@@ -15,4 +15,36 @@ @@ -15,4 +15,36 @@
15 color: $blue_link; 15 color: $blue_link;
16 } 16 }
17 } 17 }
  18 +
  19 + header {
  20 + .fbtn {
  21 + .btn {
  22 + background-color: #F8F8F8;
  23 + background-image: -webkit-gradient(linear,left top,left bottom,from(#F8F8F8),to(#ECECEC));
  24 + background-image: -webkit-linear-gradient(top,#F8F8F8,#ECECEC);
  25 + background-image: -moz-linear-gradient(top,#F8F8F8,#ECECEC);
  26 + background-image: -ms-linear-gradient(top,#F8F8F8,#ECECEC);
  27 + background-image: -o-linear-gradient(top,#F8F8F8,#ECECEC);
  28 + background-image: linear-gradient(top,#F8F8F8,#ECECEC);
  29 + filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#f8f8f8',EndColorStr='#ececec');
  30 + border-color: #C6C6C6;
  31 + margin-left:7px;
  32 + @include border-radius(3px);
  33 + box-shadow:none;
  34 + color:#666;
  35 + }
  36 + }
  37 + .search {
  38 + .search-input {
  39 + @include border-radius(3px);
  40 + border-color: #C6C6C6;
  41 + box-shadow:none;
  42 + }
  43 + }
  44 + .pic {
  45 + img {
  46 + @include border-radius(3px);
  47 + }
  48 + }
  49 + }
18 } 50 }
app/assets/stylesheets/themes/ui_mars.scss
  Diff comments   View file @b2b88b2
@@ -59,14 +59,9 @@ @@ -59,14 +59,9 @@
59 .app_logo { 59 .app_logo {
60 a { 60 a {
61 h1 { 61 h1 {
62 - background: url('images.png') no-repeat -3px -6px;  
63 - width: 65px;  
64 - height: 26px;  
65 - margin: 6px 0;  
66 - padding: 0;  
67 - float: left;  
68 - text-indent: -1000em;  
69 - float:left; 62 + background: url('logo_white.png') no-repeat 0px -3px;
  63 + color:#fff;
  64 + text-shadow: 0 1px 1px #111;
70 } 65 }
71 } 66 }
72 .separator { 67 .separator {
@@ -75,7 +70,6 @@ @@ -75,7 +70,6 @@
75 70
76 } 71 }
77 .project_name { 72 .project_name {
78 - line-height:38px;  
79 color:#fff; 73 color:#fff;
80 text-shadow: 0 1px 1px #111; 74 text-shadow: 0 1px 1px #111;
81 } 75 }
app/assets/stylesheets/themes/ui_modern.scss
  Diff comments   View file @b2b88b2
@@ -40,18 +40,11 @@ @@ -40,18 +40,11 @@
40 width:160px; 40 width:160px;
41 a { 41 a {
42 h1 { 42 h1 {
43 - opacity: 0.7;  
44 - background: url('images.png') no-repeat -3px -6px;  
45 - width: 65px;  
46 - height: 26px;  
47 - margin: 6px 0;  
48 - padding: 0;  
49 - float: left;  
50 - text-indent: -1000em;  
51 - float:left;  
52 - &:hover {  
53 - opacity: 1.0;  
54 - } 43 + background: none;
  44 + color:#DDD;
  45 + font-size:30px;
  46 + text-shadow: 0 1px 1px #111;
  47 + padding-left: 0;
55 } 48 }
56 } 49 }
57 .separator { 50 .separator {
@@ -67,18 +60,19 @@ @@ -67,18 +60,19 @@
67 .fbtn { 60 .fbtn {
68 .btn { 61 .btn {
69 i { 62 i {
70 - @extend .icon-white;  
71 position: relative; 63 position: relative;
72 top: 2px; 64 top: 2px;
73 } 65 }
74 background:none; 66 background:none;
75 margin-left:8px; 67 margin-left:8px;
76 font-size: 13px; 68 font-size: 13px;
77 - font-weight:bold;  
78 line-height: 19px; 69 line-height: 19px;
79 color:#ccc; 70 color:#ccc;
80 &:hover { 71 &:hover {
81 color:#fff; 72 color:#fff;
  73 + i {
  74 + @extend .icon-white;
  75 + }
82 } 76 }
83 border: none; 77 border: none;
84 box-shadow:none; 78 box-shadow:none;
@@ -116,9 +110,9 @@ @@ -116,9 +110,9 @@
116 * 110 *
117 */ 111 */
118 .project_name { 112 .project_name {
119 - line-height:34px;  
120 - font-size:22px;  
121 - color:#ccc; 113 + line-height:36px;
  114 + font-size:30px;
  115 + color:#DDD;
122 text-shadow: 0 1px 1px #111; 116 text-shadow: 0 1px 1px #111;
123 } 117 }
124 118
app/views/layouts/_head.html.haml
  Diff comments   View file @b2b88b2
@@ -6,7 +6,6 @@ @@ -6,7 +6,6 @@
6 = favicon_link_tag 'favicon.ico' 6 = favicon_link_tag 'favicon.ico'
7 = stylesheet_link_tag "application" 7 = stylesheet_link_tag "application"
8 = javascript_include_tag "application" 8 = javascript_include_tag "application"
9 -  
10 -# Atom feed 9 -# Atom feed
11 - if controller_name == 'projects' && action_name == 'index' 10 - if controller_name == 'projects' && action_name == 'index'
12 = auto_discovery_link_tag :atom, projects_url(:atom, private_token: current_user.private_token), title: "Dashboard feed" 11 = auto_discovery_link_tag :atom, projects_url(:atom, private_token: current_user.private_token), title: "Dashboard feed"
config/application.rb
  Diff comments   View file @b2b88b2
@@ -44,5 +44,8 @@ module Gitlab @@ -44,5 +44,8 @@ module Gitlab
44 44
45 # Version of your assets, change this if you want to expire all your assets 45 # Version of your assets, change this if you want to expire all your assets
46 config.assets.version = '1.0' 46 config.assets.version = '1.0'
  47 +
  48 + # Add fonts
  49 + config.assets.paths << "#{Rails.root}/app/assets/fonts"
47 end 50 end
48 end 51 end