Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/ForkAwesome/Fork-Awesome.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJulien Deswaef <juego@requiem4tv.com>2020-06-07 14:30:25 +0300
committerGitHub <noreply@github.com>2020-06-07 14:30:25 +0300
commit1cbff5fbba72249fbbebe869cb8dd6b6a9793a9d (patch)
tree9b5f43c857fa715d17375ad4f992e6af4e7ac5b0 /src
parent0c401731438e6bd4ca74a03d07f62b7c999594c5 (diff)
parent284cfebe31950a668b0b9ae23e3148e9b87a96df (diff)
Merge pull request #221 from Calinou/website-improve-font-stack
Improve the font stack used on the website
Diffstat (limited to 'src')
-rw-r--r--src/doc/assets/less/bootstrap-3.3.5/jumbotron.less1
-rw-r--r--src/doc/assets/less/bootstrap-3.3.5/type.less1
-rw-r--r--src/doc/assets/less/site/bootstrap/jumbotron.less2
-rw-r--r--src/doc/assets/less/site/bootstrap/type.less4
-rw-r--r--src/doc/assets/less/site/bootstrap/variables.less3
5 files changed, 1 insertions, 10 deletions
diff --git a/src/doc/assets/less/bootstrap-3.3.5/jumbotron.less b/src/doc/assets/less/bootstrap-3.3.5/jumbotron.less
index fa80a38c6..970852dce 100644
--- a/src/doc/assets/less/bootstrap-3.3.5/jumbotron.less
+++ b/src/doc/assets/less/bootstrap-3.3.5/jumbotron.less
@@ -18,7 +18,6 @@
p {
margin-bottom: (@jumbotron-padding / 2);
font-size: @jumbotron-font-size;
- font-weight: 200;
}
> hr {
diff --git a/src/doc/assets/less/bootstrap-3.3.5/type.less b/src/doc/assets/less/bootstrap-3.3.5/type.less
index 0d4fee484..9613ddde1 100644
--- a/src/doc/assets/less/bootstrap-3.3.5/type.less
+++ b/src/doc/assets/less/bootstrap-3.3.5/type.less
@@ -62,7 +62,6 @@ p {
.lead {
margin-bottom: @line-height-computed;
font-size: floor((@font-size-base * 1.15));
- font-weight: 300;
line-height: 1.4;
@media (min-width: @screen-sm-min) {
diff --git a/src/doc/assets/less/site/bootstrap/jumbotron.less b/src/doc/assets/less/site/bootstrap/jumbotron.less
index a04420b72..9ce1da060 100644
--- a/src/doc/assets/less/site/bootstrap/jumbotron.less
+++ b/src/doc/assets/less/site/bootstrap/jumbotron.less
@@ -13,12 +13,10 @@
margin: 0 0 15px;
}
p {
- font-family: @font-family-alt;
margin-top: 15px;
margin-bottom: 15px;
font-size: 24px;
line-height: 1.3;
- font-weight: lighter;
}
.list-group-item {
diff --git a/src/doc/assets/less/site/bootstrap/type.less b/src/doc/assets/less/site/bootstrap/type.less
index b7d5f9b03..22a3a5079 100644
--- a/src/doc/assets/less/site/bootstrap/type.less
+++ b/src/doc/assets/less/site/bootstrap/type.less
@@ -1,7 +1,3 @@
-.small-caps {
- font-family: @font-family-alt;
-}
-
.hr {
position: relative;
text-align: center;
diff --git a/src/doc/assets/less/site/bootstrap/variables.less b/src/doc/assets/less/site/bootstrap/variables.less
index 98b7f1bd8..79ed1077c 100644
--- a/src/doc/assets/less/site/bootstrap/variables.less
+++ b/src/doc/assets/less/site/bootstrap/variables.less
@@ -49,7 +49,6 @@
@fa-green-dark: darken(@fa-green, 10%);
@jumbotron-border: mix(@fa-green, @fa-green-dark, 75%);
-@font-family-alt: proxima-nova-sc, "Helvetica Neue", Helvetica, Arial, sans-serif;
// BOOTSTRAP OVERRIDES
@@ -65,7 +64,7 @@
// Typography
-@font-family-sans-serif: proxima-nova, "Helvetica Neue", Helvetica, Arial, sans-serif;
+@font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
@font-family-serif: museo-slab, Georgia, "Times New Roman", Times, serif;
@headings-font-family: @font-family-serif;