Commit 6cda29fa authored by Henrik Tramberend's avatar Henrik Tramberend
Browse files

Fix the last cursed merge of master

I identified three files that have changes that should probabaly not be
there:

1. resource/support/css/engine.css
2. resource/support/css/mario-page.css
3. resource/support/css/mario.css

Changes to 2 and 3 seem to come from commits that henrik seems to have
made unintentionally 5-7 month ago by reformatting the files while
looking at them. At at a few lines, some changes during fiddling seem to
have survived into the commit. These changes, for some reason always win
against the tip of mario branch, during merge (recursive ad resolve) or
rebase. To fix this, I merged and afterwards restored the files from the
revision just before the merge.
parent c390b400
......@@ -165,7 +165,7 @@ div.q-panel div.q-header button.q-check {
background-color: rgba(0, 0, 0, 0);
border: none;
/* border-radius: var(--border-radius); */
border-radius: var(--border-radius);
outline: none;
}
......@@ -192,7 +192,7 @@ div.q-panel div.q-header button.q-close {
background-color: rgba(0, 0, 0, 0);
border: none;
/* border-radius: var(--border-radius); */
border-radius: var(--border-radius);
outline: none;
}
......
@import url("../fonts/lato.css");
:root {
--dark-green:#639a00;
--light-green:#84b819;
--dark-grey:#616161;
--emphColor: var(--dark-green);
--whiteboard-active-color: var(--light-green);
--blue: #2a9ddf;
--light-blue: #30B3FF;
}
/* repeat light mode settings from light.css to override
......@@ -47,7 +44,7 @@ body {
}
header {
background: var(--dark-green);
background: var(--blue);
text-align: center;
}
......@@ -60,9 +57,9 @@ header > h1 {
}
a {
color: var(--dark-green);
color: var(--blue);
}
a:hover {
color: var(--light-green);
}
\ No newline at end of file
color: var(--light-blue);
}
......@@ -9,8 +9,10 @@
@import url("../vendor/fontawesome/css/all.css");
:root {
--emphColor: #2a9ddf;
--whiteboard-active-color: #2a9ddf;
--blue: #2a9ddf;
--light-blue: #30B3FF;
--emphColor: var(--blue);
--whiteboard-active-color: var(--blue);
}
......@@ -178,16 +180,17 @@ body {
*********************************************/
.reveal p {
margin: 10px 0;
line-height: 1.3; }
line-height: 1.3;
}
/* MARIO: do not completely remove empty paragraphs with display:none.
* Instead let them cause a line break, but not eat up more space */
.reveal p:empty {
display: block;
margin: 0;
padding: 0;
height: 0;
width: auto;
display: block;
margin: 0;
padding: 0;
height: 0;
width: auto;
}
.reveal strong {
......@@ -195,12 +198,12 @@ body {
}
.reveal .boldblue {
font-weight: bold;
color: var(--emphColor);
font-weight: bold;
color: var(--emphColor);
}
.reveal b {
font-weight: bold; }
font-weight: bold; }
.reveal em {
font-style: italic; }
......@@ -232,11 +235,11 @@ body {
.reveal ul ul,
.reveal ol ul {
list-style-type: circle;
list-style-type: circle;
}
.reveal ol ol {
list-style-type: lower-roman;
list-style-type: lower-roman;
}
.reveal ul ul ul,
......@@ -247,28 +250,31 @@ body {
.reveal ol ul ol,
.reveal ol ol ul,
.reveal ol ol ol {
font-size: 0.9em;
font-size: 0.9em;
}
.reveal ul ul,
.reveal ul ol,
.reveal ol ol,
.reveal ol ul {
display: block;
margin-top: 0.3em;
font-size: 0.8em;
margin-left: 10px;
display: block;
margin-top: 0.3em;
font-size: 0.8em;
margin-left: 10px;
}
.reveal dt {
font-weight: bold; }
font-weight: bold;
}
.reveal dd {
margin-left: 40px; }
margin-left: 40px;
}
.reveal q,
.reveal blockquote {
quotes: none; }
quotes: none;
}
.reveal blockquote {
display: block;
......@@ -280,14 +286,17 @@ body {
padding: 0px 15px;
font-style: italic;
background: rgba(255, 255, 255, 0.05);
box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.2); }
box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.2);
}
.reveal blockquote p:first-child,
.reveal blockquote p:last-child {
display: inline-block; }
display: inline-block;
}
.reveal q {
font-style: italic; }
font-style: italic;
}
/*********************************************
......@@ -456,14 +465,14 @@ body {
* LINKS
*********************************************/
.reveal a {
color: #2a9ddf;
color: var(--blue);
text-decoration: none;
-webkit-transition: color .15s ease;
-moz-transition: color .15s ease;
transition: color .15s ease; }
.reveal a:hover {
color: #2a9ddf;
color: var(--light-blue);
text-shadow: none;
border: none; }
......@@ -477,32 +486,31 @@ body {
.reveal img,
.reveal video {
display: inline-block;
/* remove the following two lines to get sizing of
* rendered code block sizing working */
/*width: auto;*/
/*height: auto;*/
object-fit: contain;
max-width: 100%;
max-height: 100%;
vertical-align: middle;
margin: 0px;
border: 0px;
box-shadow: none;
display: inline-block;
/* remove the following two lines to get sizing of
* rendered code block sizing working */
/*width: auto;*/
/*height: auto;*/
object-fit: contain;
max-width: 100%;
max-height: 100%;
vertical-align: middle;
margin: 0px;
border: 0px;
box-shadow: none;
}
.reveal iframe {
border: 1px solid lightgray;
outline: none;
overflow: hidden;
max-width: 100%;
max-height: 100%;
vertical-align: middle;
border: 1px solid lightgray;
outline: none;
overflow: hidden;
max-width: 100%;
max-height: 100%;
vertical-align: middle;
}
.reveal figure {
display: inline-block;
/*vertical-align: middle;*/
display: inline-block;
}
.reveal figure.streaming,
......@@ -944,12 +952,11 @@ span.decker.svg.embed {
top: calc(var(--whiteboard-icon-size) * 0.25);
bottom: auto;
right: auto;
padding: 0;
padding: calc(var(--whiteboard-icon-size) * 0.5);
margin: auto;
z-index: 40;
background: none;
font-size: var(--whiteboard-icon-size);
padding: calc(var(--whiteboard-icon-size) * 0.5);
opacity: 0.5;
color: var(--whiteboard-inactive-color);
}
......@@ -1078,8 +1085,7 @@ div.q-panel {
}
/* tool tip */
.reveal .quiz ul li ul li,
.reveal .quiz .tip {
.reveal .quiz ul li ul li {
display: block;
visibility: hidden;
max-width: 95%;
......@@ -1109,11 +1115,9 @@ div.q-panel {
border: 3px solid green;
}
/* before being clicked, tool tips are hidden */
/* tool tips are shown on hover */
.reveal .show-right:hover ul li,
.reveal .show-wrong:hover ul li,
.reveal .show-wrong:hover .tip,
.reveal .show-right:hover .tip {
.reveal .show-wrong:hover ul li {
visibility: visible;
}
......@@ -1547,4 +1551,4 @@ div.q-panel {
.reveal .quiz-mc [class*="show-"]:hover .tooltip,
.reveal .qmc [class*="show-"]:hover .tooltip {
visibility: visible;
}
}
\ No newline at end of file
Supports Markdown
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