Commit 72395d7f6edc3ff2a4c01052a2ad085ab310595b
1 parent
317c9281
Exists in
master
and in
4 other branches
no need to add fonts to assets path
Showing
2 changed files
with
1 additions
and
4 deletions
Show diff stats
app/assets/stylesheets/main.scss
| @@ -8,7 +8,7 @@ $style_color: #474d57; | @@ -8,7 +8,7 @@ $style_color: #474d57; | ||
| 8 | $hover: #D9EDF7; | 8 | $hover: #D9EDF7; |
| 9 | 9 | ||
| 10 | /** GitLab Fonts **/ | 10 | /** GitLab Fonts **/ |
| 11 | -@font-face { font-family: Korolev; src: url('korolev-medium-compressed.otf'); } | 11 | +@font-face { font-family: Korolev; src: font-url('korolev-medium-compressed.otf'); } |
| 12 | 12 | ||
| 13 | /** MIXINS **/ | 13 | /** MIXINS **/ |
| 14 | @mixin shade { | 14 | @mixin shade { |
config/application.rb
| @@ -50,8 +50,5 @@ module Gitlab | @@ -50,8 +50,5 @@ module Gitlab | ||
| 50 | 50 | ||
| 51 | # Version of your assets, change this if you want to expire all your assets | 51 | # Version of your assets, change this if you want to expire all your assets |
| 52 | config.assets.version = '1.0' | 52 | config.assets.version = '1.0' |
| 53 | - | ||
| 54 | - # Add fonts | ||
| 55 | - config.assets.paths << "#{Rails.root}/app/assets/fonts" | ||
| 56 | end | 53 | end |
| 57 | end | 54 | end |