Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-03 04:54:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

added roboto slab and reinstated use of serif fonts via new variable

Browse source
This commit is contained in:
Dave Cranwell 2015-06-26 16:56:51 +01:00 committed by Matt Westcott
parent 31eb1c5ab3
commit 0d402c02a7
11 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
wagtail/wagtailadmin/static_src/wagtailadmin/fonts/robotoslab-bold.ttf Executable file
View file

Binary file not shown.

BIN
wagtail/wagtailadmin/static_src/wagtailadmin/fonts/robotoslab-bold.woff Executable file
View file

Binary file not shown.

BIN
wagtail/wagtailadmin/static_src/wagtailadmin/fonts/robotoslab-bold.woff2 Normal file
View file

Binary file not shown.

BIN
wagtail/wagtailadmin/static_src/wagtailadmin/fonts/robotoslab-regular.ttf Executable file
View file

Binary file not shown.

BIN
wagtail/wagtailadmin/static_src/wagtailadmin/fonts/robotoslab-regular.woff Executable file
View file

Binary file not shown.

BIN
wagtail/wagtailadmin/static_src/wagtailadmin/fonts/robotoslab-regular.woff2 Normal file
View file

Binary file not shown.

7
wagtail/wagtailadmin/static_src/wagtailadmin/scss/fonts.scss
View file

@ -28,14 +28,11 @@
}
@include webfont(Open Sans, opensans-light, 300, normal);
//@include webfont(Open Sans, opensans-lightitalic, 300, italic);
@include webfont(Open Sans, opensans-regular, 400, normal);
//@include webfont(Open Sans, opensans-italic, 400, italic);
@include webfont(Open Sans, opensans-semibold, 600, normal);
//@include webfont(Open Sans, opensans-semibolditalic, 600, italic);
@include webfont(Open Sans, opensans-bold, 700, normal);
//@include webfont(Open Sans, opensans-bolditalic, 700, italic);
@include webfont(Roboto Slab, robotoslab-regular, 400, normal);
@include webfont(Roboto Slab, robotoslab-bold, 700, normal);
/* The wagtail font isn't available in WOFF2, so a @font-face is set here without a mixin. */
@font-face {

1
wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/home.scss
View file

@ -54,6 +54,7 @@ header{
}
span{
font-family: $font-serif;
display:block;
font-size:4em;
line-height:1em;

4
wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/page-editor.scss
View file

@ -326,8 +326,8 @@
.title input,
.title textarea,
.title .richtext{
font-size:2em;
font-family: Georgia, serif;
font-size: 2em;
font-family: $font-serif;
}
/* Footer control bar for perfoming actions on the page */

1
wagtail/wagtailadmin/static_src/wagtailadmin/scss/panels/rich-text.scss
View file

@ -44,6 +44,7 @@
}
.richtext {
font-family: $font-serif;
padding-top:4em;
min-height:50px;
overflow: hidden;

3
wagtail/wagtailadmin/static_src/wagtailadmin/scss/variables.scss
View file

@ -61,7 +61,8 @@ $color-text-base: $color-grey-2;
$color-text-input: $color-grey-1;
/* Fonts */
$font-sans:Open Sans,Arial,sans-serif;
$font-sans: Open Sans, Arial, sans-serif;
$font-serif: Roboto Slab, Georgia, serif;
/* misc sizing */
$thumbnail-width: 130px;