Merge pull request #11573 from thaJeztah/mind_your_head

Fix landing-page mobile menu background color, and other fixes
This commit is contained in:
Usha Mandya 2020-10-19 16:32:54 +01:00 committed by GitHub
commit c0f083cb4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 40 additions and 29902 deletions

View File

@ -468,10 +468,6 @@
<footer class="footer">
{% include footer.html %}
</footer>
<script src="/js/theme-switcher.js"></script>
<script src="/js/jquery.js"></script>
<script src="/js/bootstrap.min.js"></script>
<script defer src="/js/search.js"></script>
<script>
window.onChangeHelpTab = function (name) {

View File

@ -73,11 +73,5 @@
{% include footer.html %}
</footer>
<script>const pageURL = "{{ page.url }}";</script>
<script src="/js/theme-switcher.js"></script>
<script defer src="/js/anchorlinks.js"></script>
<script src="/js/jquery.js"></script>
<script src="/js/bootstrap.min.js"></script>
<script defer src="/js/docs.js"></script>
<script defer src="/js/search.js"></script>
{%- include analytics/polldaddy.html -%}
</body>

View File

@ -44,16 +44,36 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
{%- comment -%}
We put these scripts in the head section, but use "defer" loading to allow the
browser to start loading them as soon as possible. Actual execution of deferred
scripts happens once the HTML is fully parsed.
see https://flaviocopes.com/javascript-async-defer/#with-defer-in-the-head
{%- endcomment -%}
{%- if page.landing == true -%}
<!-- landing page scripts -->
<script defer src="/js/theme-switcher.js"></script>
<script defer src="/js/jquery.js"></script>
<script defer src="/js/bootstrap.min.js"></script>
<script defer src="/js/search.js"></script>
{%- else -%}
<script defer src="/js/theme-switcher.js"></script>
<script defer src="/js/anchorlinks.js"></script>
<script defer src="/js/jquery.js"></script>
<script defer src="/js/bootstrap.min.js"></script>
<script defer src="/js/docs.js"></script>
<script defer src="/js/search.js"></script>
{%- endif -%}
{%- comment -%}
preload fonts: https://www.freecodecamp.org/news/web-fonts-in-2018-f191a48367e8/
we only preload the "woff2" variants, as older formats (woff, eot) are only used
by older browsers, and we don't optimize for those. For fontawesome we "prefetch"
to allow the browser to pre-heat the cache, but not load it if the page does not
use it.
by older browsers, and we don't optimize for those.
{%- endcomment -%}
<link rel="prefetch" as="font" href="/fonts/fontawesome-webfont.woff2?v=4.7.0" type="font/woff2" crossorigin="anonymous">
<link rel="preload" as="font" href="/fonts/glyphicons-halflings-regular.woff2" type="font/woff2" crossorigin="anonymous">
<link rel="preload" as="font" href="/fonts/geomanist/hinted-Geomanist-Book.woff2" type="font/woff2" crossorigin="anonymous">
<link rel="preload" as="font" href="/fonts/geomanist/hinted-Geomanist-Book.woff2" type="font/woff2" crossorigin="anonymous">
<link rel="preload" as="font" href="/fonts/geomanist/hinted-Geomanist-Regular.woff2" type="font/woff2" crossorigin="anonymous">
<link rel="preload" as="font" href="/fonts/glyphicons-halflings-regular.woff2" type="font/woff2" crossorigin="anonymous">
<link rel="preload" as="font" href="/fonts/fontawesome-webfont.woff2?v=4.7.0" type="font/woff2" crossorigin="anonymous">
<link rel="stylesheet" href="/css/font-awesome.min.css">
<link rel="stylesheet" href="/css/bootstrap.min.css">

View File

@ -1,7 +1,4 @@
<div id="navbar" class="nav-sidebar">
<ul class="nav jsTOCHorizontal hidden-md hidden-lg">
</ul>
<div class="divider hidden-md hidden-lg"></div>
<ul class="nav" id="jsTOCLeftNav">
</ul>
<ul class="nav jsTOCHorizontal hidden-md hidden-lg"></ul>
<ul class="nav" id="jsTOCLeftNav"></ul>
</div>

View File

@ -13,6 +13,12 @@ body.landing {
}
.header {
// Container holds both the top-navigation bar (div.navbar-header), and
// the "hamburger menu" (div.navbar-collapse)
>.container {
background-color: $bg-header;
}
@include md-width {
.navbar-collapse.collapse {
display: flex !important;

View File

@ -213,3 +213,9 @@ body.night {
color: $white!important;
}
}
body.landing.night {
.header>.container {
background-color: $bg-header-night;
}
}

File diff suppressed because one or more lines are too long

View File

@ -1,213 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>Transfonter demo</title>
<link href="stylesheet.css" rel="stylesheet">
<style>
/*
http://meyerweb.com/eric/tools/css/reset/
v2.0 | 20110126
License: none (public domain)
*/
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
font: inherit;
vertical-align: baseline;
}
/* HTML5 display-role reset for older browsers */
article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section {
display: block;
}
body {
line-height: 1;
}
ol, ul {
list-style: none;
}
blockquote, q {
quotes: none;
}
blockquote:before, blockquote:after,
q:before, q:after {
content: '';
content: none;
}
table {
border-collapse: collapse;
border-spacing: 0;
}
/* common styles */
body {
background: #f1f1f1;
color: #000;
}
.page {
background: #fff;
width: 940px;
margin: 0 auto;
padding: 20px 20px 0 20px;
overflow: hidden;
}
.font-container {
overflow-x: auto;
overflow-y: hidden;
margin-bottom: 40px;
line-height: 1.3;
white-space: nowrap;
padding-bottom: 5px;
}
h1 {
position: relative;
background: #444;
font-size: 32px;
color: #fff;
padding: 10px 20px;
margin: 0 -20px 10px -20px;
}
.letters {
font-size: 25px;
margin-bottom: 20px;
}
.s10:before {
content: '10px';
}
.s11:before {
content: '11px';
}
.s12:before {
content: '12px';
}
.s14:before {
content: '14px';
}
.s18:before {
content: '18px';
}
.s24:before {
content: '24px';
}
.s30:before {
content: '30px';
}
.s36:before {
content: '36px';
}
.s48:before {
content: '48px';
}
.s60:before {
content: '60px';
}
.s72:before {
content: '72px';
}
.s10:before, .s11:before, .s12:before, .s14:before,
.s18:before, .s24:before, .s30:before, .s36:before,
.s48:before, .s60:before, .s72:before {
font-family: Arial, sans-serif;
font-size: 10px;
font-weight: normal;
font-style: normal;
color: #999;
padding-right: 6px;
}
/* fonts demo styles */
.demo-0 {
font-family: 'Comfortaa';
font-weight: normal;
font-style: normal;
}
.demo-1 {
font-family: 'Comfortaa';
font-weight: 300;
font-style: normal;
}
.demo-2 {
font-family: 'Comfortaa';
font-weight: bold;
font-style: normal;
}
</style>
</head>
<body>
<div class="page">
<div class="demo-0">
<h1>Comfortaa</h1>
<div class="font-container">
<p class="letters">
abcdefghijklmnopqrstuvwxyz <br />
ABCDEFGHIJKLMNOPQRSTUVWXYZ <br /> 0123456789.:,;()*!?'@#<>$%&^+-=~
</p>
<p class="s10" style="font-size: 10px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s11" style="font-size: 11px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s12" style="font-size: 12px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s14" style="font-size: 14px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s18" style="font-size: 18px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s24" style="font-size: 24px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s30" style="font-size: 30px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s36" style="font-size: 36px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s48" style="font-size: 48px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s60" style="font-size: 60px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s72" style="font-size: 72px;">The quick brown fox jumps over the lazy dog.</p>
</div>
</div>
<div class="demo-1">
<h1>Comfortaa Light</h1>
<div class="font-container">
<p class="letters">
abcdefghijklmnopqrstuvwxyz <br />
ABCDEFGHIJKLMNOPQRSTUVWXYZ <br /> 0123456789.:,;()*!?'@#<>$%&^+-=~
</p>
<p class="s10" style="font-size: 10px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s11" style="font-size: 11px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s12" style="font-size: 12px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s14" style="font-size: 14px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s18" style="font-size: 18px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s24" style="font-size: 24px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s30" style="font-size: 30px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s36" style="font-size: 36px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s48" style="font-size: 48px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s60" style="font-size: 60px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s72" style="font-size: 72px;">The quick brown fox jumps over the lazy dog.</p>
</div>
</div>
<div class="demo-2">
<h1>Comfortaa Bold</h1>
<div class="font-container">
<p class="letters">
abcdefghijklmnopqrstuvwxyz <br />
ABCDEFGHIJKLMNOPQRSTUVWXYZ <br /> 0123456789.:,;()*!?'@#<>$%&^+-=~
</p>
<p class="s10" style="font-size: 10px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s11" style="font-size: 11px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s12" style="font-size: 12px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s14" style="font-size: 14px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s18" style="font-size: 18px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s24" style="font-size: 24px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s30" style="font-size: 30px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s36" style="font-size: 36px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s48" style="font-size: 48px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s60" style="font-size: 60px;">The quick brown fox jumps over the lazy dog.</p>
<p class="s72" style="font-size: 72px;">The quick brown fox jumps over the lazy dog.</p>
</div>
</div>
</div>
</body>
</html>

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 642 KiB

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 600 KiB

Binary file not shown.

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 603 KiB

Binary file not shown.

View File

@ -1,40 +0,0 @@
/* This stylesheet generated by Transfonter (http://transfonter.org) on May 18, 2016 12:44 PM */
@font-face {
font-family: 'Comfortaa';
src: url('hinted-Comfortaa.eot');
src: url('hinted-Comfortaa.eot?#iefix') format('embedded-opentype'),
url('hinted-Comfortaa.woff2') format('woff2'),
url('hinted-Comfortaa.woff') format('woff'),
url('hinted-Comfortaa.ttf') format('truetype'),
url('hinted-Comfortaa.svg#Comfortaa') format('svg');
font-weight: normal;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: 'Comfortaa';
src: url('hinted-Comfortaa-Light.eot');
src: url('hinted-Comfortaa-Light.eot?#iefix') format('embedded-opentype'),
url('hinted-Comfortaa-Light.woff2') format('woff2'),
url('hinted-Comfortaa-Light.woff') format('woff'),
url('hinted-Comfortaa-Light.ttf') format('truetype'),
url('hinted-Comfortaa-Light.svg#Comfortaa-Light') format('svg');
font-weight: 300;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: 'Comfortaa';
src: url('hinted-Comfortaa-Bold.eot');
src: url('hinted-Comfortaa-Bold.eot?#iefix') format('embedded-opentype'),
url('hinted-Comfortaa-Bold.woff2') format('woff2'),
url('hinted-Comfortaa-Bold.woff') format('woff'),
url('hinted-Comfortaa-Bold.ttf') format('truetype'),
url('hinted-Comfortaa-Bold.svg#Comfortaa-Bold') format('svg');
font-weight: bold;
font-style: normal;
font-display: swap;
}