summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2017-09-06 21:43:34 +0200
committerJonas Smedegaard <dr@jones.dk>2017-09-06 21:43:34 +0200
commit41665f97d76852981109ff3b48af85e0225db3a3 (patch)
tree30da7cced158434987b4fed8317c2dd4dd9d990e
parent2a630434548c040d9d621b077291e126f00fd68e (diff)
parent689c563f91f0ba39ba21db70014464d9f0b01b13 (diff)
Merge branch 'sass'HEADmaster
-rw-r--r--blueview/background_darkness.pngbin165 -> 165 bytes
-rw-r--r--blueview/header_background.pngbin53693 -> 53693 bytes
-rw-r--r--default/_ikiwiki.scss71
-rw-r--r--goldtype/background_darkness.pngbin165 -> 165 bytes
-rw-r--r--goldtype/header_background.pngbin196261 -> 196261 bytes
-rw-r--r--monochrome/gradient.pngbin2466 -> 2466 bytes
6 files changed, 60 insertions, 11 deletions
diff --git a/blueview/background_darkness.png b/blueview/background_darkness.png
index 0a1cb4e..154ae83 100644
--- a/blueview/background_darkness.png
+++ b/blueview/background_darkness.png
Binary files differ
diff --git a/blueview/header_background.png b/blueview/header_background.png
index 4712ffb..f5afa0e 100644
--- a/blueview/header_background.png
+++ b/blueview/header_background.png
Binary files differ
diff --git a/default/_ikiwiki.scss b/default/_ikiwiki.scss
index 02ccc9d..cf7a7cc 100644
--- a/default/_ikiwiki.scss
+++ b/default/_ikiwiki.scss
@@ -14,7 +14,7 @@ footer,header,hgroup,menu,nav,section {
}
@mixin ikiwiki-header {
-.header {
+div.header, header.header {
margin: 0;
font-size: 140%;
font-weight: bold;
@@ -684,48 +684,48 @@ li.L8 {
}
@mixin ikiwiki-plugin-openid {
-/* openid selector */
-#openid_choice {
+/* login selector */
+#login_choice {
display: none;
}
-#openid_input_area {
+#login_input_area {
clear: both;
padding: 10px;
}
-#openid_btns, #openid_btns br {
+#login_btns, #login_btns br {
clear: both;
}
-#openid_highlight {
+#login_highlight {
background-color: black;
float: left;
}
-.openid_large_btn {
+.login_large_btn {
padding: 1em 1.5em;
border: 1px solid #DDD;
margin: 3px;
float: left;
}
-.openid_small_btn {
+.login_small_btn {
padding: 4px 4px;
border: 1px solid #DDD;
margin: 3px;
float: left;
}
-a.openid_large_btn:focus {
+a.login_large_btn:focus {
outline: none;
}
-a.openid_large_btn:focus {
+a.login_large_btn:focus {
outline-style: none;
}
-.openid_selected {
+.login_selected {
border: 4px solid #DDD;
}
}
@@ -783,6 +783,53 @@ a.openid_large_btn:focus {
}
}
+@mixin ikiwiki-mobile {
+/* mobile/small-screen-friendly layout */
+@media (max-width: 600px) {
+ .sidebar {
+ width: auto;
+ float: none;
+ margin-top: 0;
+ border: none;
+ }
+
+ /* if the mobile browser is new enough, use flex layout to shuffle
+ * the sidebar to the end */
+ .page {
+ display: -webkit-box;
+ display: -webkit-flexbox;
+ display: -webkit-flex;
+ display: -moz-box;
+ display: -ms-flexbox;
+ display: flex;
+ -webkit-box-orient: vertical;
+ -webkit-flex-direction: tb;
+ -webkit-flex-direction: column;
+ -webkit-flex-flow: column;
+ -ms-flex-direction: column;
+ flex-direction: column;
+ }
+ #pageheader {
+ -webkit-box-ordinal-group: -1;
+ -webkit-order: -1;
+ -ms-box-ordinal-group: -1;
+ -ms-flex-order: -1;
+ order: -1;
+ }
+ .sidebar, #footer {
+ -webkit-box-ordinal-group: 1;
+ -webkit-order: 1;
+ -ms-box-ordinal-group: 1;
+ -ms-flex-order: 1;
+ order: 1;
+ }
+
+ .blogform, #blogform {
+ padding: 4px 4px;
+ }
+}
+}
+
// all styles in same order as original Ikiwiki stylesheet
@mixin ikiwiki-style-legacy {
@include ikiwiki-header;
@@ -826,6 +873,7 @@ a.openid_large_btn:focus {
@include ikiwiki-plugin-openid;
@include ikiwiki-plugin-attachment;
@include ikiwiki-plugin-trail;
+ @include ikiwiki-mobile;
}
@mixin ikiwiki-site {
@@ -885,6 +933,7 @@ a.openid_large_btn:focus {
@include ikiwiki-plugin-editpage;
@include ikiwiki-plugin-attachment;
@include ikiwiki-plugin-openid;
+ @include ikiwiki-mobile;
}
@mixin ikiwiki {
diff --git a/goldtype/background_darkness.png b/goldtype/background_darkness.png
index 0a1cb4e..154ae83 100644
--- a/goldtype/background_darkness.png
+++ b/goldtype/background_darkness.png
Binary files differ
diff --git a/goldtype/header_background.png b/goldtype/header_background.png
index 50b11dd..319831a 100644
--- a/goldtype/header_background.png
+++ b/goldtype/header_background.png
Binary files differ
diff --git a/monochrome/gradient.png b/monochrome/gradient.png
index 7363185..704e72a 100644
--- a/monochrome/gradient.png
+++ b/monochrome/gradient.png
Binary files differ