mirrors
/
devdocs
mirror of https://github.com/freeCodeCamp/devdocs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch to system UI fonts

Browse Source
pull/570/merge
Thibaut Courouble 8 years ago
parent ad044f85d3
commit 327a408a44
28 changed files with 40 additions and 71 deletions
Show Stats Download Patch File Download Diff File

2
assets/javascripts/app/app.coffee
Unescape View File

@ -185,13 +185,11 @@
showLoading: -> showLoading: ->
document.body.classList.remove '_noscript' document.body.classList.remove '_noscript'
document.body.classList.add '_loading' document.body.classList.add '_loading'
document.body.insertAdjacentHTML 'beforeend', '<div id="fontLoader" aria-hidden="true" style="position: absolute; top: 0; height: 0; overflow: hidden; visibility: hidden;"><b>Preload</b> <em>all <b>fonts</b></em></div>' # Chrome
return return
hideLoading: -> hideLoading: ->
document.body.classList.remove '_booting' document.body.classList.remove '_booting'
document.body.classList.remove '_loading' document.body.classList.remove '_loading'
try $.remove document.getElementById('fontLoader')
return return
indexHost: -> indexHost: ->

2
assets/stylesheets/application-dark.css.scss
Unescape View File

@ -3,8 +3,6 @@
//= depend_on docs.png //= depend_on docs.png
//= depend_on docs@2x.png //= depend_on docs@2x.png
//= require vendor/open-sans
/*! /*!
* Copyright 2013-2017 Thibaut Courouble and other contributors * Copyright 2013-2017 Thibaut Courouble and other contributors
* *

2
assets/stylesheets/application.css.scss
Unescape View File

@ -3,8 +3,6 @@
//= depend_on docs.png //= depend_on docs.png
//= depend_on docs@2x.png //= depend_on docs@2x.png
//= require vendor/open-sans
/*! /*!
* Copyright 2013-2017 Thibaut Courouble and other contributors * Copyright 2013-2017 Thibaut Courouble and other contributors
* *

3
assets/stylesheets/components/_app.scss
Unescape View File

@ -33,9 +33,10 @@
line-height: 1; line-height: 1;
margin-top: -.75em; margin-top: -.75em;
font-size: 4rem; font-size: 4rem;
font-weight: 300;
letter-spacing: -.125rem;
color: $loadingText; color: $loadingText;
text-align: center; text-align: center;
letter-spacing: -.125rem;
opacity: 0; opacity: 0;
-webkit-transition: opacity .1s .3s; -webkit-transition: opacity .1s .3s;
transition: opacity .1s .3s; transition: opacity .1s .3s;

4
assets/stylesheets/components/_content.scss
Unescape View File

@ -135,7 +135,7 @@
._error-links { ._error-links {
font-size: 1rem; font-size: 1rem;
font-weight: bold; font-weight: $boldFontWeight;
} }
._error-link { padding: 0 .5rem; } ._error-link { padding: 0 .5rem; }
@ -187,7 +187,7 @@
._toc-title { ._toc-title {
margin: 0 0 .5rem; margin: 0 0 .5rem;
font-size: inherit; font-size: inherit;
font-weight: bold; font-weight: $boldFontWeight;
} }
._toc-list { ._toc-list {

2
assets/stylesheets/components/_fail.scss
Unescape View File

@ -23,7 +23,7 @@
._fail-title { ._fail-title {
margin: 0 0 1rem; margin: 0 0 1rem;
font-size: 1rem; font-size: 1rem;
font-weight: bold; font-weight: $boldFontWeight;
} }
._fail-text, ._fail-list { ._fail-text, ._fail-list {

1
assets/stylesheets/components/_header.scss
Unescape View File

@ -72,6 +72,7 @@
margin: 0; margin: 0;
line-height: inherit; line-height: inherit;
font-size: inherit; font-size: inherit;
font-weight: $boldFontWeight;
cursor: default; cursor: default;
> ._nav-link { > ._nav-link {

2
assets/stylesheets/components/_mobile.scss
Unescape View File

@ -212,7 +212,7 @@
float: left; float: left;
width: 25%; width: 25%;
text-align: center; text-align: center;
font-weight: bold; font-weight: $boldFontWeight;
} }
// //

2
assets/stylesheets/components/_notif.scss
Unescape View File

@ -106,7 +106,7 @@
._news-date { ._news-date {
float: right; float: right;
margin-left: 1rem; margin-left: 1rem;
font-weight: bold; font-weight: $boldFontWeight;
} }
code { code {

2
assets/stylesheets/components/_prism.scss
Unescape View File

@ -78,5 +78,5 @@
} }
.token.important { .token.important {
font-weight: bold; font-weight: $boldFontWeight;
} }

2
assets/stylesheets/components/_sidebar.scss
Unescape View File

@ -490,7 +490,7 @@
._sidebar-footer-save { ._sidebar-footer-save {
margin-right: 1px; margin-right: 1px;
font-weight: bold; font-weight: $boldFontWeight;
background: $noteGreenBackground; background: $noteGreenBackground;
box-shadow: inset 0 1px $noteGreenBorder, box-shadow: inset 0 1px $noteGreenBorder,
1px 0 $noteGreenBorder; 1px 0 $noteGreenBorder;

7
assets/stylesheets/global/_base.scss
Unescape View File

@ -40,7 +40,7 @@ img {
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
margin: 1.5em 0 1em; margin: 1.5em 0 1em;
line-height: 1.3; line-height: 1.3;
font-weight: bold; font-weight: $bolderFontWeight;
} }
h1 { font-size: 1.5em; } h1 { font-size: 1.5em; }
@ -52,7 +52,7 @@ h5, h6 { font-size: 1em; }
p { margin: 0 0 1em; } p { margin: 0 0 1em; }
p:last-child { margin-bottom: 0; } p:last-child { margin-bottom: 0; }
b, strong { font-weight: bold; } b, strong { font-weight: $boldFontWeight; }
small { font-size: .9em; } small { font-size: .9em; }
@ -72,7 +72,7 @@ li > ul, li > ol, dd > ul, dd > ol { margin: .5em 0; }
li > p { margin-bottom: .25em; } li > p { margin-bottom: .25em; }
dl { margin: 1.5em 0; } dl { margin: 1.5em 0; }
dt { font-weight: bold; } dt { font-weight: $boldFontWeight; }
dd { dd {
margin: .375em; margin: .375em;
padding-left: 1em; padding-left: 1em;
@ -129,6 +129,7 @@ th, td {
} }
th { th {
font-weight: $boldFontWeight;
border: 0; border: 0;
border-bottom: 1px solid $boxBorder; border-bottom: 1px solid $boxBorder;
border-radius: 0; border-radius: 0;

6
assets/stylesheets/global/_variables.scss
Unescape View File

@ -1,5 +1,7 @@
$baseFont: 'Open Sans', Helvetica, Arial, sans-serif; $baseFont: -apple-system, BlinkMacSystemFont, San Francisco, Segoe UI, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif;
$monoFont: Consolas, 'Liberation Mono', Menlo, Courier, monospace; $monoFont: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace;
$boldFontWeight: 500;
$bolderFontWeight: 600;
$style: 'light'; $style: 'light';

6
assets/stylesheets/global/variables-dark.scss
Unescape View File

@ -1,5 +1,7 @@
$baseFont: 'Open Sans', Helvetica, Arial, sans-serif; $baseFont: -apple-system, BlinkMacSystemFont, San Francisco, Segoe UI, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif;
$monoFont: Consolas, 'Liberation Mono', Menlo, Courier, monospace; $monoFont: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace;
$boldFontWeight: 500;
$bolderFontWeight: 600;
$style: 'dark'; $style: 'dark';

2
assets/stylesheets/pages/_angularjs.scss
Unescape View File

@ -8,7 +8,7 @@
.nav-index-section { .nav-index-section {
margin: 1.5em 0 1em -2em; margin: 1.5em 0 1em -2em;
list-style: none; list-style: none;
font-weight: bold; font-weight: $boldFontWeight;
text-transform: capitalize; text-transform: capitalize;
} }

2
assets/stylesheets/pages/_erlang.scss
Unescape View File

@ -5,5 +5,5 @@
code.code { @extend %label; } code.code { @extend %label; }
.note { @extend %note; } .note { @extend %note; }
.warning { @extend %note, %note-red; } .warning { @extend %note, %note-red; }
.note .label, .warning .label { font-weight: bold; } .note .label, .warning .label { font-weight: $boldFontWeight; }
} }

4
assets/stylesheets/pages/_jquery.scss
Unescape View File

@ -32,7 +32,7 @@
.toc-list { .toc-list {
margin-top: 0; margin-top: 0;
font-weight: bold; font-weight: $boldFontWeight;
> li + li { margin-top: 1em; } > li + li { margin-top: 1em; }
> li > ul { font-weight: normal; } > li > ul { font-weight: normal; }
@ -48,7 +48,7 @@
.returns, .returns,
.option-type { .option-type {
float: right; float: right;
font-weight: bold; font-weight: $boldFontWeight;
margin-left: 1em; margin-left: 1em;
} }

6
assets/stylesheets/pages/_mdn.scss
Unescape View File

@ -7,7 +7,7 @@
> span { > span {
display: block; display: block;
font-size: 1rem; font-size: 1rem;
font-weight: bold; font-weight: $boldFontWeight;
} }
ul, ol { ul, ol {
@ -40,7 +40,7 @@
> .note { > .note {
em { em {
font-style: normal; font-style: normal;
font-weight: bold; font-weight: $boldFontWeight;
} }
> ul { margin: 1em 0; } > ul { margin: 1em 0; }
@ -91,7 +91,7 @@
dt > strong > code, // HTML element attribute dt > strong > code, // HTML element attribute
dl > dt > code { // CSS property value, Javascript function argument dl > dt > code { // CSS property value, Javascript function argument
font-family: inherit; font-family: inherit;
font-weight: bold; font-weight: $boldFontWeight;
font-size: inherit; font-size: inherit;
} }

2
assets/stylesheets/pages/_meteor.scss
Unescape View File

@ -9,7 +9,7 @@
dt > code { @extend %label; } dt > code { @extend %label; }
.api-heading { overflow: hidden; } .api-heading { overflow: hidden; }
.api-heading > code { font-weight: bold; } .api-heading > code { font-weight: $boldFontWeight; }
.locus, .src-code { float: right; } .locus, .src-code { float: right; }
.locus, .type, .src-code { margin-left: .5em; } .locus, .type, .src-code { margin-left: .5em; }
h2 .subtext-api { margin-top: .25rem; } h2 .subtext-api { margin-top: .25rem; }

2
assets/stylesheets/pages/_php.scss
Unescape View File

@ -13,7 +13,7 @@
.verinfo { .verinfo {
float: right; float: right;
font-weight: bold; font-weight: $boldFontWeight;
} }
.classsynopsis, .classsynopsis,

2
assets/stylesheets/pages/_postgres.scss
Unescape View File

@ -11,7 +11,7 @@
blockquote.CAUTION { @extend %note-orange; } blockquote.CAUTION { @extend %note-orange; }
p > code { @extend %label; } p > code { @extend %label; }
p.c2 { font-weight: bold; } p.c2 { font-weight: $boldFontWeight; }
.NAVFOOTER > table { width: 100%; } .NAVFOOTER > table { width: 100%; }
td[align=center] { text-align: center; } td[align=center] { text-align: center; }

2
assets/stylesheets/pages/_rdoc.scss
Unescape View File

@ -6,7 +6,7 @@
.method-description > h2, h3, h4, h5, h6 { font-size: 1em; } .method-description > h2, h3, h4, h5, h6 { font-size: 1em; }
.method-heading { .method-heading {
font-weight: bold; font-weight: $boldFontWeight;
@extend %block-label, %label-blue; @extend %block-label, %label-blue;
+ .method-heading { margin-top: -.5em; } + .method-heading { margin-top: -.5em; }

4
assets/stylesheets/pages/_sphinx.scss
Unescape View File

@ -13,7 +13,7 @@
.versionmodified, span.title, .topic-title { .versionmodified, span.title, .topic-title {
display: block; display: block;
font-weight: bold; font-weight: $boldFontWeight;
} }
p > code, li > code, dd > code, .docutils > dt > code { @extend %label; } p > code, li > code, dd > code, .docutils > dt > code { @extend %label; }
@ -25,7 +25,7 @@
.admonition-title { .admonition-title {
float: left; float: left;
margin: 0 .5em 0 0; margin: 0 .5em 0 0;
font-weight: bold; font-weight: $boldFontWeight;
&:after { content: ':'; } &:after { content: ':'; }
} }

2
assets/stylesheets/pages/_sphinx_simple.scss
Unescape View File

@ -5,7 +5,7 @@
.admonition.warning { @extend %note-orange; } .admonition.warning { @extend %note-orange; }
.admonition-title { .admonition-title {
margin: 0 0 .25rem; margin: 0 0 .25rem;
font-weight: bold; font-weight: $boldFontWeight;
} }
code { @extend %label; } code { @extend %label; }

2
assets/stylesheets/pages/_support_tables.scss
Unescape View File

@ -24,7 +24,7 @@
} }
tr.current { tr.current {
font-weight: bold; font-weight: $boldFontWeight;
font-size: 1rem; font-size: 1rem;
} }

2
assets/stylesheets/pages/_yard.scss
Unescape View File

@ -12,5 +12,5 @@
ul, pre { margin: 1em 0; } ul, pre { margin: 1em 0; }
} }
.tag_title { font-weight: bold; } .tag_title { font-weight: $boldFontWeight; }
} }

32
assets/stylesheets/vendor/open-sans.css vendored
View File

File diff suppressed because one or more lines are too long

4
lib/app.rb
Unescape View File

@ -70,14 +70,14 @@ class App < Sinatra::Application
BetterErrors.application_root = File.expand_path('..', __FILE__) BetterErrors.application_root = File.expand_path('..', __FILE__)
BetterErrors.editor = :sublime BetterErrors.editor = :sublime
set :csp, "default-src 'self' *; script-src 'self' 'nonce-devdocs' *; font-src data:; style-src 'self' 'unsafe-inline' *; img-src 'self' * data:;" set :csp, "default-src 'self' *; script-src 'self' 'nonce-devdocs' *; font-src 'none'; style-src 'self' 'unsafe-inline' *; img-src 'self' * data:;"
end end
configure :production do configure :production do
set :static, false set :static, false
set :cdn_origin, 'https://cdn.devdocs.io' set :cdn_origin, 'https://cdn.devdocs.io'
set :docs_origin, '//docs.devdocs.io' set :docs_origin, '//docs.devdocs.io'
set :csp, "default-src 'self' *; script-src 'self' 'nonce-devdocs' http://cdn.devdocs.io https://cdn.devdocs.io https://www.google-analytics.com https://secure.gaug.es http://*.jquery.com https://*.jquery.com; font-src data:; style-src 'self' 'unsafe-inline' *; img-src 'self' * data:;" set :csp, "default-src 'self' *; script-src 'self' 'nonce-devdocs' http://cdn.devdocs.io https://cdn.devdocs.io https://www.google-analytics.com https://secure.gaug.es http://*.jquery.com https://*.jquery.com; font-src 'none'; style-src 'self' 'unsafe-inline' *; img-src 'self' * data:;"
use Rack::ConditionalGet use Rack::ConditionalGet
use Rack::ETag use Rack::ETag

Write Preview
Loading…
Cancel
Save