Commit aae4e056 authored by Henrik Tramberend's avatar Henrik Tramberend
Browse files

Fix a merge conflict in decker.scss

parents 168173c3 84127b2d
/////////////////////////////////////////////
// Font imports
/////////////////////////////////////////////
@import url("fonts/roboto.css");
@import url("fonts/source-code-pro.css");
/////////////////////////////////////////////
// Variables
/////////////////////////////////////////////
......@@ -9,17 +15,28 @@ $small-font-size: 0.8 * $base-font-size;
$large-font-size: 1.2 * $base-font-size;
$x-large-font-size: 1.4 * $base-font-size;
$xx-large-font-size: 1.6 * $base-font-size;
$base-spacer: 1em;
/////////////////////////////////////////////
// Font imports
// Helper Functions
/////////////////////////////////////////////
@import url("fonts/roboto.css");
@import url("fonts/source-code-pro.css");
@function space($sizes: ()) {
$multiplied: ();
@each $size in $sizes {
$multiplied: append($multiplied, $size * $base-spacer)
}
@return $multiplied
}
/////////////////////////////////////////////
// Styles
/////////////////////////////////////////////
body {
background: white;
-webkit-print-color-adjust: exact; // No standard: https://developer.mozilla.org/de/docs/Web/CSS/-webkit-print-color-adjust
.reveal {
.slides {
/////////////////////////////////////////////
......@@ -37,11 +54,10 @@ body {
line-height: 1.4;
text-align: left;
font-weight: inherit;
padding: 0;
padding: space(0);
p {
margin: 20px 0;
line-height: 1.3;
margin: space(1 0);
}
/////////////////////////////////////////////
......@@ -53,10 +69,8 @@ body {
h4,
h5,
h6 {
margin: 0 0 20px 0;
color: rgba(0, 0, 0, 0.87);
font-family: 'Roboto', sans-serif;
line-height: 1.3;
letter-spacing: normal;
text-transform: none;
text-shadow: none;
......@@ -66,7 +80,7 @@ body {
h1 {
font-size: 1.6em;
margin: 0 0 0.5em 0;
margin: space(0 0 0.5 0);
}
.rightcolumn {
......@@ -79,6 +93,7 @@ body {
font-weight: 500;
color: rgba(0, 0, 0, 0.54);
font-size: 1.2em;
margin-bottom: space(0.1);
}
&.has-dark-background,
......@@ -127,7 +142,7 @@ body {
}
dd {
margin-left: 40px;
margin-left: space(1)
}
q,
......@@ -139,8 +154,8 @@ body {
display: block;
position: relative;
width: 70%;
margin: 20px auto;
padding: 5px;
margin: space(1) auto;
padding: space(0.25);
font-style: italic;
background: rgba(255, 255, 255, 0.05);
box-shadow: 0 0 2px rgba(0, 0, 0, 0.2);
......@@ -165,7 +180,7 @@ body {
ul {
display: inline-block;
text-align: left;
margin: 0 0 0 1em;
margin: space(0 0 0 1);
}
ol {
......@@ -176,10 +191,10 @@ body {
list-style-type: disc;
ul {
list-style-type: square;
list-style-type: disc;
ul {
list-style-type: circle;
list-style-type: disc;
}
}
}
......@@ -189,7 +204,8 @@ body {
ol ol,
ol ul {
display: block;
margin-left: 40px;
//margin-left: 40px;
margin-left: space(1)
}
/////////////////////////////////////////////
......@@ -221,18 +237,86 @@ body {
}
}
/////////////////////////////////////////////
// Column settings
/////////////////////////////////////////////
// For `{layout="columns"}`-Syntax
// Case: All columns vertically centered
&.mid {
div {
&.multi-column-row {
align-items: center;
}
}
}
/////////////////////////////////////////////
// Within section divs
/////////////////////////////////////////////
div {
/////////////////////////////////////////////
// Column settings
/////////////////////////////////////////////
// For `{.split}`-Syntax
&.css-columns {
column-count: 2;
column-gap: 2em;
column-rule-style: none;
padding-left: 0.7em;
margin-left: -0.7em;
}
&.box {
break-inside: avoid-column;
}
// For `{layout="columns"}`-Syntax
&.multi-column-row {
display:flex;
flex-flow: row nowrap;
div {
&.column {
$margin-size: space(1);
position: relative;
flex: 1 1 0;
margin-left: $margin-size;
margin-right: $margin-size;
&:first-child {
margin-left: 0;
margin-right: $margin-size;
}
&:last-child {
margin-left: $margin-size;
margin-right: 0;
}
.mid {
position: absolute;
top: 50%;
transform: translate(0, -50%);
}
@for $i from 1 through 9 {
&[grow="#{$i}"] {
flex-grow: $i;
}
}
}
}
}
/////////////////////////////////////////////
// Boxes
/////////////////////////////////////////////
&.box {
h2 {
margin-top: 0;
margin-bottom: 0.2em;
&:last-child, &:empty {
margin-bottom: 0;
......@@ -243,17 +327,37 @@ body {
margin: 0;
}
padding: 0.4em 0.7em;
margin: 0 -0.7em 0.5em -0.7em;
padding: space(0.4 0.7);
margin: space(0 -0.7);
border-radius: 0.25em;
&.slide-column div {
margin-top: 0;
margin-bottom: 0.3em;
&:first-child {
margin-top: 0;
&.question,
&.answer,
&.observation,
&.example,
&.def,
&.definition,
&.note,
&.ale,
&.alert,
&.equ,
&.equation,
&.theorem {
& + .question,
& + .answer,
& + .observation,
& + .example,
& + .def,
& + .definition,
& + .note,
& + .ale,
& + .alert,
& + .equ,
& + .equation,
& + .theorem {
margin-top: space(0.3);
}
}
&.question {
......@@ -272,7 +376,8 @@ body {
background-color: rgba(176, 197, 222, 0.4);
}
&.def, &.definition {
&.def,
&.definition {
background-color: rgba(245, 222, 179, 0.6);
}
......@@ -280,11 +385,13 @@ body {
background-color: rgba(244, 164, 96, 0.4);
}
&.ale, &.alert {
&.ale,
&.alert {
background-color: rgba(255, 99, 71, 0.4);
}
&.equ, &.equation {
&.equ,
&.equation {
background-color: rgb(235, 235, 235);
}
......@@ -344,7 +451,7 @@ body {
/////////////////////////////////////////////
// Video
/////////////////////////////////////////////
/* iframe resizing, see: https://css-tricks.com/NetMag/FluidWidthVideo/Article-FluidWidthVideo.php */
// iframe resizing, see: https://css-tricks.com/NetMag/FluidWidthVideo/Article-FluidWidthVideo.php
&.videoWrapper {
position: relative;
padding-bottom: 56.25%; /* 16:9 */
......@@ -367,11 +474,6 @@ body {
width: 100%;
display: block;
text-align: center;
.MathJax_Display {
margin-top: 1em;
margin-bottom: 1em;
}
}
}
......@@ -425,8 +527,8 @@ body {
// Source code
/////////////////////////////////////////////
div.sourceCode {
margin: 0 -0.7em;
padding: 0.4em 0.7em;
margin: space(0 -0.7);
padding: space(0.4 0.7);
background: rgba(0, 0, 0, 0.03);
border-radius: 0.25em;
......@@ -454,14 +556,25 @@ body {
// Special case: source code inside highlighted box
div.box {
&.question, &.answer, &.observation, &.example, &.def, &.definition, &.note, &.ale, &.alert, &.equ, &.equation, &.theorem {
&.question,
&.answer,
&.observation,
&.example,
&.def,
&.definition,
&.note,
&.ale,
&.alert,
&.equ,
&.equation,
&.theorem {
div.sourceCode {
margin: 0;
background: rgba(255, 255, 255, 0.4);
padding: 0 0.2em;
padding: space(0 0.2);
pre {
margin: 0.2em 0;
margin: 0;
}
}
}
......@@ -475,7 +588,7 @@ body {
overflow-y: scroll;
div {
margin-bottom: 0.5em;
margin-bottom: space(0.5);
}
}
......@@ -494,7 +607,7 @@ body {
th,
td {
text-align: left;
padding: 0.2em 0.5em 0.2em 0.5em;
padding: space(0.2 0.5);
border-bottom: 1px solid;
}
......@@ -512,6 +625,77 @@ body {
border-bottom: none;
}
}
/////////////////////////////////////////////
// Dense layouts
/////////////////////////////////////////////
&.dense, &.x-dense, &.xx-dense {
&.x-dense {
font-size: 90%;
}
&.xx-dense {
font-size: 80%;
}
line-height: 1.4;
p {
margin: space(0.2 0);
}
h1 {
margin: space(0 0 0.2 0);
}
div {
&.sourceCode {
margin: space(0 -0.7);
padding: space(0.4 0.7);
}
&.box {
h2 {
margin-bottom: space(0.1);
}
padding: space(0.2 0.7);
margin: space(0 -0.7);
&.question,
&.answer,
&.observation,
&.example,
&.def,
&.definition,
&.note,
&.ale,
&.alert,
&.equ,
&.equation,
&.theorem {
div.sourceCode {
pre {
line-height: 0;
}
}
}
}
}
.references {
div {
margin-bottom: space(0.2);
}
}
table {
td {
padding: space(0.1 0.5);
}
}
}
}
}
......@@ -587,12 +771,12 @@ body {
h6 {
color: #FFF;
font-weight: bold;
margin-bottom: 0.2em;
margin-bottom: space(0.2);
}
h1 {
text-decoration: underline;
margin-bottom: 0.4em;
margin-bottom: space(0.4);
}
}
......@@ -631,11 +815,11 @@ body {
// Slide numbers
/////////////////////////////////////////////
.slide-number {
width: 100%;
text-align: center;
background: transparent;
color: gray;
font-size: 0.4em;
width: 100%;
text-align: center;
background: transparent;
color: gray;
font-size: 0.4em;
}
}
......@@ -648,3 +832,20 @@ body {
text-shadow: none;
}
}
/////////////////////////////////////////////
// Print modifications
/////////////////////////////////////////////
@media print {
body {
.reveal {
.slides {
transform: none !important;
}
}
a:link:after {
content: " (" attr(href) ") ";
}
}
}
......@@ -100,7 +100,7 @@ programs =
["--style", "nested"]
["-v"]
(helpText
"Decktape PDF exporter (https://github.com/astefanutti/decktape)"))
"LibSass wrapper (https://github.com/sass/sassc)"))
]
type Program = ([String] -> Action ())
......
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