From 146c8265e6b7dfd89f7b04e9477843a1811ac22a Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Mon, 3 Apr 2017 13:30:34 +0200 Subject: [PATCH] SPR-742: wiki icons, table in content, edit button, tabinclude --- css/area_nav-breadcrumb.less | 2 +- css/area_nav-pagetools.less | 4 ++-- css/area_nav-usertools.less | 2 +- css/base_design.less | 20 +++++++++++++++----- css/plugins/edit.less | 23 ++++++++++------------- css/plugins/tabinclude.less | 2 +- 6 files changed, 30 insertions(+), 23 deletions(-) diff --git a/css/area_nav-breadcrumb.less b/css/area_nav-breadcrumb.less index e81b45e..cf6730f 100755 --- a/css/area_nav-breadcrumb.less +++ b/css/area_nav-breadcrumb.less @@ -111,7 +111,7 @@ display: block; width: auto; min-height: @toggle-size; - border: 1px solid @ini_border_light; + border: 1px solid @wikiicons-border; border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius text-align: center; margin: 0; diff --git a/css/area_nav-pagetools.less b/css/area_nav-pagetools.less index b340a3b..4ed4efc 100755 --- a/css/area_nav-pagetools.less +++ b/css/area_nav-pagetools.less @@ -130,9 +130,9 @@ nav#dokuwiki__pagetools { &:hover { ul { - box-shadow: @box-shadow-offset; + box-shadow: @box-shadow;//@box-shadow-offset; background-color: @ini_background_content; - border-color: @ini_border_light; + border-color: @wikiicons-border; li { color: @ini_existing; diff --git a/css/area_nav-usertools.less b/css/area_nav-usertools.less index 855a99f..87959cd 100755 --- a/css/area_nav-usertools.less +++ b/css/area_nav-usertools.less @@ -31,7 +31,7 @@ width: auto; min-height: @toggle-size; overflow: hidden; - border: 1px solid @ini_border_light; + border: 1px solid @wikiicons-border; border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius text-align: center; margin: 0; diff --git a/css/base_design.less b/css/base_design.less index 9a450fa..a26bcc8 100755 --- a/css/base_design.less +++ b/css/base_design.less @@ -27,6 +27,7 @@ html, body { } .dokuwiki { + .page ol li, .page ul li, .aside ul li { color: @ini_text; @@ -365,11 +366,20 @@ ol ol ol ol ol { /*____________ tables ____________*/ -.dokuwiki table.inline tr:hover td { - color: @ini_text_alt; +.dokuwiki { + table.inline tr:hover { + th { + background-color: fade(@ini_background_alt, 50%); + } - * { - color: @ini_text_alt; + td { + background-color: fade(@ini_background_alt, 80%); + color: @ini_text_alt; + + * { + color: @ini_text_alt; + } + } } } @@ -416,7 +426,7 @@ a { &:link, &:visited { text-decoration: none; - color: @ini_link; + color: @ini_link; // links to non wikipages (external links) } &:hover, diff --git a/css/plugins/edit.less b/css/plugins/edit.less index 8e60c41..34036c9 100644 --- a/css/plugins/edit.less +++ b/css/plugins/edit.less @@ -6,7 +6,7 @@ /* + + + + + edit view + + + + + */ -.dokuwiki { +#dokuwiki__content { div.section_highlight { clear: right; } @@ -18,24 +18,21 @@ margin-bottom: .5rem; } - #dokuwiki__content div.editbutton_table { - float: left; + div.editBox { + background-color: #FFF; - form div.no { - button, - input.button { - border-top: solid 1px @ini_button_background; - margin-top: 0; - } - } - } - - .editBox { .editButtons { display: inline-block; padding-bottom: 1rem; } + + * { + &:not(button) { + color: @color-editBox; + } + } } + } diff --git a/css/plugins/tabinclude.less b/css/plugins/tabinclude.less index 06666ff..8737ed4 100644 --- a/css/plugins/tabinclude.less +++ b/css/plugins/tabinclude.less @@ -47,7 +47,7 @@ div#dwpl-ti-container { position: relative; z-index: 0; overflow: auto; - box-shadow: @box-shadow-offset; + box-shadow: @box-shadow; background-color: @ini_background_content; border: solid 1px @ini_border; border-radius: 0;