Commit 0cf15a52 authored by Daniel Shumway's avatar Daniel Shumway

Merge branch 'develop' into 'master'

develop

See merge request !29
parents a97fd869 e9116797
Pipeline #27873359 passed with stages
in 1 minute and 55 seconds
......@@ -853,7 +853,7 @@ believing that the company cares.
<section class="the-solutions">
<h1 id="the-solutions"><a class="anchor" href="#the-solutions">The Solutions</a></h1>
<p>
I would be remiss if didn<span class="quote single-close">'</span>t at this point talk about some possible solutions.
I would be remiss if I didn<span class="quote single-close">'</span>t at this point talk about some possible solutions.
</p>
<p>
......@@ -886,7 +886,7 @@ from <span class="double-push"></span><span class="quote double-open">"</span>Al
wanted to (with the caveat being that most of their additions are really bad for
end users). They could override that default setting based on a global
whitelist. They could randomly unmute tabs based on poorly defined gestures.
They could They could even use MEI as way to determine the output.
They could even use MEI as way to determine the output.
</p>
<aside>
......
This diff is collapsed.
......@@ -93,19 +93,20 @@ main {
.quote.single-close:after {
content: '’';
margin-left: -0.3ex; }
margin-left: -0.5ex; }
.quote.double-open:after {
content: '“';
margin-left: -0.8ex; }
margin-left: -0.9ex; }
.quote.double-close:after {
content: '”';
margin-left: -0.8ex; }
margin-left: -0.9ex; }
.quote.double-open {
margin-left: -0.6ex; }
margin-left: -0.6ex;
margin-right: 0.1ex; }
.double-push {
margin-right: 0.6ex;
margin-right: 0.7ex;
display: inline-block; }
@charset "UTF-8";
@font-face {
font-family: 'Stalemate';
src: url("/fonts/TTF/Stalemate-Regular.ttf") format("truetype"); }
@font-face {
font-family: 'Source Serif Pro';
font-weight: 200;
font-style: normal;
font-stretch: normal;
src: url("/fonts/EOT/SourceSerifPro-ExtraLight.eot") format("embedded-opentype"), url("/fonts/WOFF/OTF/SourceSerifPro-ExtraLight.otf.woff") format("woff"), url("/fonts/OTF/SourceSerifPro-ExtraLight.otf") format("opentype"), url("/fonts/TTF/SourceSerifPro-ExtraLight.ttf") format("truetype"); }
@font-face {
font-family: 'Source Serif Pro';
font-weight: 300;
......@@ -26,24 +15,31 @@
@font-face {
font-family: 'Source Serif Pro';
font-weight: 600;
font-weight: 700;
font-style: normal;
font-stretch: normal;
src: url("/fonts/EOT/SourceSerifPro-Semibold.eot") format("embedded-opentype"), url("/fonts/WOFF/OTF/SourceSerifPro-Semibold.otf.woff") format("woff"), url("/fonts/OTF/SourceSerifPro-Semibold.otf") format("opentype"), url("/fonts/TTF/SourceSerifPro-Semibold.ttf") format("truetype"); }
src: url("/fonts/EOT/SourceSerifPro-Bold.eot") format("embedded-opentype"), url("/fonts/WOFF/OTF/SourceSerifPro-Bold.otf.woff") format("woff"), url("/fonts/OTF/SourceSerifPro-Bold.otf") format("opentype"), url("/fonts/TTF/SourceSerifPro-Bold.ttf") format("truetype"); }
@font-face {
font-family: 'Source Serif Pro';
font-weight: 700;
font-family: 'Heuristica';
font-weight: 400;
font-style: normal;
font-stretch: normal;
src: url("/fonts/EOT/SourceSerifPro-Bold.eot") format("embedded-opentype"), url("/fonts/WOFF/OTF/SourceSerifPro-Bold.otf.woff") format("woff"), url("/fonts/OTF/SourceSerifPro-Bold.otf") format("opentype"), url("/fonts/TTF/SourceSerifPro-Bold.ttf") format("truetype"); }
src: url("/fonts/WOFF/heuristica/400.woff") format("woff"), url("/fonts/OTF/Heuristica-Bold.otf") format("opentype"); }
@font-face {
font-family: 'Source Serif Pro';
font-weight: 900;
font-family: 'Heuristica';
font-weight: 400;
font-style: italic;
font-stretch: normal;
src: url("/fonts/WOFF/heristica/400i.woff") format("woff"), url("/fonts/OTF/Heuristica-Italic.otf") format("opentype"); }
@font-face {
font-family: 'Heuristica';
font-weight: 700;
font-style: normal;
font-stretch: normal;
src: url("/fonts/EOT/SourceSerifPro-Black.eot") format("embedded-opentype"), url("/fonts/WOFF/OTF/SourceSerifPro-Black.otf.woff") format("woff"), url("/fonts/OTF/SourceSerifPro-Black.otf") format("opentype"), url("/fonts/TTF/SourceSerifPro-Black.ttf") format("truetype"); }
src: url("/fonts/WOFF/heuristica/700.woff") format("woff"), url("/fonts/OTF/Heuristica-Bold.otf") format("opentype"); }
/* ---------------- Resets --------------------- */
html, body, h1, h2 {
......@@ -139,21 +135,22 @@ main {
.quote.single-close:after {
content: '’';
margin-left: -0.3ex; }
margin-left: -0.5ex; }
.quote.double-open:after {
content: '“';
margin-left: -0.8ex; }
margin-left: -0.9ex; }
.quote.double-close:after {
content: '”';
margin-left: -0.8ex; }
margin-left: -0.9ex; }
.quote.double-open {
margin-left: -0.6ex; }
margin-left: -0.6ex;
margin-right: 0.1ex; }
.double-push {
margin-right: 0.6ex;
margin-right: 0.7ex;
display: inline-block; }
main {
......@@ -234,9 +231,10 @@ article {
width: 100%;
max-width: 40rem;
font-size: 1.1rem;
line-height: 1.5;
line-height: 1.45;
font-style: normal;
font-family: 'Source Serif Pro', sans-serif;
color: #111;
font-family: 'Heuristica', 'Georgia', serif;
/*
* Better in-article links:
*
......@@ -274,11 +272,16 @@ article {
border-top: 0.5rem solid transparent;
border-bottom: 0.5rem solid transparent;
border-right: 0.8rem solid #6e6e6e; }
article section aside ul {
margin-left: 0em;
padding-left: 1.2rem; }
article section .header {
font-family: 'Source Serif Pro', 'Georgia', serif;
font-style: italic;
font-weight: 300;
margin-top: -1em; }
article section.footnotes {
font-family: 'Source Serif Pro', 'Georgia', serif;
font-style: italic;
font-weight: 300;
/* #!?X CSS, this allows element to take up space and positions it even though it's children are floated. */
......@@ -348,6 +351,21 @@ article {
.imageblock img {
max-width: 100%; }
.imageblock.full img {
min-width: 65%; }
.imageblock.pixel img {
image-rendering: optimizeSpeed;
image-rendering: -moz-crisp-edges;
image-rendering: -webkit-optimize-contrast;
image-rendering: -o-crisp-edges;
image-rendering: crisp-edges;
image-rendering: pixelated;
-ms-interpolation-mode: nearest-neighbor; }
.videoblock video {
max-width: 100%; }
.imageblock .title {
font-size: 0.8rem;
font-style: italic;
......
@font-face {
font-family: 'Stalemate';
src: url("/fonts/TTF/Stalemate-Regular.ttf") format("truetype"); }
@font-face {
font-family: 'Source Serif Pro';
font-weight: 200;
font-style: normal;
font-stretch: normal;
src: url("/fonts/EOT/SourceSerifPro-ExtraLight.eot") format("embedded-opentype"), url("/fonts/WOFF/OTF/SourceSerifPro-ExtraLight.otf.woff") format("woff"), url("/fonts/OTF/SourceSerifPro-ExtraLight.otf") format("opentype"), url("/fonts/TTF/SourceSerifPro-ExtraLight.ttf") format("truetype"); }
@font-face {
font-family: 'Source Serif Pro';
font-weight: 300;
......@@ -25,21 +14,28 @@
@font-face {
font-family: 'Source Serif Pro';
font-weight: 600;
font-weight: 700;
font-style: normal;
font-stretch: normal;
src: url("/fonts/EOT/SourceSerifPro-Semibold.eot") format("embedded-opentype"), url("/fonts/WOFF/OTF/SourceSerifPro-Semibold.otf.woff") format("woff"), url("/fonts/OTF/SourceSerifPro-Semibold.otf") format("opentype"), url("/fonts/TTF/SourceSerifPro-Semibold.ttf") format("truetype"); }
src: url("/fonts/EOT/SourceSerifPro-Bold.eot") format("embedded-opentype"), url("/fonts/WOFF/OTF/SourceSerifPro-Bold.otf.woff") format("woff"), url("/fonts/OTF/SourceSerifPro-Bold.otf") format("opentype"), url("/fonts/TTF/SourceSerifPro-Bold.ttf") format("truetype"); }
@font-face {
font-family: 'Source Serif Pro';
font-weight: 700;
font-family: 'Heuristica';
font-weight: 400;
font-style: normal;
font-stretch: normal;
src: url("/fonts/EOT/SourceSerifPro-Bold.eot") format("embedded-opentype"), url("/fonts/WOFF/OTF/SourceSerifPro-Bold.otf.woff") format("woff"), url("/fonts/OTF/SourceSerifPro-Bold.otf") format("opentype"), url("/fonts/TTF/SourceSerifPro-Bold.ttf") format("truetype"); }
src: url("/fonts/WOFF/heuristica/400.woff") format("woff"), url("/fonts/OTF/Heuristica-Bold.otf") format("opentype"); }
@font-face {
font-family: 'Source Serif Pro';
font-weight: 900;
font-family: 'Heuristica';
font-weight: 400;
font-style: italic;
font-stretch: normal;
src: url("/fonts/WOFF/heristica/400i.woff") format("woff"), url("/fonts/OTF/Heuristica-Italic.otf") format("opentype"); }
@font-face {
font-family: 'Heuristica';
font-weight: 700;
font-style: normal;
font-stretch: normal;
src: url("/fonts/EOT/SourceSerifPro-Black.eot") format("embedded-opentype"), url("/fonts/WOFF/OTF/SourceSerifPro-Black.otf.woff") format("woff"), url("/fonts/OTF/SourceSerifPro-Black.otf") format("opentype"), url("/fonts/TTF/SourceSerifPro-Black.ttf") format("truetype"); }
src: url("/fonts/WOFF/heuristica/700.woff") format("woff"), url("/fonts/OTF/Heuristica-Bold.otf") format("opentype"); }
@charset "UTF-8";
@font-face {
font-family: 'Stalemate';
src: url("/fonts/TTF/Stalemate-Regular.ttf") format("truetype"); }
@font-face {
font-family: 'Source Serif Pro';
font-weight: 200;
font-style: normal;
font-stretch: normal;
src: url("/fonts/EOT/SourceSerifPro-ExtraLight.eot") format("embedded-opentype"), url("/fonts/WOFF/OTF/SourceSerifPro-ExtraLight.otf.woff") format("woff"), url("/fonts/OTF/SourceSerifPro-ExtraLight.otf") format("opentype"), url("/fonts/TTF/SourceSerifPro-ExtraLight.ttf") format("truetype"); }
@font-face {
font-family: 'Source Serif Pro';
font-weight: 300;
......@@ -26,24 +15,31 @@
@font-face {
font-family: 'Source Serif Pro';
font-weight: 600;
font-weight: 700;
font-style: normal;
font-stretch: normal;
src: url("/fonts/EOT/SourceSerifPro-Semibold.eot") format("embedded-opentype"), url("/fonts/WOFF/OTF/SourceSerifPro-Semibold.otf.woff") format("woff"), url("/fonts/OTF/SourceSerifPro-Semibold.otf") format("opentype"), url("/fonts/TTF/SourceSerifPro-Semibold.ttf") format("truetype"); }
src: url("/fonts/EOT/SourceSerifPro-Bold.eot") format("embedded-opentype"), url("/fonts/WOFF/OTF/SourceSerifPro-Bold.otf.woff") format("woff"), url("/fonts/OTF/SourceSerifPro-Bold.otf") format("opentype"), url("/fonts/TTF/SourceSerifPro-Bold.ttf") format("truetype"); }
@font-face {
font-family: 'Source Serif Pro';
font-weight: 700;
font-family: 'Heuristica';
font-weight: 400;
font-style: normal;
font-stretch: normal;
src: url("/fonts/EOT/SourceSerifPro-Bold.eot") format("embedded-opentype"), url("/fonts/WOFF/OTF/SourceSerifPro-Bold.otf.woff") format("woff"), url("/fonts/OTF/SourceSerifPro-Bold.otf") format("opentype"), url("/fonts/TTF/SourceSerifPro-Bold.ttf") format("truetype"); }
src: url("/fonts/WOFF/heuristica/400.woff") format("woff"), url("/fonts/OTF/Heuristica-Bold.otf") format("opentype"); }
@font-face {
font-family: 'Source Serif Pro';
font-weight: 900;
font-family: 'Heuristica';
font-weight: 400;
font-style: italic;
font-stretch: normal;
src: url("/fonts/WOFF/heristica/400i.woff") format("woff"), url("/fonts/OTF/Heuristica-Italic.otf") format("opentype"); }
@font-face {
font-family: 'Heuristica';
font-weight: 700;
font-style: normal;
font-stretch: normal;
src: url("/fonts/EOT/SourceSerifPro-Black.eot") format("embedded-opentype"), url("/fonts/WOFF/OTF/SourceSerifPro-Black.otf.woff") format("woff"), url("/fonts/OTF/SourceSerifPro-Black.otf") format("opentype"), url("/fonts/TTF/SourceSerifPro-Black.ttf") format("truetype"); }
src: url("/fonts/WOFF/heuristica/700.woff") format("woff"), url("/fonts/OTF/Heuristica-Bold.otf") format("opentype"); }
ul.badges {
display: inline-block;
......@@ -196,21 +192,22 @@ main {
.quote.single-close:after {
content: '’';
margin-left: -0.3ex; }
margin-left: -0.5ex; }
.quote.double-open:after {
content: '“';
margin-left: -0.8ex; }
margin-left: -0.9ex; }
.quote.double-close:after {
content: '”';
margin-left: -0.8ex; }
margin-left: -0.9ex; }
.quote.double-open {
margin-left: -0.6ex; }
margin-left: -0.6ex;
margin-right: 0.1ex; }
.double-push {
margin-right: 0.6ex;
margin-right: 0.7ex;
display: inline-block; }
main {
......
This diff is collapsed.
......@@ -112,16 +112,18 @@ main {
margin-left: -0.3ex; }
.quote.single-close:after { content:'’';
margin-left: -0.3ex; }
margin-left: -0.5ex; }
.quote.double-open:after { content:'“';
margin-left: -0.8ex; }
margin-left: -0.9ex; }
.quote.double-close:after { content:'”';
margin-left: -0.8ex; }
margin-left: -0.9ex; }
.quote.double-open { margin-left: -0.6ex;
margin-right: 0.1ex; }
.quote.double-open { margin-left: -0.6ex; }
.double-push {
margin-right: 0.6ex;
margin-right: 0.7ex;
display: inline-block;
}
......@@ -136,14 +136,21 @@ article {
border-bottom: 0.5rem solid transparent;
border-right: 0.8rem solid #6e6e6e;
}
ul {
margin-left: 0em;
padding-left: 1.2rem;
}
}
font-size: 1.1rem;
line-height: 1.5;
line-height: 1.45;
font-style: normal;
font-family: 'Source Serif Pro', sans-serif;
color: #111;
font-family: 'Heuristica', 'Georgia', serif;
.header {
font-family: 'Source Serif Pro', 'Georgia', serif;
font-style: italic;
font-weight: 300;
......@@ -151,6 +158,7 @@ article {
}
&.footnotes {
font-family: 'Source Serif Pro', 'Georgia', serif;
font-style: italic;
font-weight: 300;
......@@ -261,6 +269,24 @@ article {
max-width: 100%;
}
.imageblock.full img {
min-width: 65%;
}
.imageblock.pixel img {
image-rendering: optimizeSpeed; // Older versions of FF
image-rendering: -moz-crisp-edges; // FF 6.0+
image-rendering: -webkit-optimize-contrast; // Webkit (non standard naming)
image-rendering: -o-crisp-edges; // OS X & Windows Opera (12.02+)
image-rendering: crisp-edges; // Possible future browsers.
image-rendering: pixelated; // Chrome cares about this, I guess
-ms-interpolation-mode: nearest-neighbor; // IE (non standard naming)
}
.videoblock video {
max-width: 100%;
}
.imageblock .title {
font-size: 0.8rem;
font-style: italic;
......
@font-face {
font-family: 'Stalemate';
src: url('/fonts/TTF/Stalemate-Regular.ttf') format('truetype')
}
@font-face{
font-family: 'Source Serif Pro';
font-weight: 200;
font-style: normal;
font-stretch: normal;
src: url('/fonts/EOT/SourceSerifPro-ExtraLight.eot') format('embedded-opentype'),
url('/fonts/WOFF/OTF/SourceSerifPro-ExtraLight.otf.woff') format('woff'),
url('/fonts/OTF/SourceSerifPro-ExtraLight.otf') format('opentype'),
url('/fonts/TTF/SourceSerifPro-ExtraLight.ttf') format('truetype');
}
@font-face{
font-family: 'Source Serif Pro';
font-weight: 300;
......@@ -36,17 +20,6 @@
url('/fonts/TTF/SourceSerifPro-Regular.ttf') format('truetype');
}
@font-face{
font-family: 'Source Serif Pro';
font-weight: 600;
font-style: normal;
font-stretch: normal;
src: url('/fonts/EOT/SourceSerifPro-Semibold.eot') format('embedded-opentype'),
url('/fonts/WOFF/OTF/SourceSerifPro-Semibold.otf.woff') format('woff'),
url('/fonts/OTF/SourceSerifPro-Semibold.otf') format('opentype'),
url('/fonts/TTF/SourceSerifPro-Semibold.ttf') format('truetype');
}
@font-face{
font-family: 'Source Serif Pro';
font-weight: 700;
......@@ -58,13 +31,29 @@
url('/fonts/TTF/SourceSerifPro-Bold.ttf') format('truetype');
}
@font-face{
font-family: 'Source Serif Pro';
font-weight: 900;
@font-face {
font-family: 'Heuristica';
font-weight: 400;
font-style: normal;
font-stretch: normal;
src: url('/fonts/WOFF/heuristica/400.woff') format('woff'),
url('/fonts/OTF/Heuristica-Bold.otf') format('opentype');
}
@font-face {
font-family: 'Heuristica';
font-weight: 400;
font-style: italic;
font-stretch: normal;
src: url('/fonts/WOFF/heristica/400i.woff') format('woff'),
url('/fonts/OTF/Heuristica-Italic.otf') format('opentype');
}
@font-face {
font-family: 'Heuristica';
font-weight: 700;
font-style: normal;
font-stretch: normal;
src: url('/fonts/EOT/SourceSerifPro-Black.eot') format('embedded-opentype'),
url('/fonts/WOFF/OTF/SourceSerifPro-Black.otf.woff') format('woff'),
url('/fonts/OTF/SourceSerifPro-Black.otf') format('opentype'),
url('/fonts/TTF/SourceSerifPro-Black.ttf') format('truetype');
src: url('/fonts/WOFF/heuristica/700.woff') format('woff'),
url('/fonts/OTF/Heuristica-Bold.otf') format('opentype');
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment