diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-12-24 12:37:28 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-12-24 12:37:28 +0200 |
| commit | d80d4cd92bd3f2bd77b19d44d773e97e981282fb (patch) | |
| tree | f8723193268fc2df5a0d52e6a4788e8e41a06365 /app/assets | |
| parent | 2462949fd598258204a8b6b98c2c91b5eabde847 (diff) | |
| download | gitlab-ce-d80d4cd92bd3f2bd77b19d44d773e97e981282fb.tar.gz | |
Replace font with free one
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/fonts/korolev-medium-compressed.otf | bin | 28736 -> 0 bytes | |||
| -rw-r--r-- | app/assets/fonts/wire-one.ttf | bin | 0 -> 140668 bytes | |||
| -rw-r--r-- | app/assets/stylesheets/gitlab_bootstrap/fonts.scss | 8 | ||||
| -rw-r--r-- | app/assets/stylesheets/gitlab_bootstrap/mixins.scss | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/app/assets/fonts/korolev-medium-compressed.otf b/app/assets/fonts/korolev-medium-compressed.otf Binary files differdeleted file mode 100644 index a9cd3cbffff..00000000000 --- a/app/assets/fonts/korolev-medium-compressed.otf +++ /dev/null diff --git a/app/assets/fonts/wire-one.ttf b/app/assets/fonts/wire-one.ttf Binary files differnew file mode 100644 index 00000000000..bb2aff0c0af --- /dev/null +++ b/app/assets/fonts/wire-one.ttf diff --git a/app/assets/stylesheets/gitlab_bootstrap/fonts.scss b/app/assets/stylesheets/gitlab_bootstrap/fonts.scss index 88c966d18f7..5409f8e8fc5 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/fonts.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/fonts.scss @@ -1,7 +1,7 @@ -@font-face{ - font-family: Korolev; - src: font-url('korolev-medium-compressed.otf'); +@font-face{ + font-family: Wireone; + src: font-url('wire-one.ttf'); } /** Typo **/ -$monospace: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono', 'lucida console', monospace;
\ No newline at end of file +$monospace: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono', 'lucida console', monospace; diff --git a/app/assets/stylesheets/gitlab_bootstrap/mixins.scss b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss index 81830368c4c..6b8d2364cde 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: 'Korolev', sans-serif; - font-size: 28px; - line-height: 48px; + font-family: 'Wireone', sans-serif; + font-size: 30px; + line-height: 42px; font-weight: normal; } |