diff --git a/app/assets/images/fonts/Roboto-Bold.ttf b/app/assets/images/fonts/Roboto-Bold.ttf deleted file mode 100644 index 91ec21227866ca9d1cf77ec13660b7b85ec900dd..0000000000000000000000000000000000000000 Binary files a/app/assets/images/fonts/Roboto-Bold.ttf and /dev/null differ diff --git a/app/assets/images/fonts/Roboto-Light.ttf b/app/assets/images/fonts/Roboto-Light.ttf deleted file mode 100644 index d43e943312e0f2c653815dd791d93f94f0abd73f..0000000000000000000000000000000000000000 Binary files a/app/assets/images/fonts/Roboto-Light.ttf and /dev/null differ diff --git a/app/assets/images/fonts/Roboto-Regular.ttf b/app/assets/images/fonts/Roboto-Regular.ttf deleted file mode 100644 index 7d9a6c4c32d7e920b549caf531e390733496b6e0..0000000000000000000000000000000000000000 Binary files a/app/assets/images/fonts/Roboto-Regular.ttf and /dev/null differ diff --git a/app/assets/stylesheets/error_pages.scss b/app/assets/stylesheets/error_pages.scss index 59ac55d58e19851b83cafed5b464ef6d177b64a1..d170a478d3bf783d2996a89f84636c3801ac6dc4 100644 --- a/app/assets/stylesheets/error_pages.scss +++ b/app/assets/stylesheets/error_pages.scss @@ -4,26 +4,27 @@ html { min-height: 100%; } #big-number { - font-family: Roboto-BoldCondensed, Helvetica, Arial, sans-serif; + color: $light-grey; + font-family: Helvetica, Arial, sans-serif; font-size: 250px; line-height: 1em; + padding-top: 80px; text-align: center; - padding-top: 100px; text-shadow: 0 2px 0 #fff, 0 -1px 0 #999; - color: #ddd; } .transparent { opacity: 0.8; } #content { - font-family: Roboto, Helvetica, Arial, sans-serif; - text-align: center; - text-shadow: 0 1px 0 #fff; + color: $text-dark-grey; + font-family: Helvetica, Arial, sans-serif; font-size: 1.25em; + left: 0; line-height: 1.5em; - color: $text-dark-grey; position: absolute; - left: 0; right: 0; + right: 0; + text-align: center; + text-shadow: 0 1px 0 $white; } #error_404 { @@ -31,7 +32,7 @@ html { min-height: 100%; } height: 100%; bottom:0px; margin: 0px; - font-family: Roboto, Helvetica, Arial, sans-serif; + font-family: Helvetica, Arial, sans-serif; text-align: center; text-shadow: 0 1px 0 #fff; color: #666; @@ -39,10 +40,10 @@ html { min-height: 100%; } background-attachment: fixed; #big-number { - font-family: Roboto-BoldCondensed, Helvetica, Arial, sans-serif; + color: $light-grey; + font-family: Helvetica, Arial, sans-serif; font-size: 250px; text-shadow: 0 2px 0 #fff, 0 -1px 0 #999; - color: #ddd; } a { @@ -56,7 +57,7 @@ html { min-height: 100%; } .transparent { filter: alpha(opacity=80); - opacity: 0.8; + opacity: 0.6; } } diff --git a/app/assets/stylesheets/new_styles/_base.scss b/app/assets/stylesheets/new_styles/_base.scss index 8e2d8835c6dd7f60d1923290b66ddfa442013282..31a5aabfdd5c0366b216aabebbc0b5896cea3095 100644 --- a/app/assets/stylesheets/new_styles/_base.scss +++ b/app/assets/stylesheets/new_styles/_base.scss @@ -39,18 +39,6 @@ a.tag { word-break: break-all; } color: inherit; } -/* bootstrap label fixes for Roboto */ -.label { - padding : 2px 5px; - padding-bottom : 3px; - - span { - display : inline-block; - position : relative; - top : 1px; - } -} - #back-to-top { display: block; color: white; diff --git a/app/assets/stylesheets/new_styles/_typography.scss b/app/assets/stylesheets/new_styles/_typography.scss index a9afb3ea85680cdd72017e0d837f68b18e6fff5c..0b7b945e6e8a01ba833a2eb4a3f162cb6ca0e94b 100644 --- a/app/assets/stylesheets/new_styles/_typography.scss +++ b/app/assets/stylesheets/new_styles/_typography.scss @@ -1,22 +1,3 @@ -/* Roboto */ -@font-face { - font-family : Roboto; - src : image-url('fonts/Roboto-Regular.ttf'); - weight : normal; -} - -@font-face { - font-family : Roboto-Bold; - src : image-url('fonts/Roboto-Bold.ttf'); - weight : normal; -} - -@font-face { - font-family : Roboto-Light; - src : image-url('fonts/Roboto-Light.ttf'); - weight : normal; -} - /* diaspora custom icons font */ @font-face { font-family: "diaspora-custom";