github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-06-04 08:54:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed included fonts, Set to use system fonts.

Browse Source 
All font definitions moved into _text.scss.
Needs override documentation to complete.
Relates to #423.
This commit is contained in:
Dan Brown
2017-08-19 14:33:55 +01:00
parent 194293664f
commit 666c86b108
32 changed files with 18 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
resources/assets/sass/_blocks.scss
View File

@ -134,8 +134,7 @@
.callout {
border-left: 3px solid #BBB;
background-color: #EEE;
padding: $-s;
padding-left: $-xl;
padding: $-s $-s $-s $-xl;
display: block;
position: relative;
&:before {

1
resources/assets/sass/_buttons.scss
View File

@ -31,7 +31,6 @@ $button-border-radius: 2px;
display: inline-block;
border: none;
font-weight: 500;
font-family: $text;
outline: 0;
border-radius: $button-border-radius;
cursor: pointer;

2
resources/assets/sass/_codemirror.scss
View File

@ -2,7 +2,6 @@
.CodeMirror {
/* Set height, width, borders, and global font properties here */
font-family: monospace;
height: 300px;
color: black;
}
@ -235,7 +234,6 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
-moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
border-width: 0;
background: transparent;
font-family: inherit;
font-size: inherit;
margin: 0;
white-space: pre;

102
resources/assets/sass/_fonts.scss
View File

@ -1,102 +0,0 @@
// Generated using https://google-webfonts-helper.herokuapp.com
/* roboto-100 - cyrillic_latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 100;
src: local('Roboto Thin'), local('Roboto-Thin'),
url('../fonts/roboto-v15-cyrillic_latin-100.woff2') format('woff2'), /* Chrome 26+, Opera 23+ */
url('../fonts/roboto-v15-cyrillic_latin-100.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* roboto-100italic - cyrillic_latin */
@font-face {
font-family: 'Roboto';
font-style: italic;
font-weight: 100;
src: local('Roboto Thin Italic'), local('Roboto-ThinItalic'),
url('../fonts/roboto-v15-cyrillic_latin-100italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+ */
url('../fonts/roboto-v15-cyrillic_latin-100italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* roboto-300 - cyrillic_latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 300;
src: local('Roboto Light'), local('Roboto-Light'),
url('../fonts/roboto-v15-cyrillic_latin-300.woff2') format('woff2'), /* Chrome 26+, Opera 23+ */
url('../fonts/roboto-v15-cyrillic_latin-300.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* roboto-300italic - cyrillic_latin */
@font-face {
font-family: 'Roboto';
font-style: italic;
font-weight: 300;
src: local('Roboto Light Italic'), local('Roboto-LightItalic'),
url('../fonts/roboto-v15-cyrillic_latin-300italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+ */
url('../fonts/roboto-v15-cyrillic_latin-300italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* roboto-regular - cyrillic_latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: local('Roboto'), local('Roboto-Regular'),
url('../fonts/roboto-v15-cyrillic_latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+ */
url('../fonts/roboto-v15-cyrillic_latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* roboto-italic - cyrillic_latin */
@font-face {
font-family: 'Roboto';
font-style: italic;
font-weight: 400;
src: local('Roboto Italic'), local('Roboto-Italic'),
url('../fonts/roboto-v15-cyrillic_latin-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+ */
url('../fonts/roboto-v15-cyrillic_latin-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* roboto-500 - cyrillic_latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 500;
src: local('Roboto Medium'), local('Roboto-Medium'),
url('../fonts/roboto-v15-cyrillic_latin-500.woff2') format('woff2'), /* Chrome 26+, Opera 23+ */
url('../fonts/roboto-v15-cyrillic_latin-500.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* roboto-500italic - cyrillic_latin */
@font-face {
font-family: 'Roboto';
font-style: italic;
font-weight: 500;
src: local('Roboto Medium Italic'), local('Roboto-MediumItalic'),
url('../fonts/roboto-v15-cyrillic_latin-500italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+ */
url('../fonts/roboto-v15-cyrillic_latin-500italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* roboto-700 - cyrillic_latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 700;
src: local('Roboto Bold'), local('Roboto-Bold'),
url('../fonts/roboto-v15-cyrillic_latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+ */
url('../fonts/roboto-v15-cyrillic_latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* roboto-700italic - cyrillic_latin */
@font-face {
font-family: 'Roboto';
font-style: italic;
font-weight: 700;
src: local('Roboto Bold Italic'), local('Roboto-BoldItalic'),
url('../fonts/roboto-v15-cyrillic_latin-700italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+ */
url('../fonts/roboto-v15-cyrillic_latin-700italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* roboto-mono-regular - latin */
@font-face {
font-family: 'Roboto Mono';
font-style: normal;
font-weight: 400;
src: local('Roboto Mono'), local('RobotoMono-Regular'),
url('../fonts/roboto-mono-v4-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+ */
url('../fonts/roboto-mono-v4-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}

3
resources/assets/sass/_forms.scss
View File

@ -5,7 +5,6 @@
border: 1px solid #CCC;
display: inline-block;
font-size: $fs-s;
font-family: $text;
padding: $-xs;
color: #222;
width: 250px;
@ -33,7 +32,6 @@
position: relative;
z-index: 5;
#markdown-editor-input {
font-family: 'Roboto Mono', monospace;
font-style: normal;
font-weight: 400;
padding: $-xs $-m;
@ -69,7 +67,6 @@
.editor-toolbar {
width: 100%;
padding: $-xs $-m;
font-family: 'Roboto Mono', monospace;
font-size: 11px;
line-height: 1.6;
border-bottom: 1px solid #DDD;

1
resources/assets/sass/_html.scss
View File

@ -12,7 +12,6 @@ html {
}
body {
font-family: $text;
font-size: $fs-m;
line-height: 1.6;
color: #616161;

14
resources/assets/sass/_text.scss
View File

@ -1,3 +1,14 @@
/**
* Fonts
*/
body, button, input, select, label {
font-family: $text;
}
.Codemirror, pre, #markdown-editor-input, .editor-toolbar, .code-base {
font-family: $mono;
}
/*
* Header Styles
*/
@ -58,7 +69,6 @@ a, .link {
cursor: pointer;
text-decoration: none;
transition: color ease-in-out 80ms;
font-family: $text;
line-height: 1.6;
&:hover {
text-decoration: underline;
@ -131,7 +141,6 @@ sub, .subscript {
}
pre {
font-family: monospace;
font-size: 12px;
background-color: #f5f5f5;
border: 1px solid #DDD;
@ -180,7 +189,6 @@ blockquote {
.code-base {
background-color: #F8F8F8;
font-family: monospace;
font-size: 0.80em;
border: 1px solid #DDD;
border-radius: 3px;

8
resources/assets/sass/_variables.scss
View File

@ -27,8 +27,12 @@ $-xs: 6px;
$-xxs: 3px;
// Fonts
$heading: 'Roboto', 'DejaVu Sans', Helvetica, Arial, sans-serif;
$text: 'Roboto', 'DejaVu Sans', Helvetica, Arial, sans-serif;
$text: -apple-system, BlinkMacSystemFont,
"Segoe UI", "Oxygen", "Ubuntu", "Roboto", "Cantarell",
"Fira Sans", "Droid Sans", "Helvetica Neue",
sans-serif;
$mono: "Lucida Console", "DejaVu Sans Mono", "Ubunto Mono", Monaco, monospace;
$heading: $text;
$fs-m: 15px;
$fs-s: 14px;

1
resources/assets/sass/export-styles.scss
View File

@ -1,4 +1,3 @@
//@import "reset";
@import "variables";
@import "mixins";
@import "html";

2
resources/assets/sass/styles.scss
View File

@ -1,6 +1,5 @@
@import "reset";
@import "variables";
@import "fonts";
@import "mixins";
@import "html";
@import "text";
@ -23,7 +22,6 @@
animation-name: none !important;
}
[ng\:cloak], [ng-cloak], .ng-cloak {
display: none !important;
user-select: none;