summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2011-02-02 21:13:27 +0100
committerJonas Smedegaard <dr@jones.dk>2011-02-02 21:13:27 +0100
commit8d40a356e5c957bb5bc7a0ffe1b1649bf5fa711f (patch)
tree573525b7b7ad50356ed848cdccdf70f827ff9d4f
parentc70a458de0bf9df76029c7522dc9a5ea48c8204f (diff)
More elegant @import of default style, and provide subsets as mixins too.
-rw-r--r--actiontabs/style.scss3
-rw-r--r--blueview/style.scss3
-rw-r--r--default/_ikiwiki.scss644
-rw-r--r--default/style.scss633
4 files changed, 650 insertions, 633 deletions
diff --git a/actiontabs/style.scss b/actiontabs/style.scss
index 0f3434e..02f08cd 100644
--- a/actiontabs/style.scss
+++ b/actiontabs/style.scss
@@ -1,4 +1,5 @@
-@import "../default/style.scss";
+@import "ikiwiki";
+@include ikiwiki;
/* actiontabs theme for ikiwiki
*
diff --git a/blueview/style.scss b/blueview/style.scss
index f4900ea..d0de394 100644
--- a/blueview/style.scss
+++ b/blueview/style.scss
@@ -1,4 +1,5 @@
-@import "../default/style.scss";
+@import "ikiwiki";
+@include ikiwiki;
/* bzed theme for ikiwiki
*
diff --git a/default/_ikiwiki.scss b/default/_ikiwiki.scss
new file mode 100644
index 0000000..43e8722
--- /dev/null
+++ b/default/_ikiwiki.scss
@@ -0,0 +1,644 @@
+@mixin ikiwiki-boilerplate {
+/* ikiwiki style sheet */
+/* Note that instead of modifying this style sheet, you can instead edit
+ * local.css and use it to override or change settings in this one.
+ */
+}
+
+@mixin ikiwiki-reset {
+/* html5 compat */
+article,
+header,
+footer,
+nav {
+ display: block;
+}
+}
+
+@mixin ikiwiki-style {
+.header {
+ margin: 0;
+ font-size: 140%;
+ font-weight: bold;
+ line-height: 1em;
+ display: block;
+}
+
+.inlineheader .author {
+ margin: 0;
+ font-size: 112%;
+ font-weight: bold;
+ display: block;
+}
+
+.actions ul {
+ margin: 0;
+ padding: 6px .4em;
+ height: 1em;
+ list-style-type: none;
+}
+
+.actions li {
+ display: inline;
+ padding: .2em;
+}
+
+.pageheader .actions ul {
+ border-bottom: 1px solid #000;
+}
+
+.inlinepage .actions ul {
+ border-bottom: 0;
+}
+
+#otherlanguages ul {
+ margin: 0;
+ padding: 6px;
+ list-style-type: none;
+}
+
+#otherlanguages li {
+ display: inline;
+ padding: .2em .4em;
+}
+
+.pageheader #otherlanguages {
+ border-bottom: 1px solid #000;
+}
+
+.inlinecontent {
+ margin-top: .4em;
+}
+
+.pagefooter,
+.inlinefooter,
+.comments {
+ clear: both;
+}
+
+#pageinfo {
+ margin: 1em 0;
+ border-top: 1px solid #000;
+}
+
+.tags {
+ margin-top: 1em;
+}
+
+.inlinepage .tags {
+ display: inline;
+}
+
+.mapparent {
+ text-decoration: none;
+}
+
+.img caption {
+ font-size: 80%;
+ caption-side: bottom;
+ text-align: center;
+}
+
+img.img {
+ margin: 0.5ex;
+}
+
+.align-left {
+ float: left;
+}
+
+.align-right {
+ float: right;
+}
+
+#backlinks {
+ margin-top: 1em;
+}
+
+#searchform {
+ display: inline;
+ float: right;
+}
+
+#editcontent {
+ width: 98%;
+}
+
+.editcontentdiv {
+ width: auto;
+ overflow: auto;
+}
+
+img {
+ border-style: none;
+}
+
+pre {
+ overflow: auto;
+}
+
+div.recentchanges {
+ border-style: solid;
+ border-width: 1px;
+ overflow: auto;
+ width: auto;
+ clear: none;
+ background: #eee;
+ color: black !important;
+}
+
+.recentchanges .metadata {
+ padding: 0px 0.5em;
+}
+
+.recentchanges .changelog {
+ font-style: italic;
+ clear: both;
+ display: block;
+ padding: 1px 2px;
+ background: white !important;
+ color: black !important;
+}
+
+.recentchanges .desc {
+ display: none;
+}
+
+.recentchanges .diff {
+ display: none;
+}
+
+.recentchanges .committer {
+ float: left;
+ margin: 0;
+ width: 40%;
+}
+
+.recentchanges .committype {
+ float: left;
+ margin: 0;
+ width: 5%;
+ font-size: small;
+}
+
+.recentchanges .changedate {
+ float: left;
+ margin: 0;
+ width: 35%;
+ font-size: small;
+}
+
+.recentchanges .pagelinks {
+ float: right;
+ margin: 0;
+ width: 60%;
+}
+
+#blogform {
+ padding: 10px 10px;
+ border: 1px solid #aaa;
+ background: #eee;
+ color: black !important;
+ width: auto;
+ overflow: auto;
+}
+
+.inlinepage {
+ padding: 10px 10px;
+ border: 1px solid #aaa;
+ overflow: auto;
+}
+
+.pagedate,
+.pagelicense,
+.pagecopyright {
+ font-style: italic;
+ display: block;
+ margin-top: 1em;
+}
+
+.error {
+ color: #C00;
+}
+
+.sidebar {
+ width: 20ex;
+ float: right;
+ margin-left: 4px;
+ margin-bottom: 4px;
+ margin-top: -1px;
+ padding: 0ex 2ex;
+ background: white;
+ border: 1px solid black;
+ color: black !important;
+}
+
+hr.poll {
+ height: 10pt;
+ color: white !important;
+ background: #eee;
+ border: 2px solid black;
+}
+
+div.poll {
+ margin-top: 1ex;
+ margin-bottom: 1ex;
+ padding: 1ex 1ex;
+ border: 1px solid #aaa;
+}
+
+span.color {
+ padding: 2px;
+}
+
+.comment-header,
+.microblog-header {
+ font-style: italic;
+ margin-top: .3em;
+}
+
+.comment .author,
+.microblog .author {
+ font-weight: bold;
+}
+
+.comment-subject {
+ font-weight: bold;
+}
+
+.comment {
+ border: 1px solid #aaa;
+ padding: 3px;
+}
+
+div.progress {
+ margin-top: 1ex;
+ margin-bottom: 1ex;
+ border: 1px solid #888;
+ width: 400px;
+ background: #eee;
+ color: black !important;
+ padding: 1px;
+}
+
+div.progress-done {
+ background: #ea6 !important;
+ color: black !important;
+ text-align: center;
+ padding: 1px;
+}
+
+/* things to hide in printouts */
+@media print {
+ .actions {
+ display: none;
+ }
+
+ .tags {
+ display: none;
+ }
+
+ .feedbutton {
+ display: none;
+ }
+
+ #searchform {
+ display: none;
+ }
+
+ #blogform {
+ display: none;
+ }
+
+ #backlinks {
+ display: none;
+ }
+}
+
+/* infobox template */
+.infobox {
+ float: right;
+ margin-left: 2ex;
+ margin-top: 1ex;
+ margin-bottom: 1ex;
+ padding: 1ex 1ex;
+ border: 1px solid #aaa;
+ background: white;
+ color: black !important;
+}
+
+/* notebox template */
+.notebox {
+ float: right;
+ margin-left: 2ex;
+ margin-top: 1ex;
+ margin-bottom: 1ex;
+ padding: 1ex 1ex;
+ border: 1px solid #aaa;
+ width: 25%;
+ background: white;
+ color: black !important;
+}
+
+/* popup template and backlinks hiding */
+.popup {
+ border-bottom: 1px dotted #366;
+ color: #366;
+}
+
+.popup .balloon,
+.popup .paren,
+.popup .expand {
+ display: none;
+}
+
+.popup:hover .balloon,
+.popup:focus .balloon {
+ position: absolute;
+ display: inline;
+ margin: 1em 0 0 -2em;
+ padding: 0.625em;
+ border: 2px solid;
+ background-color: #dee;
+ color: black;
+}
+
+/* form styling */
+fieldset {
+ margin: 1ex 0;
+ border: 1px solid black;
+}
+
+legend {
+ padding: 0 1ex;
+}
+
+.fb_submit {
+ float: left;
+ margin: 2px 0;
+}
+
+label.block {
+ display: block;
+}
+
+label.inline {
+ display: inline;
+}
+
+input#openid_identifier {
+ background: url(wikiicons/openidlogin-bg.gif) no-repeat;
+ background-color: #fff;
+ background-position: 0 50%;
+ color: #000;
+ padding-left: 18px;
+}
+
+input#searchbox {
+ background: url(wikiicons/search-bg.gif) no-repeat;
+ background-color: #fff;
+ background-position: 100% 50%;
+ color: #000;
+ padding-right: 16px;
+}
+
+/* invalid form fields */
+.fb_invalid {
+ color: red;
+ background: white !important;
+}
+
+/* required form fields */
+.fb_required {
+ font-weight: bold;
+}
+
+/* highlight plugin */
+pre.hl {
+ color: #000000;
+ background-color: #ffffff;
+}
+
+.hl.num {
+ color: #2928ff;
+}
+
+.hl.esc {
+ color: #ff00ff;
+}
+
+.hl.str {
+ color: #ff0000;
+}
+
+.hl.dstr {
+ color: #818100;
+}
+
+.hl.slc {
+ color: #838183;
+ font-style: italic;
+}
+
+.hl.com {
+ color: #838183;
+ font-style: italic;
+}
+
+.hl.dir {
+ color: #008200;
+}
+
+.hl.sym {
+ color: #000000;
+}
+
+.hl.line {
+ color: #555555;
+}
+
+.hl.mark {
+ background-color: #ffffbb;
+}
+
+.hl.kwa {
+ color: #000000;
+ font-weight: bold;
+}
+
+.hl.kwb {
+ color: #830000;
+}
+
+.hl.kwc {
+ color: #000000;
+ font-weight: bold;
+}
+
+.hl.kwd {
+ color: #010181;
+}
+
+/* calendar plugin */
+.month-calendar-day-this-day,
+.year-calendar-this-month {
+ background-color: #eee;
+}
+
+.month-calendar-day-head,
+.month-calendar-day-nolink,
+.month-calendar-day-link,
+.month-calendar-day-this-day,
+.month-calendar-day-future {
+ text-align: right;
+}
+
+.month-calendar-arrow A:link,
+.year-calendar-arrow A:link,
+.month-calendar-arrow A:visited,
+.year-calendar-arrow A:visited {
+ text-decoration: none;
+ font-weight: normal;
+ font-size: 150%;
+}
+
+/* outlines */
+li.L1 {
+ list-style: upper-roman;
+}
+
+li.L2 {
+ list-style: decimal;
+}
+
+li.L3 {
+ list-style: lower-alpha;
+}
+
+li.L4 {
+ list-style: disc;
+}
+
+li.L5 {
+ list-style: square;
+}
+
+li.L6 {
+ list-style: circle;
+}
+
+li.L7 {
+ list-style: lower-roman;
+}
+
+li.L8 {
+ list-style: upper-alpha;
+}
+
+/* tag cloud */
+.pagecloud {
+ float: right;
+ width: 30%;
+ text-align: center;
+ padding: 10px 10px;
+ border: 1px solid #aaa;
+ background: #eee;
+ color: black !important;
+}
+
+.smallestPC {
+ font-size: 70%;
+}
+
+.smallPC {
+ font-size: 85%;
+}
+
+.normalPC {
+ font-size: 100%;
+}
+
+.bigPC {
+ font-size: 115%;
+}
+
+.biggestPC {
+ font-size: 130%;
+}
+
+/* orange feed button */
+.feedbutton {
+ background: #ff6600;
+ color: white !important;
+ border-left: 1px solid #cc9966;
+ border-top: 1px solid #ccaa99;
+ border-right: 1px solid #993300;
+ border-bottom: 1px solid #331100;
+ padding: 0px 0.5em 0px 0.5em;
+ font-family: sans-serif;
+ font-weight: bold;
+ font-size: small;
+ text-decoration: none;
+ margin-top: 1em;
+}
+
+.feedbutton:hover {
+ color: white !important;
+ background: #ff9900;
+}
+
+.FlattrButton {
+ display: none;
+}
+
+/* openid selector */
+#openid_choice {
+ display: none;
+}
+
+#openid_input_area {
+ clear: both;
+ padding: 10px;
+}
+
+#openid_btns, #openid_btns br {
+ clear: both;
+}
+
+#openid_highlight {
+ background-color: black;
+ float: left;
+}
+
+.openid_large_btn {
+ padding: 1em 1.5em;
+ border: 1px solid #DDD;
+ margin: 3px;
+ float: left;
+}
+
+.openid_small_btn {
+ padding: 4px 4px;
+ border: 1px solid #DDD;
+ margin: 3px;
+ float: left;
+}
+
+a.openid_large_btn:focus {
+ outline: none;
+}
+
+a.openid_large_btn:focus {
+ -moz-outline-style: none;
+}
+
+.openid_selected {
+ border: 4px solid #DDD;
+}
+}
+
+@mixin ikiwiki {
+ @include ikiwiki-boilerplate;
+ @include ikiwiki-reset;
+ @include ikiwiki-style;
+}
diff --git a/default/style.scss b/default/style.scss
index 53c417c..a23d692 100644
--- a/default/style.scss
+++ b/default/style.scss
@@ -1,631 +1,2 @@
-/* ikiwiki style sheet */
-/* Note that instead of modifying this style sheet, you can instead edit
- * local.css and use it to override or change settings in this one.
- */
-/* html5 compat */
-article,
-header,
-footer,
-nav {
- display: block;
-}
-
-.header {
- margin: 0;
- font-size: 140%;
- font-weight: bold;
- line-height: 1em;
- display: block;
-}
-
-.inlineheader .author {
- margin: 0;
- font-size: 112%;
- font-weight: bold;
- display: block;
-}
-
-.actions ul {
- margin: 0;
- padding: 6px .4em;
- height: 1em;
- list-style-type: none;
-}
-
-.actions li {
- display: inline;
- padding: .2em;
-}
-
-.pageheader .actions ul {
- border-bottom: 1px solid #000;
-}
-
-.inlinepage .actions ul {
- border-bottom: 0;
-}
-
-#otherlanguages ul {
- margin: 0;
- padding: 6px;
- list-style-type: none;
-}
-
-#otherlanguages li {
- display: inline;
- padding: .2em .4em;
-}
-
-.pageheader #otherlanguages {
- border-bottom: 1px solid #000;
-}
-
-.inlinecontent {
- margin-top: .4em;
-}
-
-.pagefooter,
-.inlinefooter,
-.comments {
- clear: both;
-}
-
-#pageinfo {
- margin: 1em 0;
- border-top: 1px solid #000;
-}
-
-.tags {
- margin-top: 1em;
-}
-
-.inlinepage .tags {
- display: inline;
-}
-
-.mapparent {
- text-decoration: none;
-}
-
-.img caption {
- font-size: 80%;
- caption-side: bottom;
- text-align: center;
-}
-
-img.img {
- margin: 0.5ex;
-}
-
-.align-left {
- float: left;
-}
-
-.align-right {
- float: right;
-}
-
-#backlinks {
- margin-top: 1em;
-}
-
-#searchform {
- display: inline;
- float: right;
-}
-
-#editcontent {
- width: 98%;
-}
-
-.editcontentdiv {
- width: auto;
- overflow: auto;
-}
-
-img {
- border-style: none;
-}
-
-pre {
- overflow: auto;
-}
-
-div.recentchanges {
- border-style: solid;
- border-width: 1px;
- overflow: auto;
- width: auto;
- clear: none;
- background: #eee;
- color: black !important;
-}
-
-.recentchanges .metadata {
- padding: 0px 0.5em;
-}
-
-.recentchanges .changelog {
- font-style: italic;
- clear: both;
- display: block;
- padding: 1px 2px;
- background: white !important;
- color: black !important;
-}
-
-.recentchanges .desc {
- display: none;
-}
-
-.recentchanges .diff {
- display: none;
-}
-
-.recentchanges .committer {
- float: left;
- margin: 0;
- width: 40%;
-}
-
-.recentchanges .committype {
- float: left;
- margin: 0;
- width: 5%;
- font-size: small;
-}
-
-.recentchanges .changedate {
- float: left;
- margin: 0;
- width: 35%;
- font-size: small;
-}
-
-.recentchanges .pagelinks {
- float: right;
- margin: 0;
- width: 60%;
-}
-
-#blogform {
- padding: 10px 10px;
- border: 1px solid #aaa;
- background: #eee;
- color: black !important;
- width: auto;
- overflow: auto;
-}
-
-.inlinepage {
- padding: 10px 10px;
- border: 1px solid #aaa;
- overflow: auto;
-}
-
-.pagedate,
-.pagelicense,
-.pagecopyright {
- font-style: italic;
- display: block;
- margin-top: 1em;
-}
-
-.error {
- color: #C00;
-}
-
-.sidebar {
- width: 20ex;
- float: right;
- margin-left: 4px;
- margin-bottom: 4px;
- margin-top: -1px;
- padding: 0ex 2ex;
- background: white;
- border: 1px solid black;
- color: black !important;
-}
-
-hr.poll {
- height: 10pt;
- color: white !important;
- background: #eee;
- border: 2px solid black;
-}
-
-div.poll {
- margin-top: 1ex;
- margin-bottom: 1ex;
- padding: 1ex 1ex;
- border: 1px solid #aaa;
-}
-
-span.color {
- padding: 2px;
-}
-
-.comment-header,
-.microblog-header {
- font-style: italic;
- margin-top: .3em;
-}
-
-.comment .author,
-.microblog .author {
- font-weight: bold;
-}
-
-.comment-subject {
- font-weight: bold;
-}
-
-.comment {
- border: 1px solid #aaa;
- padding: 3px;
-}
-
-div.progress {
- margin-top: 1ex;
- margin-bottom: 1ex;
- border: 1px solid #888;
- width: 400px;
- background: #eee;
- color: black !important;
- padding: 1px;
-}
-
-div.progress-done {
- background: #ea6 !important;
- color: black !important;
- text-align: center;
- padding: 1px;
-}
-
-/* things to hide in printouts */
-@media print {
- .actions {
- display: none;
- }
-
- .tags {
- display: none;
- }
-
- .feedbutton {
- display: none;
- }
-
- #searchform {
- display: none;
- }
-
- #blogform {
- display: none;
- }
-
- #backlinks {
- display: none;
- }
-}
-
-/* infobox template */
-.infobox {
- float: right;
- margin-left: 2ex;
- margin-top: 1ex;
- margin-bottom: 1ex;
- padding: 1ex 1ex;
- border: 1px solid #aaa;
- background: white;
- color: black !important;
-}
-
-/* notebox template */
-.notebox {
- float: right;
- margin-left: 2ex;
- margin-top: 1ex;
- margin-bottom: 1ex;
- padding: 1ex 1ex;
- border: 1px solid #aaa;
- width: 25%;
- background: white;
- color: black !important;
-}
-
-/* popup template and backlinks hiding */
-.popup {
- border-bottom: 1px dotted #366;
- color: #366;
-}
-
-.popup .balloon,
-.popup .paren,
-.popup .expand {
- display: none;
-}
-
-.popup:hover .balloon,
-.popup:focus .balloon {
- position: absolute;
- display: inline;
- margin: 1em 0 0 -2em;
- padding: 0.625em;
- border: 2px solid;
- background-color: #dee;
- color: black;
-}
-
-/* form styling */
-fieldset {
- margin: 1ex 0;
- border: 1px solid black;
-}
-
-legend {
- padding: 0 1ex;
-}
-
-.fb_submit {
- float: left;
- margin: 2px 0;
-}
-
-label.block {
- display: block;
-}
-
-label.inline {
- display: inline;
-}
-
-input#openid_identifier {
- background: url(wikiicons/openidlogin-bg.gif) no-repeat;
- background-color: #fff;
- background-position: 0 50%;
- color: #000;
- padding-left: 18px;
-}
-
-input#searchbox {
- background: url(wikiicons/search-bg.gif) no-repeat;
- background-color: #fff;
- background-position: 100% 50%;
- color: #000;
- padding-right: 16px;
-}
-
-/* invalid form fields */
-.fb_invalid {
- color: red;
- background: white !important;
-}
-
-/* required form fields */
-.fb_required {
- font-weight: bold;
-}
-
-/* highlight plugin */
-pre.hl {
- color: #000000;
- background-color: #ffffff;
-}
-
-.hl.num {
- color: #2928ff;
-}
-
-.hl.esc {
- color: #ff00ff;
-}
-
-.hl.str {
- color: #ff0000;
-}
-
-.hl.dstr {
- color: #818100;
-}
-
-.hl.slc {
- color: #838183;
- font-style: italic;
-}
-
-.hl.com {
- color: #838183;
- font-style: italic;
-}
-
-.hl.dir {
- color: #008200;
-}
-
-.hl.sym {
- color: #000000;
-}
-
-.hl.line {
- color: #555555;
-}
-
-.hl.mark {
- background-color: #ffffbb;
-}
-
-.hl.kwa {
- color: #000000;
- font-weight: bold;
-}
-
-.hl.kwb {
- color: #830000;
-}
-
-.hl.kwc {
- color: #000000;
- font-weight: bold;
-}
-
-.hl.kwd {
- color: #010181;
-}
-
-/* calendar plugin */
-.month-calendar-day-this-day,
-.year-calendar-this-month {
- background-color: #eee;
-}
-
-.month-calendar-day-head,
-.month-calendar-day-nolink,
-.month-calendar-day-link,
-.month-calendar-day-this-day,
-.month-calendar-day-future {
- text-align: right;
-}
-
-.month-calendar-arrow A:link,
-.year-calendar-arrow A:link,
-.month-calendar-arrow A:visited,
-.year-calendar-arrow A:visited {
- text-decoration: none;
- font-weight: normal;
- font-size: 150%;
-}
-
-/* outlines */
-li.L1 {
- list-style: upper-roman;
-}
-
-li.L2 {
- list-style: decimal;
-}
-
-li.L3 {
- list-style: lower-alpha;
-}
-
-li.L4 {
- list-style: disc;
-}
-
-li.L5 {
- list-style: square;
-}
-
-li.L6 {
- list-style: circle;
-}
-
-li.L7 {
- list-style: lower-roman;
-}
-
-li.L8 {
- list-style: upper-alpha;
-}
-
-/* tag cloud */
-.pagecloud {
- float: right;
- width: 30%;
- text-align: center;
- padding: 10px 10px;
- border: 1px solid #aaa;
- background: #eee;
- color: black !important;
-}
-
-.smallestPC {
- font-size: 70%;
-}
-
-.smallPC {
- font-size: 85%;
-}
-
-.normalPC {
- font-size: 100%;
-}
-
-.bigPC {
- font-size: 115%;
-}
-
-.biggestPC {
- font-size: 130%;
-}
-
-/* orange feed button */
-.feedbutton {
- background: #ff6600;
- color: white !important;
- border-left: 1px solid #cc9966;
- border-top: 1px solid #ccaa99;
- border-right: 1px solid #993300;
- border-bottom: 1px solid #331100;
- padding: 0px 0.5em 0px 0.5em;
- font-family: sans-serif;
- font-weight: bold;
- font-size: small;
- text-decoration: none;
- margin-top: 1em;
-}
-
-.feedbutton:hover {
- color: white !important;
- background: #ff9900;
-}
-
-.FlattrButton {
- display: none;
-}
-
-/* openid selector */
-#openid_choice {
- display: none;
-}
-
-#openid_input_area {
- clear: both;
- padding: 10px;
-}
-
-#openid_btns, #openid_btns br {
- clear: both;
-}
-
-#openid_highlight {
- background-color: black;
- float: left;
-}
-
-.openid_large_btn {
- padding: 1em 1.5em;
- border: 1px solid #DDD;
- margin: 3px;
- float: left;
-}
-
-.openid_small_btn {
- padding: 4px 4px;
- border: 1px solid #DDD;
- margin: 3px;
- float: left;
-}
-
-a.openid_large_btn:focus {
- outline: none;
-}
-
-a.openid_large_btn:focus {
- -moz-outline-style: none;
-}
-
-.openid_selected {
- border: 4px solid #DDD;
-}
+@import "ikiwiki";
+@include ikiwiki;