From 80283684300e1997eadcbc26bb55c1df6ef174be Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Wed, 19 Apr 2017 13:38:01 +0200 Subject: [PATCH 01/10] SPR-926: contrast for CODE --- css/base.less | 4 +-- css/base_design.less | 77 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 75 insertions(+), 6 deletions(-) diff --git a/css/base.less b/css/base.less index 4c4352f..55bb8e6 100755 --- a/css/base.less +++ b/css/base.less @@ -51,11 +51,11 @@ @formfield_min-height: 2rem; // min-height for input, textarea, select, keygen -//@metanav-ini_background: rgba(0, 0, 0, .1); +@code-background: #F6F6F6; /* code, pre, samp, kbd */ /* icons */ -@noopentasks-background: #ECECEC; /* metabox tabs + num in icons + tabinclude + code, pre, samp, kbd */ +@noopentasks-background: #ECECEC; /* metabox tabs + num in icons + tabinclude */ @noopentasks-border: #BBB; /* metabox tabs + num in icons + code, pre, samp, kbd */ @noopentasks-color: #666; /* metabox tabs + num in icons + code, pre, samp, kbd */ @wikiicons-border: #CCC; /* usertools, breadcrumbs icons, pagetools box-hover */ diff --git a/css/base_design.less b/css/base_design.less index d56d117..3c8fd3f 100755 --- a/css/base_design.less +++ b/css/base_design.less @@ -286,6 +286,55 @@ small, .code { margin-top: @grid; + + // darker colors for accessibility + .es6 { + color: #00832B; + } + + .kw5 { + color: #005D00; + } + + .kw6 { + color: #DC0075; + } + + .nu0 { + color: #A74DA7; + } + + .re3 { + color: #DE1B1B; + } + + .re4 { + color: #007F6F; + } + + .br0, .sy0 { + color: #248124; + } + + .co1, .coMULTI, .sc-1 { + color: #707070; + } + + .co2, .sy1 { + color: #108400; + } + + .co3, .sy4 { + color: #008070; + } + + .kw1, .kw8 { + color: #747400; + } + + .re1, .st0, .st_h { + color: #DD0000; + } } @@ -494,21 +543,41 @@ kbd { font-size: @font-size-default; direction: ltr; text-align: left; - background-color: @noopentasks-background; + background-color: @code-background; color: @noopentasks-color; box-shadow: inset 0 0 .3em @noopentasks-border; border-radius: @fix_border-radius; padding-left: @small-spacing; padding-right: @small-spacing; + + * { + font-family: inherit; + font-size: inherit; + } + + span { + color: inherit; + } + + a { + &:link, + &:visited { + color: inherit; + text-decoration: underline; + } + + &:hover, + &:focus, + &:active { + text-decoration: none; + } + } } pre { overflow: auto; word-wrap: normal; - background-color: @noopentasks-background; border: 1px solid @noopentasks-border; - border-radius: @fix_border-radius; - box-shadow: inset 0 0 .5em @noopentasks-border; font-size: @font-size-default; line-height: 140%; padding: .7em 1em; From 476022bd244d0685713a002c102cc3cd28c64db3 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Wed, 19 Apr 2017 13:42:18 +0200 Subject: [PATCH 02/10] SPR-926: contrast for CODE --- css/base_design.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/base_design.less b/css/base_design.less index 3c8fd3f..3d21515 100755 --- a/css/base_design.less +++ b/css/base_design.less @@ -287,7 +287,7 @@ small, .code { margin-top: @grid; - // darker colors for accessibility + // SPR-926: darker colors for accessibility .es6 { color: #00832B; } From c14dbc74922437b0dbb60040ea1aa6d588740b75 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Wed, 19 Apr 2017 14:17:13 +0200 Subject: [PATCH 03/10] SPR-882: section edit button improvements --- css/base_design.less | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/css/base_design.less b/css/base_design.less index 3d21515..c6c98c4 100755 --- a/css/base_design.less +++ b/css/base_design.less @@ -155,6 +155,7 @@ h2 { padding-top: (@font-size-head2 / 2); .secedit + &, + div[class^="level"] + &, .section_highlight &:first-child { padding-top: 0; } @@ -170,6 +171,7 @@ h3 { padding-top: (@font-size-head3 / 2); .secedit + &, + div[class^="level"] + &, .section_highlight &:first-child { padding-top: 0; } @@ -185,6 +187,7 @@ h4 { padding-top: (@font-size-head4 / 2); .secedit + &, + div[class^="level"] + &, .section_highlight &:first-child { padding-top: 0; } @@ -200,6 +203,7 @@ h5 { padding-top: (@font-size-head5 / 2); .secedit + &, + div[class^="level"] + &, .section_highlight &:first-child { padding-top: 0; } @@ -216,6 +220,7 @@ h6 { padding-top: (@font-size-head6 / 2); .secedit + &, + div[class^="level"] + &, .section_highlight &:first-child { padding-top: 0; } From 8a35e694622cf676cfff83a16e45d6545b3674e2 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Wed, 19 Apr 2017 14:24:11 +0200 Subject: [PATCH 04/10] SPR-908: footer widescreen --- css/area_footer.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/css/area_footer.less b/css/area_footer.less index 39b068e..4bdf3b1 100755 --- a/css/area_footer.less +++ b/css/area_footer.less @@ -78,7 +78,8 @@ &.showSidebar { #dokuwiki__footer { .col-xs-12 { - margin-left: @toggle-showsidebar_width; + width: 100%; + padding-left: @toggle-showsidebar_width; } } } From 1741a375bc4606f2007682ec74a528d80509b6fb Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Thu, 20 Apr 2017 10:49:24 +0200 Subject: [PATCH 05/10] SPR-908: stop floating after msg-box --- css/area_content.less | 11 +++++++++++ css/plugins/edit.less | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/css/area_content.less b/css/area_content.less index 1526394..76c8f30 100755 --- a/css/area_content.less +++ b/css/area_content.less @@ -25,8 +25,19 @@ border-bottom: 1px solid @ini_border_light; } + .msg-area + * { + clear: both; + padding-top: 1em; // as h1 + } + #plugin__highlightparent { + clear: none; display: block; + + + * { + clear: both; + padding-top: 1em; // as h1 + } } } } diff --git a/css/plugins/edit.less b/css/plugins/edit.less index 9e1dcda..c4ff8b2 100644 --- a/css/plugins/edit.less +++ b/css/plugins/edit.less @@ -9,6 +9,7 @@ #dokuwiki__content { div.section_highlight { clear: right; + padding-top: 0 !important; // heredity } .secedit button { @@ -34,7 +35,6 @@ } } } - } From 6db1065031a4537e99d5b01284cf973804a6c379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jana=20Deutschla=CC=88nder?= Date: Thu, 20 Apr 2017 11:42:42 +0200 Subject: [PATCH 06/10] SPR-814: bugfix for content toggle / sidebar section toggle in detail template --- detail.php | 15 ++++++++++----- main.php | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/detail.php b/detail.php index 86f18a6..bedee99 100755 --- a/detail.php +++ b/detail.php @@ -14,14 +14,20 @@ if (!defined('DOKU_INC')) die(); /* must be run from with header('X-UA-Compatible: IE=edge,chrome=1'); global $JSINFO; -if (empty($JSINFO)) { - $JSINFO = array(); +if (empty($JSINFO['template'])) { + $JSINFO['template'] = array(); } +$JSINFO['template']['sprintdoc'] = array('sidebar_toggle_elements' => tpl_getConf('sidebar_sections')); + +$showTools = true; +$showSidebar = true; ?> +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ + ?>