Merge "Improved tutorial and introduced translation by Susanne"
diff --git a/dev/demo/all.html b/dev/demo/all.html
index eb78dc4..ba08738 100644
--- a/dev/demo/all.html
+++ b/dev/demo/all.html
@@ -256,10 +256,8 @@
</script>
<script>//<![CDATA[
KorAP.Notifications = [];
-/*
KorAP.Notifications.push(["warn","767: Case insensitivity is currently not supported for this layer"]);
KorAP.Notifications.push(["error","404: Not Found (remote)"]);
-*/
//]]>
</script>
</body>
diff --git a/dev/scss/main/main.scss b/dev/scss/main/main.scss
index 570ed06..cea5a0b 100644
--- a/dev/scss/main/main.scss
+++ b/dev/scss/main/main.scss
@@ -11,7 +11,7 @@
@import "alertify";
div.intro {
- min-width: 600px;
+ // min-width: 600px;
// Visited links
a:visited {
diff --git a/dev/scss/media.scss b/dev/scss/media.scss
index 0155462..45304d1 100644
--- a/dev/scss/media.scss
+++ b/dev/scss/media.scss
@@ -8,7 +8,8 @@
$standard-margin: 4px;
-@media (orientation: portrait), (max-width: 42.5em) {
+// (orientation: portrait),
+@media all and (max-width: 42.5em) {
body,
#search ol,
header,
@@ -117,15 +118,18 @@
&:not(:focus):not(.active) {
margin-left: -1 * $logo-left-distance;
&::after {
- font-size: 12pt;
- width: 10pt;
- height: 11pt;
+ font-size: 12pt;
+ width: 10pt;
+ height: 11pt;
}
}
ul {
font-size: 9pt;
line-height: 1em;
}
+ &.active + main div.intro {
+ margin-left: $standard-margin !important;
+ }
}
#tutorial {
diff --git a/dev/scss/sidebar/sidebar.scss b/dev/scss/sidebar/sidebar.scss
index 9ac6b5f..bb5df9f 100644
--- a/dev/scss/sidebar/sidebar.scss
+++ b/dev/scss/sidebar/sidebar.scss
@@ -10,7 +10,7 @@
display: block;
background-color: $dark-green;
position: fixed;
- z-index: 7100;
+ z-index: 4000; // Needs to be behind alerts
color: $nearly-white;
width: $logo-left-distance;
top: 0;