From 5e00b7a4e35193e1ecc64e6b64338fc25b866c70 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Mon, 10 Apr 2017 13:11:17 +0200 Subject: [PATCH] SPR-742: Konfigurierbarkeit history colors --- css/area_forms.less | 50 ++++--------- css/area_recent.less | 163 +++++++++++++++++++++++++++++++++++++++++++ css/base.less | 2 +- style.ini | 1 + 4 files changed, 179 insertions(+), 37 deletions(-) create mode 100644 css/area_recent.less diff --git a/css/area_forms.less b/css/area_forms.less index 6469546..3d329be 100644 --- a/css/area_forms.less +++ b/css/area_forms.less @@ -25,34 +25,6 @@ form { width: 48.5%; } } - - - // older version (history) - .dokuwiki & > .no > ul > li { - min-height: 2rem; - vertical-align: baseline; - - a, - span, - img { - vertical-align: baseline; - } - - img { - margin-left: 4px; - margin-right: 4px; - } - - input[type="checkbox"] { - margin-bottom: .2rem; - } - - span.user bdi { - a { - vertical-align: baseline; - } - } - } } fieldset { @@ -130,6 +102,20 @@ keygen { padding-right: .3rem; } +input[type="radio"], +input[type="checkbox"] { + min-height: 1rem; +} + +input[type="radio"], +input[type="checkbox"], +input[type="image"] { + padding: 0; + border-style: none; + //box-shadow: none; :in ie picture and checkbox disappear +} + + input:active, input:focus, textarea:active, @@ -141,14 +127,6 @@ keygen:focus { border-color: #999; } -input[type="radio"], -input[type="checkbox"], -input[type="image"] { - padding: 0; - border-style: none; - box-shadow: none; -} - input[type="file"] { padding-top: .1rem; padding-bottom: .1rem; diff --git a/css/area_recent.less b/css/area_recent.less new file mode 100644 index 0000000..a24ca63 --- /dev/null +++ b/css/area_recent.less @@ -0,0 +1,163 @@ +/** + * This file provides the design styles for page revisions + * + * @author Jana Deutschlaender + */ + + +.dokuwiki { + +/* + + + + + list of changes + + + + + */ + form.changes { + li { + .sizechange { + color: @color-editBox; + + &.positive { + background-color: #cfc; + } + + &.negative { + background-color: #fdd; + } + } + } + + > .no > ul > li { + min-height: @formfield_min-height; + vertical-align: baseline; + margin-bottom: @small-spacing; + + .li { + line-height: 150%; + + > * { + min-height: 10px; + } + } + + a, + span, + img { + vertical-align: baseline; + } + + img { + margin-left: @small-spacing; + margin-right: @small-spacing; + } + + input[type="checkbox"] { + margin: 0 .5rem .2rem -1.5rem; + } + + span.user bdi { + a { + vertical-align: baseline; + } + } + } + } + + +/* + + + + + view of differents + + + + + */ + a.difflink { + color: @ini_existing; + + * { + color: inherit; + } + } + + .diffnav { + a { + background-color: @ini_background; + border: solid 1px @ini_background; + border-radius: @ini_default_border_radius; + color: @ini_nav_menu_color; + transition: @transition background-color, @transition color, @transition border-color; + + &::before { + background-color: inherit; + border: 0 none; + color: inherit; + } + + &:hover, + &:focus, + &:active { + background-color: @ini_nav_menu_color; + border: solid 1px @ini_nav_menu_color; + color: @ini_background; + + &::before { + background-color: inherit; + color: inherit; + } + } + } + } + + table.diff { + background-color: #fff; + border: solid 1px #fff; + border-top-width: 10px; + border-bottom-width: 10px; + + &.diff_inline { + border-top-width: 0; + + .diffnav { + padding-top: 10px; + padding-bottom: 10px; + } + } + + th { + background-color: @ini_background_content; + color: @ini_text; + padding-top: 10px; + padding-bottom: 10px; + + &.minor { + color: #999; + } + } + + td { + &.diff-blockheader { + background-color: #cfc; + color: @color-editBox; + } + + &.diff-context { + background-color: #eee; + color: @color-editBox; + } + } + + .diff-addedline { + background-color: #cfc; + color: @color-editBox; + + strong { + background-color: transparent; + color: #f00; + } + } + + .diff-deletedline { + background-color: #fdd; + color: @color-editBox; + + * { + color: inherit; + } + + strong { + background-color: transparent; + color: #f00; + } + } + } +} diff --git a/css/base.less b/css/base.less index 8d8a53f..aa93313 100755 --- a/css/base.less +++ b/css/base.less @@ -69,7 +69,7 @@ /* edit mode */ @highlight-odd-ini_text: fade(@ini_background_content, 95%); @highlight-even-ini_text: fade(@ini_text, 5%); -@color-editBox: #252525; // editmode for tables +@color-editBox: #252525; // editmode for tables, revision states //@nolinkedicon-ini_background: fade(@ini_background, 10%); diff --git a/style.ini b/style.ini index 1fd8b20..64a8289 100755 --- a/style.ini +++ b/style.ini @@ -79,6 +79,7 @@ css/area_togglelink.less = all css/area_forms.less = all css/area_search.less = all css/area_tabs.less = all +css/area_recent.less = all css/template_admin.less = all