summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/fonts/YanoneKaffeesatz-Light.ttfbin0 -> 77296 bytes
-rw-r--r--app/assets/fonts/wire-one.ttfbin140668 -> 0 bytes
-rw-r--r--app/assets/stylesheets/gitlab_bootstrap/fonts.scss4
-rw-r--r--app/assets/stylesheets/gitlab_bootstrap/mixins.scss4
-rw-r--r--app/assets/stylesheets/sections/header.scss11
5 files changed, 9 insertions, 10 deletions
diff --git a/app/assets/fonts/YanoneKaffeesatz-Light.ttf b/app/assets/fonts/YanoneKaffeesatz-Light.ttf
new file mode 100644
index 00000000000..5026d3bdbe2
--- /dev/null
+++ b/app/assets/fonts/YanoneKaffeesatz-Light.ttf
Binary files differ
diff --git a/app/assets/fonts/wire-one.ttf b/app/assets/fonts/wire-one.ttf
deleted file mode 100644
index bb2aff0c0af..00000000000
--- a/app/assets/fonts/wire-one.ttf
+++ /dev/null
Binary files differ
diff --git a/app/assets/stylesheets/gitlab_bootstrap/fonts.scss b/app/assets/stylesheets/gitlab_bootstrap/fonts.scss
index 5409f8e8fc5..b4217fa9cfa 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/fonts.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/fonts.scss
@@ -1,6 +1,6 @@
@font-face{
- font-family: Wireone;
- src: font-url('wire-one.ttf');
+ font-family: Yanone;
+ src: font-url('YanoneKaffeesatz-Light.ttf');
}
/** Typo **/
diff --git a/app/assets/stylesheets/gitlab_bootstrap/mixins.scss b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss
index 6b8d2364cde..9b1e2f2c728 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/mixins.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss
@@ -62,8 +62,8 @@
@mixin header-font {
color: $style_color;
text-shadow: 0 1px 1px #FFF;
- font-family: 'Wireone', sans-serif;
- font-size: 30px;
+ font-family: 'Yanone', sans-serif;
+ font-size: 26px;
line-height: 42px;
font-weight: normal;
}
diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss
index c1b210be1ab..b2253ab9510 100644
--- a/app/assets/stylesheets/sections/header.scss
+++ b/app/assets/stylesheets/sections/header.scss
@@ -33,20 +33,19 @@ header {
*
*/
.app_logo {
- width: 170px;
float: left;
+ margin-right: 15px;
a {
float: left;
padding: 0px;
h1 {
- width: 90px;
background: url('logo_dark.png') no-repeat 0px 2px;
float: left;
- margin-left: 2px;
- padding-left: 45px;
height: 40px;
+ width: 40px;
@include header-font;
+ text-indent: -9999px;
}
}
}
@@ -60,7 +59,7 @@ header {
position: relative;
float: left;
margin: 0;
- margin-right: 30px;
+ margin-left: 15px;
@include header-font;
}
@@ -233,7 +232,7 @@ header {
.app_logo {
a {
h1 {
- background: url('logo_white.png') no-repeat 0px 2px;
+ background: url('logo_white.png') no-repeat center center;
color: #fff;
text-shadow: 0 1px 1px #111;
}