summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-12-12 12:30:19 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-12-12 12:30:19 +0200
commit105f5ba3c992cf9c69951a4f9ca877afe803a23d (patch)
tree0ecd4dba8adf9f2a406c7d282f589310c28385cb
parentd7eb3145539222df4653fbe300d179a81b303517 (diff)
downloadgitlab-ce-105f5ba3c992cf9c69951a4f9ca877afe803a23d.tar.gz
Reduce header font a bit. Moved to mixin header font styles
-rw-r--r--app/assets/stylesheets/mixins.scss11
-rw-r--r--app/assets/stylesheets/sections/header.scss14
-rw-r--r--app/assets/stylesheets/variables.scss2
3 files changed, 13 insertions, 14 deletions
diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss
index 441a85f3410..81830368c4c 100644
--- a/app/assets/stylesheets/mixins.scss
+++ b/app/assets/stylesheets/mixins.scss
@@ -57,4 +57,13 @@
@mixin solid-shade {
@include box-shadow(0 0 0 3px #f1f1f1);
-} \ No newline at end of file
+}
+
+@mixin header-font {
+ color: $style_color;
+ text-shadow: 0 1px 1px #FFF;
+ font-family: 'Korolev', sans-serif;
+ font-size: 28px;
+ line-height: 48px;
+ font-weight: normal;
+}
diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss
index 1efe23a127f..c1b210be1ab 100644
--- a/app/assets/stylesheets/sections/header.scss
+++ b/app/assets/stylesheets/sections/header.scss
@@ -44,14 +44,9 @@ header {
background: url('logo_dark.png') no-repeat 0px 2px;
float: left;
margin-left: 2px;
- font-size: 30px;
- line-height: 48px;
- font-weight: normal;
- color: $style_color;
- text-shadow: 0 1px 1px #FFF;
padding-left: 45px;
height: 40px;
- font-family: 'Korolev', sans-serif;
+ @include header-font;
}
}
}
@@ -66,12 +61,7 @@ header {
float: left;
margin: 0;
margin-right: 30px;
- font-size: 30px;
- line-height: 48px;
- font-weight: normal;
- color: $style_color;
- text-shadow: 0 1px 1px #FFF;
- font-family: 'Korolev', sans-serif;
+ @include header-font;
}
/**
diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/variables.scss
index ba78c8351f4..869eb168c0d 100644
--- a/app/assets/stylesheets/variables.scss
+++ b/app/assets/stylesheets/variables.scss
@@ -2,4 +2,4 @@
$primary_color: #2FA0BB;
$link_color: #3A89A3;
$style_color: #474D57;
-$hover: #D9EDF7; \ No newline at end of file
+$hover: #D9EDF7;