nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove Roboto

Browse source
This commit is contained in:
Steffen van Bergerem 2015-09-24 09:09:06 +02:00
parent 548132ab48
commit 06e2a445ab
6 changed files with 14 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/fonts/Roboto-Bold.ttf
View file

Binary file not shown.

BIN
app/assets/images/fonts/Roboto-Light.ttf
View file

Binary file not shown.

BIN
app/assets/images/fonts/Roboto-Regular.ttf
View file

Binary file not shown.

27
app/assets/stylesheets/error_pages.scss
View file

@ -4,26 +4,27 @@
html { min-height: 100%; } html { min-height: 100%; }
#big-number { #big-number {
font-family: Roboto-BoldCondensed, Helvetica, Arial, sans-serif; color: $light-grey;
font-family: Helvetica, Arial, sans-serif;
font-size: 250px; font-size: 250px;
line-height: 1em; line-height: 1em;
padding-top: 80px;
text-align: center; text-align: center;
padding-top: 100px;
text-shadow: 0 2px 0 #fff, 0 -1px 0 #999; text-shadow: 0 2px 0 #fff, 0 -1px 0 #999;
color: #ddd;
} }
.transparent { .transparent {
opacity: 0.8; opacity: 0.8;
} }
#content { #content {
font-family: Roboto, Helvetica, Arial, sans-serif;
text-align: center;
text-shadow: 0 1px 0 #fff;
font-size: 1.25em;
line-height: 1.5em;
color: $text-dark-grey; color: $text-dark-grey;
font-family: Helvetica, Arial, sans-serif;
font-size: 1.25em;
left: 0;
line-height: 1.5em;
position: absolute; position: absolute;
left: 0; right: 0; right: 0;
text-align: center;
text-shadow: 0 1px 0 $white;
} }
#error_404 { #error_404 {
@ -31,7 +32,7 @@ html { min-height: 100%; }
height: 100%; height: 100%;
bottom:0px; bottom:0px;
margin: 0px; margin: 0px;
font-family: Roboto, Helvetica, Arial, sans-serif; font-family: Helvetica, Arial, sans-serif;
text-align: center; text-align: center;
text-shadow: 0 1px 0 #fff; text-shadow: 0 1px 0 #fff;
color: #666; color: #666;
@ -39,10 +40,10 @@ html { min-height: 100%; }
background-attachment: fixed; background-attachment: fixed;
#big-number { #big-number {
font-family: Roboto-BoldCondensed, Helvetica, Arial, sans-serif; color: $light-grey;
font-family: Helvetica, Arial, sans-serif;
font-size: 250px; font-size: 250px;
text-shadow: 0 2px 0 #fff, 0 -1px 0 #999; text-shadow: 0 2px 0 #fff, 0 -1px 0 #999;
color: #ddd;
} }
a { a {
@ -56,7 +57,7 @@ html { min-height: 100%; }
.transparent { .transparent {
filter: alpha(opacity=80); filter: alpha(opacity=80);
opacity: 0.8; opacity: 0.6;
} }
} }

12
app/assets/stylesheets/new_styles/_base.scss
View file

@ -39,18 +39,6 @@ a.tag { word-break: break-all; }
color: inherit; 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 { #back-to-top {
display: block; display: block;
color: white; color: white;

19
app/assets/stylesheets/new_styles/_typography.scss
View file

@ -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 */ /* diaspora custom icons font */
@font-face { @font-face {
font-family: "diaspora-custom"; font-family: "diaspora-custom";