From e8e5221c8fef184d755602564343787c9e3196d9 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Wed, 31 Jul 2013 11:56:08 +0100
Subject: [PATCH] switched to LESS variables in rest of template's css files
---
lib/tpl/dokuwiki/css/_admin.css | 2 +-
lib/tpl/dokuwiki/css/_diff.css | 2 +-
lib/tpl/dokuwiki/css/_edit.css | 12 +++----
lib/tpl/dokuwiki/css/_fileuploader.css | 8 ++---
lib/tpl/dokuwiki/css/_footnotes.css | 2 +-
lib/tpl/dokuwiki/css/_forms.css | 2 +-
lib/tpl/dokuwiki/css/_media_fullscreen.css | 40 +++++++++++-----------
lib/tpl/dokuwiki/css/_media_popup.css | 12 +++----
lib/tpl/dokuwiki/css/_modal.css | 10 +++---
lib/tpl/dokuwiki/css/_search.css | 6 ++--
lib/tpl/dokuwiki/css/_tabs.css | 14 ++++----
lib/tpl/dokuwiki/css/_toc.css | 2 +-
lib/tpl/dokuwiki/css/pagetools.less | 10 +++---
lib/tpl/dokuwiki/style.ini | 32 ++++++++---------
14 files changed, 77 insertions(+), 77 deletions(-)
diff --git a/lib/tpl/dokuwiki/css/_admin.css b/lib/tpl/dokuwiki/css/_admin.css
index c8f3694b5..a9518d0ed 100644
--- a/lib/tpl/dokuwiki/css/_admin.css
+++ b/lib/tpl/dokuwiki/css/_admin.css
@@ -50,7 +50,7 @@
.dokuwiki #admin__version {
clear: left;
float: right;
- color: __text_neu__;
+ color: @ini_text_neu;
background-color: inherit;
}
[dir=rtl] .dokuwiki #admin__version {
diff --git a/lib/tpl/dokuwiki/css/_diff.css b/lib/tpl/dokuwiki/css/_diff.css
index 58c24b5c7..b7c82d829 100644
--- a/lib/tpl/dokuwiki/css/_diff.css
+++ b/lib/tpl/dokuwiki/css/_diff.css
@@ -19,7 +19,7 @@
/* table header */
.dokuwiki table.diff th {
- border-bottom: 1px solid __border__;
+ border-bottom: 1px solid @ini_border;
font-size: 110%;
font-weight: normal;
}
diff --git a/lib/tpl/dokuwiki/css/_edit.css b/lib/tpl/dokuwiki/css/_edit.css
index 92ce62126..f40aaa891 100644
--- a/lib/tpl/dokuwiki/css/_edit.css
+++ b/lib/tpl/dokuwiki/css/_edit.css
@@ -16,7 +16,7 @@
}
#draft__status {
float: right;
- color: __text_alt__;
+ color: @ini_text_alt;
background-color: inherit;
}
[dir=rtl] #draft__status {
@@ -35,8 +35,8 @@
/* picker popups (outside of .dokuwiki) */
div.picker {
width: 300px;
- border: 1px solid __border__;
- background-color: __background_alt__;
+ border: 1px solid @ini_border;
+ background-color: @ini_background_alt;
color: inherit;
}
/* picker for headlines */
@@ -106,7 +106,7 @@ div.picker button.toolbutton {
}
/* change background colour if summary is missing */
.dokuwiki .editBar .summary input.missing {
- color: __text__;
+ color: @ini_text;
background-color: #ffcccc;
}
@@ -114,7 +114,7 @@ div.picker button.toolbutton {
********************************************************************/
.dokuwiki div.preview {
- border: dotted __border__;
+ border: dotted @ini_border;
border-width: .2em 0;
padding: 1.4em 0;
margin-bottom: 1.4em;
@@ -138,6 +138,6 @@ div.picker button.toolbutton {
.dokuwiki div.section_highlight {
margin: 0 -1em; /* negative side margin = side padding + side border */
padding: 0 .5em;
- border: solid __background_alt__;
+ border: solid @ini_background_alt;
border-width: 0 .5em;
}
diff --git a/lib/tpl/dokuwiki/css/_fileuploader.css b/lib/tpl/dokuwiki/css/_fileuploader.css
index 42004de28..3c2cd4683 100644
--- a/lib/tpl/dokuwiki/css/_fileuploader.css
+++ b/lib/tpl/dokuwiki/css/_fileuploader.css
@@ -42,8 +42,8 @@
height: 100%;
min-height: 70px;
z-index: 2;
- background: __background_neu__;
- color: __text__;
+ background: @ini_background_neu;
+ color: @ini_text;
text-align: center;
}
@@ -57,7 +57,7 @@
}
.qq-upload-drop-area-active {
- background: __background_alt__;
+ background: @ini_background_alt;
}
/* list of files to upload */
@@ -70,7 +70,7 @@ div.qq-uploader ul {
.qq-uploader li {
margin: 0 0 5px;
- color: __text__;
+ color: @ini_text;
}
.qq-uploader li span,
diff --git a/lib/tpl/dokuwiki/css/_footnotes.css b/lib/tpl/dokuwiki/css/_footnotes.css
index a20f2964e..5d5f7ca30 100644
--- a/lib/tpl/dokuwiki/css/_footnotes.css
+++ b/lib/tpl/dokuwiki/css/_footnotes.css
@@ -16,7 +16,7 @@ div.insitu-footnote {
/*____________ footnotes at the bottom of the page ____________*/
.dokuwiki div.footnotes {
- border-top: 1px solid __border__;
+ border-top: 1px solid @ini_border;
padding: .5em 0 0 0;
margin: 1em 0 0 0;
clear: both;
diff --git a/lib/tpl/dokuwiki/css/_forms.css b/lib/tpl/dokuwiki/css/_forms.css
index 6744750ba..940a27f80 100644
--- a/lib/tpl/dokuwiki/css/_forms.css
+++ b/lib/tpl/dokuwiki/css/_forms.css
@@ -48,7 +48,7 @@
.dokuwiki fieldset {
width: 400px;
text-align: center;
- border: 1px solid __border__;
+ border: 1px solid @ini_border;
padding: 0.5em;
margin: auto;
}
diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css
index 8d5e1e8ca..28e347882 100644
--- a/lib/tpl/dokuwiki/css/_media_fullscreen.css
+++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css
@@ -38,7 +38,7 @@
}
#mediamanager__page .panelHeader {
- background-color: __background_alt__;
+ background-color: @ini_background_alt;
margin: 0 10px 10px 0;
padding: 10px 10px 8px;
text-align: left;
@@ -68,7 +68,7 @@
background: transparent url(../../images/resizecol.png) center center no-repeat;
}
#mediamanager__page .ui-resizable-e:hover {
- background-color: __background_alt__;
+ background-color: @ini_background_alt;
}
@@ -99,10 +99,10 @@
margin: 0 0 0 .3em;
border-radius: .5em .5em 0 0;
font-weight: normal;
- background-color: __background_alt__;
- color: __text__;
- border: 1px solid __border__;
- border-bottom-color: __background_alt__;
+ background-color: @ini_background_alt;
+ color: @ini_text;
+ border: 1px solid @ini_border;
+ border-bottom-color: @ini_background_alt;
line-height: 1.4em;
position: relative;
bottom: -1px;
@@ -118,7 +118,7 @@
right: 10px;
}
#mediamanager__page .namespaces .panelHeader {
- border-top: 1px solid __border__;
+ border-top: 1px solid @ini_border;
z-index: 1;
}
@@ -164,7 +164,7 @@
padding: 0;
}
#mediamanager__page .panelHeader ul li {
- color: __text__;
+ color: @ini_text;
float: left;
line-height: 1;
padding-left: 3px;
@@ -205,7 +205,7 @@
}
#mediamanager__page .filelist .panelContent ul li:hover {
- background-color: __background_alt__;
+ background-color: @ini_background_alt;
}
#mediamanager__page .filelist li dt a {
@@ -231,8 +231,8 @@
display: -moz-inline-stack;
/* the right margin should visually be 10px, but because of its inline-block nature the whitespace inbetween is about 4px more */
margin: 0 6px 10px 0;
- background-color: __background_neu__;
- color: __text__;
+ background-color: @ini_background_neu;
+ color: @ini_text;
padding: 5px;
vertical-align: top;
text-align: center;
@@ -287,13 +287,13 @@
max-height: 50px;
margin: 0;
margin-bottom: 3px;
- background-color: __background__;
- color: __text__;
+ background-color: @ini_background;
+ color: @ini_text;
overflow: hidden;
}
#mediamanager__page .filelist .rows li:nth-child(2n+1) {
- background-color: __background_neu__;
+ background-color: @ini_background_neu;
}
#mediamanager__page .filelist .rows li dt {
@@ -372,11 +372,11 @@
#mediamanager__page .file dl dt {
font-weight: bold;
display: block;
- background-color: __background_alt__;
+ background-color: @ini_background_alt;
}
#mediamanager__page .file dl dd {
display: block;
- background-color: __background_neu__;
+ background-color: @ini_background_neu;
}
@@ -415,7 +415,7 @@
#mediamanager__page #page__revisions ul li div.li div {
font-size: 90%;
- color: __text_neu__;
+ color: @ini_text_neu;
padding-left: 18px;
}
@@ -438,7 +438,7 @@
padding: 0;
vertical-align: top;
text-align: left;
- border-color: __background__;
+ border-color: @ini_background;
}
[dir=rtl] #mediamanager__diff td,
[dir=rtl] #mediamanager__diff th {
@@ -447,7 +447,7 @@
#mediamanager__diff th {
font-weight: normal;
- background-color: __background__;
+ background-color: @ini_background;
line-height: 1.2;
}
#mediamanager__diff th a {
@@ -459,7 +459,7 @@
#mediamanager__diff dl dd strong{
background-color: __highlight__;
- color: __text__;
+ color: @ini_text;
font-weight: normal;
}
diff --git a/lib/tpl/dokuwiki/css/_media_popup.css b/lib/tpl/dokuwiki/css/_media_popup.css
index c776e6b8a..1fefd68b6 100644
--- a/lib/tpl/dokuwiki/css/_media_popup.css
+++ b/lib/tpl/dokuwiki/css/_media_popup.css
@@ -20,13 +20,13 @@ html.popup {
overflow: auto;
position: absolute;
left: 0;
- border-right: 1px solid __border__;
+ border-right: 1px solid @ini_border;
}
[dir=rtl] #mediamgr__aside {
left: auto;
right: 0;
border-right-width: 0;
- border-left: 1px solid __border__;
+ border-left: 1px solid @ini_border;
}
#mediamgr__aside .pad {
padding: .5em;
@@ -52,7 +52,7 @@ html.popup {
font-size: 1.5em;
margin-bottom: .5em;
padding-bottom: .2em;
- border-bottom: 1px solid __border__;
+ border-bottom: 1px solid @ini_border;
}
/* left side
@@ -141,13 +141,13 @@ html.popup {
padding: .5em;
}
#media__content .odd {
- background-color: __background_alt__;
+ background-color: @ini_background_alt;
}
#media__content .even {
}
/* highlight newly uploaded or edited file */
#media__content #scroll__here {
- border: 1px dashed __border__;
+ border: 1px dashed @ini_border;
}
/* link which inserts media file */
@@ -167,7 +167,7 @@ html.popup {
/* info how to insert media, if JS disabled */
#media__content div.example {
- color: __text_neu__;
+ color: @ini_text_neu;
margin-left: 1em;
}
diff --git a/lib/tpl/dokuwiki/css/_modal.css b/lib/tpl/dokuwiki/css/_modal.css
index a3d3be194..a46dff30e 100644
--- a/lib/tpl/dokuwiki/css/_modal.css
+++ b/lib/tpl/dokuwiki/css/_modal.css
@@ -18,11 +18,11 @@
}
#link__wiz_result {
- background-color: __background__;
+ background-color: @ini_background;
width: 293px;
height: 193px;
overflow: auto;
- border: 1px solid __border__;
+ border: 1px solid @ini_border;
margin: 3px auto;
text-align: left;
line-height: 1;
@@ -57,16 +57,16 @@
}
#link__wiz_result div.even {
- background-color: __background_neu__;
+ background-color: @ini_background_neu;
}
#link__wiz_result div.selected {
- background-color: __background_alt__;
+ background-color: @ini_background_alt;
}
#link__wiz_result span {
display: block;
- color: __text_neu__;
+ color: @ini_text_neu;
margin-left: 22px;
}
diff --git a/lib/tpl/dokuwiki/css/_search.css b/lib/tpl/dokuwiki/css/_search.css
index 0090308c9..a8972ae72 100644
--- a/lib/tpl/dokuwiki/css/_search.css
+++ b/lib/tpl/dokuwiki/css/_search.css
@@ -44,14 +44,14 @@
}
/* search snippet */
.dokuwiki dl.search_results dd {
- color: __text_alt__;
+ color: @ini_text_alt;
background-color: inherit;
margin: 0 0 1.2em 0;
}
/* search hit in normal text */
.dokuwiki .search_hit {
- color: __text__;
+ color: @ini_text;
background-color: __highlight__;
}
/* search hit in search results */
@@ -60,7 +60,7 @@
}
/* ellipsis separating snippets */
.dokuwiki .search_results .search_sep {
- color: __text__;
+ color: @ini_text;
background-color: inherit;
}
diff --git a/lib/tpl/dokuwiki/css/_tabs.css b/lib/tpl/dokuwiki/css/_tabs.css
index 845ec9a57..860545a27 100644
--- a/lib/tpl/dokuwiki/css/_tabs.css
+++ b/lib/tpl/dokuwiki/css/_tabs.css
@@ -17,7 +17,7 @@
width: 100%;
bottom: 0;
left: 0;
- border-bottom: 1px solid __border__;
+ border-bottom: 1px solid @ini_border;
z-index: 1;
}
@@ -39,9 +39,9 @@
display: inline-block;
padding: .3em .8em;
margin: 0 0 0 .3em;
- background-color: __background_neu__;
- color: __text__;
- border: 1px solid __border__;
+ background-color: @ini_background_neu;
+ color: @ini_text;
+ border: 1px solid @ini_border;
border-radius: .5em .5em 0 0;
position: relative;
z-index: 0;
@@ -68,8 +68,8 @@
.dokuwiki ul.tabs li a:active,
.dokuwiki ul.tabs li a:focus,
.dokuwiki ul.tabs li strong {
- background-color: __background_alt__;
- color: __text__;
+ background-color: @ini_background_alt;
+ color: @ini_text;
text-decoration: none;
font-weight: normal;
}
@@ -78,5 +78,5 @@
.dokuwiki .tabs > ul li .active a,
.dokuwiki ul.tabs li strong {
z-index: 2;
- border-bottom-color: __background_alt__;
+ border-bottom-color: @ini_background_alt;
}
diff --git a/lib/tpl/dokuwiki/css/_toc.css b/lib/tpl/dokuwiki/css/_toc.css
index 1226b5b5b..469e9278c 100644
--- a/lib/tpl/dokuwiki/css/_toc.css
+++ b/lib/tpl/dokuwiki/css/_toc.css
@@ -11,7 +11,7 @@
float: right;
margin: 0 0 1.4em 1.4em;
width: 12em;
- background-color: __background_alt__;
+ background-color: @ini_background_alt;
color: inherit;
}
[dir=rtl] #dw__toc {
diff --git a/lib/tpl/dokuwiki/css/pagetools.less b/lib/tpl/dokuwiki/css/pagetools.less
index 21e5c13ec..2e316122f 100644
--- a/lib/tpl/dokuwiki/css/pagetools.less
+++ b/lib/tpl/dokuwiki/css/pagetools.less
@@ -101,10 +101,10 @@
#dokuwiki__pagetools:hover ul,
#dokuwiki__pagetools ul li a:focus,
#dokuwiki__pagetools ul li a:active {
- background-color: __background__;
- border-color: __border__;
+ background-color: @ini_background;
+ border-color: @ini_border;
border-radius: 2px;
- box-shadow: 2px 2px 2px __text_alt__;
+ box-shadow: 2px 2px 2px @ini_text_alt;
}
#dokuwiki__pagetools:hover ul li a,
@@ -124,7 +124,7 @@
[dir=rtl] #dokuwiki__pagetools:hover ul,
[dir=rtl] #dokuwiki__pagetools ul li a:focus {
- box-shadow: -2px 2px 2px __text_alt__;
+ box-shadow: -2px 2px 2px @ini_text_alt;
}
[dir=rtl] #dokuwiki__pagetools:hover li a,
@@ -158,7 +158,7 @@
text-decoration: none;
}
#dokuwiki__pagetools ul li a:hover {
- background-color: __background_alt__;
+ background-color: @ini_background_alt;
}
/*____________ all available icons in sprite ____________*/
diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini
index 24faffdb3..897b6e6da 100644
--- a/lib/tpl/dokuwiki/style.ini
+++ b/lib/tpl/dokuwiki/style.ini
@@ -54,32 +54,32 @@ css/print.css = print
;------ guaranteed dokuwiki color placeholders that every plugin can use
; main text and background colors
-__text__ = "#333"
-__background__ = "#fff"
+__text__ = "#333" ; @ini_text
+__background__ = "#fff" ; @ini_background
; alternative text and background colors
-__text_alt__ = "#999"
-__background_alt__ = "#eee"
+__text_alt__ = "#999" ; @ini_text_alt
+__background_alt__ = "#eee" ; @ini_background_alt
; neutral text and background colors
-__text_neu__ = "#666"
-__background_neu__ = "#ddd"
+__text_neu__ = "#666" ; @ini_text_neu
+__background_neu__ = "#ddd" ; @ini_background_neu
; border color
-__border__ = "#ccc"
+__border__ = "#ccc" ; @ini_border
; highlighted text (e.g. search snippets)
-__highlight__ = "#ff9"
+__highlight__ = "#ff9" ; @ini_highlight
;--------------------------------------------------------------------------
-__background_site__ = "#fbfaf9"
+__background_site__ = "#fbfaf9" ; @ini_background_site
; these are used for links
-__link__ = "#2b73b7"
-__existing__ = "#080"
-__missing__ = "#d30"
+__link__ = "#2b73b7" ; @ini_link
+__existing__ = "#080" ; @ini_existing
+__missing__ = "#d30" ; @ini_missing
; site and sidebar widths
-__site_width__ = "75em"
-__sidebar_width__ = "16em"
+__site_width__ = "75em" ; @ini_site_width
+__sidebar_width__ = "16em" ; @ini_sidebar_width
; cut off points for mobile devices
-__tablet_width__ = "800px"
-__phone_width__ = "480px"
+__tablet_width__ = "800px" ; @ini_tablet_width
+__phone_width__ = "480px" ; @ini_phone_width
--
GitLab