mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-10-01 01:36:00 -04:00
Removed included fonts, Set to use system fonts.
All font definitions moved into _text.scss. Needs override documentation to complete. Relates to #423.
This commit is contained in:
parent
194293664f
commit
666c86b108
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -134,8 +134,7 @@
|
|||||||
.callout {
|
.callout {
|
||||||
border-left: 3px solid #BBB;
|
border-left: 3px solid #BBB;
|
||||||
background-color: #EEE;
|
background-color: #EEE;
|
||||||
padding: $-s;
|
padding: $-s $-s $-s $-xl;
|
||||||
padding-left: $-xl;
|
|
||||||
display: block;
|
display: block;
|
||||||
position: relative;
|
position: relative;
|
||||||
&:before {
|
&:before {
|
||||||
|
@ -31,7 +31,6 @@ $button-border-radius: 2px;
|
|||||||
display: inline-block;
|
display: inline-block;
|
||||||
border: none;
|
border: none;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
font-family: $text;
|
|
||||||
outline: 0;
|
outline: 0;
|
||||||
border-radius: $button-border-radius;
|
border-radius: $button-border-radius;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
.CodeMirror {
|
.CodeMirror {
|
||||||
/* Set height, width, borders, and global font properties here */
|
/* Set height, width, borders, and global font properties here */
|
||||||
font-family: monospace;
|
|
||||||
height: 300px;
|
height: 300px;
|
||||||
color: black;
|
color: black;
|
||||||
}
|
}
|
||||||
@ -235,7 +234,6 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
|
|||||||
-moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
|
-moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
|
||||||
border-width: 0;
|
border-width: 0;
|
||||||
background: transparent;
|
background: transparent;
|
||||||
font-family: inherit;
|
|
||||||
font-size: inherit;
|
font-size: inherit;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
white-space: pre;
|
white-space: pre;
|
||||||
|
@ -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+ */
|
|
||||||
}
|
|
@ -5,7 +5,6 @@
|
|||||||
border: 1px solid #CCC;
|
border: 1px solid #CCC;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
font-size: $fs-s;
|
font-size: $fs-s;
|
||||||
font-family: $text;
|
|
||||||
padding: $-xs;
|
padding: $-xs;
|
||||||
color: #222;
|
color: #222;
|
||||||
width: 250px;
|
width: 250px;
|
||||||
@ -33,7 +32,6 @@
|
|||||||
position: relative;
|
position: relative;
|
||||||
z-index: 5;
|
z-index: 5;
|
||||||
#markdown-editor-input {
|
#markdown-editor-input {
|
||||||
font-family: 'Roboto Mono', monospace;
|
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
padding: $-xs $-m;
|
padding: $-xs $-m;
|
||||||
@ -69,7 +67,6 @@
|
|||||||
.editor-toolbar {
|
.editor-toolbar {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
padding: $-xs $-m;
|
padding: $-xs $-m;
|
||||||
font-family: 'Roboto Mono', monospace;
|
|
||||||
font-size: 11px;
|
font-size: 11px;
|
||||||
line-height: 1.6;
|
line-height: 1.6;
|
||||||
border-bottom: 1px solid #DDD;
|
border-bottom: 1px solid #DDD;
|
||||||
|
@ -12,7 +12,6 @@ html {
|
|||||||
}
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
font-family: $text;
|
|
||||||
font-size: $fs-m;
|
font-size: $fs-m;
|
||||||
line-height: 1.6;
|
line-height: 1.6;
|
||||||
color: #616161;
|
color: #616161;
|
||||||
|
@ -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
|
* Header Styles
|
||||||
*/
|
*/
|
||||||
@ -58,7 +69,6 @@ a, .link {
|
|||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
transition: color ease-in-out 80ms;
|
transition: color ease-in-out 80ms;
|
||||||
font-family: $text;
|
|
||||||
line-height: 1.6;
|
line-height: 1.6;
|
||||||
&:hover {
|
&:hover {
|
||||||
text-decoration: underline;
|
text-decoration: underline;
|
||||||
@ -131,7 +141,6 @@ sub, .subscript {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pre {
|
pre {
|
||||||
font-family: monospace;
|
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
background-color: #f5f5f5;
|
background-color: #f5f5f5;
|
||||||
border: 1px solid #DDD;
|
border: 1px solid #DDD;
|
||||||
@ -180,7 +189,6 @@ blockquote {
|
|||||||
|
|
||||||
.code-base {
|
.code-base {
|
||||||
background-color: #F8F8F8;
|
background-color: #F8F8F8;
|
||||||
font-family: monospace;
|
|
||||||
font-size: 0.80em;
|
font-size: 0.80em;
|
||||||
border: 1px solid #DDD;
|
border: 1px solid #DDD;
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
|
@ -27,8 +27,12 @@ $-xs: 6px;
|
|||||||
$-xxs: 3px;
|
$-xxs: 3px;
|
||||||
|
|
||||||
// Fonts
|
// Fonts
|
||||||
$heading: 'Roboto', 'DejaVu Sans', Helvetica, Arial, sans-serif;
|
$text: -apple-system, BlinkMacSystemFont,
|
||||||
$text: 'Roboto', 'DejaVu Sans', Helvetica, Arial, sans-serif;
|
"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-m: 15px;
|
||||||
$fs-s: 14px;
|
$fs-s: 14px;
|
||||||
|
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
//@import "reset";
|
|
||||||
@import "variables";
|
@import "variables";
|
||||||
@import "mixins";
|
@import "mixins";
|
||||||
@import "html";
|
@import "html";
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
@import "reset";
|
@import "reset";
|
||||||
@import "variables";
|
@import "variables";
|
||||||
@import "fonts";
|
|
||||||
@import "mixins";
|
@import "mixins";
|
||||||
@import "html";
|
@import "html";
|
||||||
@import "text";
|
@import "text";
|
||||||
@ -23,7 +22,6 @@
|
|||||||
animation-name: none !important;
|
animation-name: none !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
[ng\:cloak], [ng-cloak], .ng-cloak {
|
[ng\:cloak], [ng-cloak], .ng-cloak {
|
||||||
display: none !important;
|
display: none !important;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
|
Loading…
Reference in New Issue
Block a user