From cc172e9f8330b0d16d1e99c10ed83ee31cee6714 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 26 Aug 2012 18:39:52 +0100 Subject: [PATCH] adjusted for new additional classes in the core (backwards-compatible for now) --- css/_edit.css | 35 +++++++++++++-------- css/_media_fullscreen.css | 9 ++++-- css/_recent.css | 65 +++++++++++++++++++++++---------------- css/rtl.css | 14 +++++---- 4 files changed, 76 insertions(+), 47 deletions(-) diff --git a/css/_edit.css b/css/_edit.css index 8c9910f..fd93d2f 100644 --- a/css/_edit.css +++ b/css/_edit.css @@ -6,18 +6,21 @@ /* edit view ********************************************************************/ +.dokuwiki div.editBox { +} + /*____________ toolbar ____________*/ .dokuwiki div.toolbar { margin-bottom: .5em; overflow: hidden; } -.dokuwiki div.toolbar #draft__status { +#draft__status { float: right; color: __text_alt__; background-color: inherit; } -.dokuwiki div.toolbar #tool__bar { +#tool__bar { float: left; } @@ -54,42 +57,50 @@ div.picker button.toolbutton { /*____________ below the textarea ____________*/ -.dokuwiki #wiki__editbar { +.dokuwiki #wiki__editbar, /* old, until 2012-01-25 */ +.dokuwiki div.editBar /* new */ { overflow: hidden; margin-bottom: .5em; } /* size and wrap controls */ -.dokuwiki #wiki__editbar #size__ctl { +#size__ctl { float: right; } -.dokuwiki #wiki__editbar #size__ctl img { +#size__ctl img { cursor: pointer; } /* edit buttons */ -.dokuwiki #wiki__editbar .editButtons { +.dokuwiki #wiki__editbar .editButtons, /* old, until 2012-01-25 */ +.dokuwiki div.editBar .editButtons /* new */ { display: inline; margin-right: 1em; } -.dokuwiki #wiki__editbar .editButtons input { +.dokuwiki #wiki__editbar .editButtons input, /* old, until 2012-01-25 */ +.dokuwiki div.editBar .editButtons input /* new */ { } /* summary input and minor changes checkbox */ -.dokuwiki #wiki__editbar .summary { +.dokuwiki #wiki__editbar .summary, /* old, until 2012-01-25 */ +.dokuwiki div.editBar .summary /* new */ { display: inline; } -.dokuwiki #wiki__editbar .summary label { +.dokuwiki #wiki__editbar .summary label, /* old, until 2012-01-25 */ +.dokuwiki div.editBar .summary label /* new */ { vertical-align: middle; white-space: nowrap; } -.dokuwiki #wiki__editbar .summary label span { +.dokuwiki #wiki__editbar .summary label span, /* old, until 2012-01-25 */ +.dokuwiki div.editBar .summary label span /* new */ { vertical-align: middle; } -.dokuwiki #wiki__editbar .summary input { +.dokuwiki #wiki__editbar .summary input, /* old, until 2012-01-25 */ +.dokuwiki div.editBar .summary input /* new */ { } /* change background colour if summary is missing */ -.dokuwiki #wiki__editbar .summary input.missing { +.dokuwiki #wiki__editbar .summary input.missing, /* old, until 2012-01-25 */ +.dokuwiki div.editBar .summary input.missing /* new */ { color: __text__; background-color: #ffcccc; } diff --git a/css/_media_fullscreen.css b/css/_media_fullscreen.css index df0efb5..62d60fa 100644 --- a/css/_media_fullscreen.css +++ b/css/_media_fullscreen.css @@ -365,19 +365,22 @@ /* file revisions form */ -#mediamanager__page #page__revisions ul { +#mediamanager__page #page__revisions ul, /* old, until 2012-01-25 */ +#mediamanager__page form.changes ul /* new */ { margin-left: 10px; padding: 0; list-style-type: none; } -#mediamanager__page #page__revisions ul li div.li div { +#mediamanager__page #page__revisions ul li div.li div, /* old, until 2012-01-25 */ +#mediamanager__page form.changes ul li div.li div /* new */ { font-size: 90%; color: __text_neu__; padding-left: 18px; } -#mediamanager__page #page__revisions ul li div.li input { +#mediamanager__page #page__revisions ul li div.li input, /* old, until 2012-01-25 */ +#mediamanager__page form.changes ul li div.li input /* new */ { position: relative; top: 1px; } diff --git a/css/_recent.css b/css/_recent.css index 68f0e58..2ef599c 100644 --- a/css/_recent.css +++ b/css/_recent.css @@ -5,54 +5,67 @@ /*____________ list of revisions / recent changes ____________*/ -/* select type of revisions (media/pages), should have a class on it's own, but hasn't */ -.dokuwiki #dw__recent label { +/* select type of revisions (media/pages), should have a class on it's own, but hasn't (until after version 2012-01-25) */ +.dokuwiki #dw__recent label, /* old, until 2012-01-25 */ +.dokuwiki .changeType /* new */ { margin-bottom: .5em; display: block; } -.dokuwiki #dw__recent ul li, -.dokuwiki #page__revisions ul li { +.dokuwiki #dw__recent ul li, /* old, until 2012-01-25 */ +.dokuwiki #page__revisions ul li, /* old, until 2012-01-25 */ +.dokuwiki form.changes ul li /* new */ { list-style: none; margin-left: 0; } -.dokuwiki #dw__recent ul li span, -.dokuwiki #dw__recent ul li a, -.dokuwiki #page__revisions ul li span, -.dokuwiki #page__revisions ul li a { +.dokuwiki #dw__recent ul li span, /* old, until 2012-01-25 */ +.dokuwiki #page__revisions ul li span, /* old, until 2012-01-25 */ +.dokuwiki form.changes ul li span, /* new */ +.dokuwiki #dw__recent ul li a, /* old, until 2012-01-25 */ +.dokuwiki #page__revisions ul li a, /* old, until 2012-01-25 */ +.dokuwiki form.changes ul li a /* new */ { vertical-align: middle; } -.dokuwiki #dw__recent ul li span.user a, -.dokuwiki #page__revisions ul li span.user a { +.dokuwiki #dw__recent ul li span.user a, /* old, until 2012-01-25 */ +.dokuwiki #page__revisions ul li span.user a, /* old, until 2012-01-25 */ +.dokuwiki form.changes ul li span.user a /* new */ { vertical-align: bottom; } -.dokuwiki #dw__recent ul li.minor, -.dokuwiki #page__revisions ul li.minor { +.dokuwiki #dw__recent ul li.minor, /* old, until 2012-01-25 */ +.dokuwiki #page__revisions ul li.minor, /* old, until 2012-01-25 */ +.dokuwiki form.changes ul li.minor /* new */ { opacity: .7; } -.dokuwiki #dw__recent li span.date, -.dokuwiki #page__revisions li span.date { +.dokuwiki #dw__recent ul li span.date, /* old, until 2012-01-25 */ +.dokuwiki #page__revisions ul li span.date, /* old, until 2012-01-25 */ +.dokuwiki form.changes ul li span.date /* new */ { } -.dokuwiki #dw__recent li a.diff_link, -.dokuwiki #page__revisions li a.diff_link { +.dokuwiki #dw__recent ul li a.diff_link, /* old, until 2012-01-25 */ +.dokuwiki #page__revisions ul li a.diff_link, /* old, until 2012-01-25 */ +.dokuwiki form.changes ul li a.diff_link /* new */ { vertical-align: baseline; } -.dokuwiki #dw__recent li a.revisions_link, -.dokuwiki #page__revisions li a.revisions_link { +.dokuwiki #dw__recent ul li a.revisions_link, /* old, until 2012-01-25 */ +.dokuwiki #page__revisions ul li a.revisions_link, /* old, until 2012-01-25 */ +.dokuwiki form.changes ul li a.revisions_link /* new */ { vertical-align: baseline; } -.dokuwiki #dw__recent li a.wikilink1, -.dokuwiki #dw__recent li a.wikilink2, -.dokuwiki #page__revisions li a.wikilink1, -.dokuwiki #page__revisions li a.wikilink2 { +.dokuwiki #dw__recent ul li a.wikilink1, /* old, until 2012-01-25 */ +.dokuwiki #page__revisions ul li a.wikilink1, /* old, until 2012-01-25 */ +.dokuwiki form.changes ul li a.wikilink1, /* new */ +.dokuwiki #dw__recent ul li a.wikilink2, /* old, until 2012-01-25 */ +.dokuwiki #page__revisions ul li a.wikilink2, /* old, until 2012-01-25 */ +.dokuwiki form.changes ul li a.wikilink2 /* new */ { } -.dokuwiki #dw__recent li span.sum, -.dokuwiki #page__revisions li span.sum { +.dokuwiki #dw__recent ul li span.sum, /* old, until 2012-01-25 */ +.dokuwiki #page__revisions ul li span.sum, /* old, until 2012-01-25 */ +.dokuwiki form.changes ul li span.sum /* new */ { font-weight: bold; } -.dokuwiki #dw__recent li span.user, -.dokuwiki #page__revisions li span.user { +.dokuwiki #dw__recent ul li span.user, /* old, until 2012-01-25 */ +.dokuwiki #page__revisions ul li span.user, /* old, until 2012-01-25 */ +.dokuwiki form.changes ul li span.user /* new */ { } diff --git a/css/rtl.css b/css/rtl.css index 7634922..0ac2f69 100644 --- a/css/rtl.css +++ b/css/rtl.css @@ -267,8 +267,9 @@ /*____________ _recent ____________*/ -[dir=rtl] .dokuwiki #dw__recent ul li, -[dir=rtl] .dokuwiki #page__revisions ul li { +[dir=rtl] .dokuwiki #dw__recent ul li, /* old, until 2012-01-25 */ +[dir=rtl] .dokuwiki #page__revisions ul li, /* old, until 2012-01-25 */ +[dir=rtl] .dokuwiki form.changes ul li /* new */ { margin-right: 0; } @@ -278,16 +279,17 @@ /*____________ _edit ____________*/ -[dir=rtl] .dokuwiki div.toolbar #draft__status { +[dir=rtl] #draft__status { float: left; } -[dir=rtl] .dokuwiki #wiki__editbar #size__ctl { +[dir=rtl] #size__ctl { float: left; } -[dir=rtl] .dokuwiki #wiki__editbar #size__ctl img { +[dir=rtl] #size__ctl img { cursor: pointer; } -[dir=rtl] .dokuwiki #wiki__editbar .editButtons { +[dir=rtl] .dokuwiki #wiki__editbar .editButtons, /* old, until 2012-01-25 */ +[dir=rtl] .dokuwiki .editBar .editButtons /* new */ { margin-right: 0; margin-left: 1em; }