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/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; } } } diff --git a/css/base.less b/css/base.less index a9446ab..54d6f25 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..314d8d4 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; } @@ -227,7 +232,7 @@ h6 { p { font-size: @font-size-default; - line-height: 135%; + line-height: @line-height-big; a, span, @@ -286,6 +291,55 @@ small, .code { margin-top: @grid; + + // SPR-926: 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; + } } @@ -319,6 +373,11 @@ dl { line-height: 140%; } +dt, +dd { + line-height: inherit; +} + dt { font-weight: bold; margin: 0; @@ -494,21 +553,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; diff --git a/css/base_mixins.less b/css/base_mixins.less index 4f7428b..e17ee37 100755 --- a/css/base_mixins.less +++ b/css/base_mixins.less @@ -282,6 +282,12 @@ -webkit-flex: @elem; } +.flex-wrap() { + flex-wrap: wrap; + -webkit-flex-wrap: wrap; + -ms-flex-wrap: wrap; +} + /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* positioning */ 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 @@ } } } - } diff --git a/css/template_detail.less b/css/template_detail.less index b335ec3..ee9af44 100644 --- a/css/template_detail.less +++ b/css/template_detail.less @@ -4,17 +4,34 @@ * * @author Jana Deutschlaender */ + + #dokuwiki__detail { - // linked image - .img-link{ - +/* + + + + + linked image + + + + + */ + .img-link { text-align: center; a { - display: inline-block; - margin: 0 auto 1.4em; position: relative; + left: 0; + display: inline-block; + max-width: 100%; + color: @ini_button_color; + margin: 0 auto 1.4em; + + &::before { + position: absolute; + top: 0; + left: 0; + z-index: 2; + display: block; + width: 100%; + box-sizing: border-box; + background: @ini_button_background; + line-height: @line-height-default; + padding: @margin-small; + } img { margin: 0; @@ -27,37 +44,36 @@ &:hover, &:focus, &:active { - &:before{ - position: absolute; - top: 0; - left: 0; - width: 100%; - box-sizing: border-box; - display: block; - padding: @margin-small; + text-decoration: none; - z-index:2; - background: @ini_button_background; - color: @ini_button_color; - content:attr(title); + &::before { + content: attr(title); } + img { border: 1px solid @ini_button_background; } } - } } - // meta data - div.img_detail { - /* vertical minus margin of .img-detail corresponds to the padding of .page */ - margin: @margin-default -(@margin-default); +/* + + + + + meta data + + + + + */ + div.img_detail { + + /* vertical minus margin of .img-detail corresponds to the padding of .page */ + background-color: @ini_background_page_header; border: solid @ini_border_light; border-width: 1px 0; - background-color: @ini_background_page_header; - h1, h2, h3, h4, h5, h6, p{ + margin: @margin-default -(@margin-default); + + h1, + h2, + h3, + h4, + h5, + h6, + p { padding-left: @margin-default; padding-right: @margin-default; } @@ -67,64 +83,83 @@ } dl { - display: flex; - display: -webkit-flex; - display: -ms-flexbox; - - - flex-direction: row; - -webkit-flex-direction: row; - -ms-flex-direction: row; - - flex-wrap: wrap; - -webkit-flex-wrap: wrap; - -ms-flex-wrap: wrap; + .display-flex(); + .flex-wrap(); width: 100%; - dt, dd { + dt, + dd { box-sizing: border-box; margin: .2em 0; padding: (@small-spacing * 2) @small-spacing; } dt { - width: 33.3%; background-color: @ini_highlight; color: @ini_highlight_text; - } - dd { - width: 66.6%; - padding-left: (@small-spacing * 2); + @media @screen_min-xs { + width: 33.3%; + } + + @media @screen_max-xs { + width: 40%; + } } + dd { + padding-left: (@small-spacing * 2); + + @media @screen_min-xs { + width: 66.6%; + } + + @media @screen_max-xs { + width: 59.9%; + } + } } + .os-map { p { text-align: right; } + iframe { - padding: 0; - margin: 0; border: solid @ini_button_background; border-width: 1px 0; + margin: 0; + padding: 0; } } @media @screen_max-md { margin-right: -(@margin-default * 1.6); - h1, h2, h3, h4, h5, h6, p { + + h1, + h2, + h3, + h4, + h5, + h6, + p { padding-right: (@margin-default * 1.6); } } @media @screen_max-xs { margin-left: -(@margin-small); - h1, h2, h3, h4, h5, h6, p { + + h1, + h2, + h3, + h4, + h5, + h6, + p { padding-left: @margin-small; } } - } } diff --git a/detail.php b/detail.php index 86f18a6..e1df231 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; ?>
-
+
@@ -247,7 +253,8 @@ include('tpl/favicon_tiles.php'); /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* page tools */ -/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ ?> +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ + ?>