Move typography.scss

app/assets/stylesheets/_application.scss

@@ -23,7 +23,7 @@
 @import 'typeahead';
 
 /* font overrides */
-@import 'new_styles/typography';
+@import 'typography';
 
 /* login */
 @import 'new_styles/login';

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;

app/assets/stylesheets/new_styles/_typography.scss

@@ -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";
-}

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';
+}