diff --git a/app/assets/stylesheets/_application.scss b/app/assets/stylesheets/_application.scss index d1de1a6c2..b5993d6d9 100644 --- a/app/assets/stylesheets/_application.scss +++ b/app/assets/stylesheets/_application.scss @@ -23,7 +23,7 @@ @import 'typeahead'; /* font overrides */ -@import 'new_styles/typography'; +@import 'typography'; /* login */ @import 'new_styles/login'; diff --git a/app/assets/stylesheets/mobile/mobile.scss b/app/assets/stylesheets/mobile/mobile.scss index 8ee50ef1d..c3639ee68 100644 --- a/app/assets/stylesheets/mobile/mobile.scss +++ b/app/assets/stylesheets/mobile/mobile.scss @@ -14,7 +14,7 @@ @import "mobile/stream_element"; @import "mobile/comments"; -@import "new_styles/typography"; +@import 'typography'; a { color: #2489ce; diff --git a/app/assets/stylesheets/new_styles/_typography.scss b/app/assets/stylesheets/new_styles/_typography.scss deleted file mode 100644 index 0b7b945e6..000000000 --- a/app/assets/stylesheets/new_styles/_typography.scss +++ /dev/null @@ -1,26 +0,0 @@ -/* diaspora custom icons font */ -@font-face { - font-family: "diaspora-custom"; - src: image-url("fonts/diaspora-custom.ttf"); - font-weight: normal; - font-style: normal; - -} - -[class^="diaspora-custom-"]:before, -[class*=" diaspora-custom-"]:before { - font-family: "diaspora-custom" !important; - font-style: normal !important; - font-weight: normal !important; - font-variant: normal !important; - text-transform: none !important; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -.diaspora-custom-compose:before { - content: "a"; -} -.diaspora-custom-mail:before { - content: "b"; -} diff --git a/app/assets/stylesheets/typography.scss b/app/assets/stylesheets/typography.scss new file mode 100644 index 000000000..f94253f80 --- /dev/null +++ b/app/assets/stylesheets/typography.scss @@ -0,0 +1,27 @@ +// diaspora custom icons font +@font-face { + font-family: 'diaspora-custom'; + src: image-url('fonts/diaspora-custom.ttf'); + font-weight: normal; + font-style: normal; + +} + +[class^="diaspora-custom-"]:before, +[class*=" diaspora-custom-"]:before { + font-family: 'diaspora-custom'; + -moz-osx-font-smoothing: grayscale; + -webkit-font-smoothing: antialiased; + font-style: normal; + font-variant: normal; + font-weight: normal; + text-transform: none; +} + +.diaspora-custom-compose:before { + content: 'a'; +} + +.diaspora-custom-mail:before { + content: 'b'; +}