diff --git a/css/area_main-content-secedit.less b/css/area_main-content-secedit.less index e9c25b6..6101952 100644 --- a/css/area_main-content-secedit.less +++ b/css/area_main-content-secedit.less @@ -1,14 +1,14 @@ /** - * This styles the "section editing button" + * This styles the "section editing button" (if not added by data-plugin) */ #dokuwiki__content.main-content { - .editbutton_section { + .secedit:not([class*="plugin"]):not([class*="table"]) { position: relative; top: 0; float: right; - margin-top: 0; // for best position of edit-tab beneeth table + margin-top: 0; // for best position of edit-tab beneath table form div.no { button { diff --git a/css/area_main-sidebar-nav.less b/css/area_main-sidebar-nav.less index 3de2ab3..bc1c7fb 100755 --- a/css/area_main-sidebar-nav.less +++ b/css/area_main-sidebar-nav.less @@ -35,8 +35,9 @@ nav { &.nav-main { - margin-bottom: 1rem; + margin-bottom: @nav-margin; } + > p { color: @ini_nav_menu_color; @@ -49,6 +50,11 @@ } } + ul, + div.nav { + margin-bottom: 0; + } + li { color: @ini_nav_menu_color; @@ -104,7 +110,7 @@ color: @ini_nav_menu_color; font-size: @font-size-head6; font-weight: normal; - margin: -1px 0 (@font-size-head6 / 2); // moves the toggles back to the left (.4 from li margin) + margin: -1px 0 @very-small-spacing; padding-bottom: .4rem; padding-top: .4rem; transition: @transition color, @transition background-color, @transition border-color; @@ -199,8 +205,8 @@ span.ico { position: relative; display: table-cell; - width: @menu-margin; - min-width: @menu-margin; + width: (@menu-margin - .1); + min-width: (@menu-margin - .1); height: @icon-size; text-align: center; vertical-align: middle; @@ -231,18 +237,18 @@ // simple fake icon strong { display: inline-block; - font-size: @icon-size * 0.5; width: @icon-size * 0.98; height: @icon-size * 0.98; - line-height: @icon-size * 0.9; - margin: @icon-size * 0.05; - padding: 0 .05em .05em; - vertical-align: baseline; - text-align: center; - color: inherit; border: 2px solid fade(@ini_nav_menu_color, 80%); border-top-right-radius: 50%; border-bottom-left-radius: 50%; + color: inherit; + font-size: @icon-size * 0.5; + line-height: @icon-size * 0.9; + vertical-align: baseline; + text-align: center; + margin: @icon-size * 0.05; + padding: 0 .05em .05em; } // real icon @@ -276,6 +282,7 @@ ul { margin-bottom: 0; + margin-left: 16px; } } } diff --git a/css/area_nav-metabox.less b/css/area_nav-metabox.less index 9f97b85..f3fe6b5 100755 --- a/css/area_nav-metabox.less +++ b/css/area_nav-metabox.less @@ -157,7 +157,6 @@ } &.active { - > a { cursor: default; background-color: @ini_background; @@ -377,9 +376,9 @@ vertical-align: text-top; button { - background: @ini_existing; - border-color: @ini_existing; - color: @ini_background; + background: @ini_button_background; + border-color: @ini_button_background; + color: @ini_button_color; font-size: @font-size-small; padding: .2em .3em; @@ -396,8 +395,8 @@ &:hover, &:focus, &:active { - background: @ini_background; - color: @ini_existing; + background: @ini_button_color; + color: @ini_button_background; } } } diff --git a/css/area_nav-page-attributes.less b/css/area_nav-page-attributes.less index b7ab433..a36e400 100644 --- a/css/area_nav-page-attributes.less +++ b/css/area_nav-page-attributes.less @@ -70,6 +70,7 @@ .num { top: -.6em; + font-size: @font-size-very-small; } } } diff --git a/css/area_nav-usertools.less b/css/area_nav-usertools.less index a18909f..1750625 100755 --- a/css/area_nav-usertools.less +++ b/css/area_nav-usertools.less @@ -46,7 +46,6 @@ .btn-usertools-num(); float: right; - min-height: 28px; @media @screen_max-xs { display: block; @@ -54,10 +53,15 @@ margin-bottom: @headericons-margin-xxs; } + @media @screen_max-xxs { + margin-bottom: (@headericons-margin-xxs - .2); + } + > span, > a { display: block; width: auto; + min-width: (@toggle-size + .25); min-height: @toggle-size; overflow: hidden; border: 1px solid @wikiicons-border; @@ -68,64 +72,47 @@ @media @screen_md-xlg { padding-top: .14rem; } - - @media @screen_max-xxlg { - min-height: 28px; - } - - @media @screen_max-md { - min-height: @toggle-size; - } - - @media @screen_only-lg { - min-width: 2rem; - } } - &.user { - @space-min-xxlg: .35rem; - @space-max-xxlg: .4rem; - @space-max-xlg: .5rem; - @space-max-md: .35rem; +/* !!! &.user-task FIND in plugins/do_tasks.less !!! */ + &.user { position: relative; display: table-cell; background-color: @ini_background_site; - border: solid 1px @wikiicons-border; // @ini_border_light; + border: solid 1px @wikiicons-border; border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius color: @ini_text_webframe; padding-right: .3rem; - @media @screen_min-xxlg { - padding-top: @space-min-xxlg; - } - - @media @screen_max-xxlg { - padding-top: @space-max-xxlg; - } - - @media @screen_max-xlg { - padding-top: @space-max-xlg; + @media @screen_min-md { + padding-top: .35rem; } @media @screen_max-md { min-height: @toggle-size; - padding-top: @space-max-md; + padding-top: .3rem; + } + + @media @screen_max-sm { + padding-top: .35rem; } @media @screen_max-xs { position: absolute; top: @headericons-margin-xxs; - right: 2.9rem; + right: (@toggle-size + @headericons-margin-xxs + 1); // 1.75rem + 1 + (button login/out margin-right) overflow: hidden; white-space: nowrap; margin: -1px 0 0; + padding-top: .4rem; } @media @screen_max-xxs { left: -10px; - right: (@toggle-size + @headericons-margin-xxs); + right: (@toggle-size + @headericons-margin-xxs); // 1.75rem + .45rem width: auto; + padding-top: .35rem; } > a { @@ -133,7 +120,6 @@ .align-items(); position: relative; - min-height: 26px; height: 1rem; // for IE11 overflow: visible; background: @ini_nav_menu_hover_bg; // for removing bg-image @@ -144,29 +130,27 @@ margin-right: -.3rem; padding: 0 .2em 0 0; - @media @screen_only-xlg { - padding-bottom: .1em; - } - @media @screen_min-xxlg { - margin-top: -(@space-min-xxlg); + min-height: (@toggle-size - .1); + margin-top: -.4rem; } @media @screen_max-xxlg { - margin-top: -(@space-max-xxlg); - } - - @media @screen_max-xlg { - margin-top: -(@space-max-xlg); + min-height: (@toggle-size - .15); + margin-top: -.35rem; } @media @screen_max-md { min-height: (@toggle-size - .1); - margin-top: -(@space-max-md); + margin-top: -.35rem; } - @media @screen_max-xxs { - min-height: (@toggle-size - .15); + @media @screen_max-sm { + margin-top: -.35rem; + } + + @media @screen_max-xs { + margin-top: -.4rem; } &::before { @@ -191,7 +175,7 @@ &::before { opacity: 1; - border-color: @ini_nav_menu_hover_bg; + border-color: @ini_nav_menu_hover_color; } bdi, @@ -249,10 +233,6 @@ line-height: 1; text-decoration: none; - @media @screen_md-xlg { - min-width: 2rem; - } - &::before { .center-middle(); @@ -290,4 +270,4 @@ } } // a } // ul -} // nav-usertools \ No newline at end of file +} // nav-usertools diff --git a/css/area_togglelink.less b/css/area_togglelink.less index 776dd5e..5b09625 100755 --- a/css/area_togglelink.less +++ b/css/area_togglelink.less @@ -72,7 +72,7 @@ /* + + + toggle out + + + */ .wide-content & { - left: -1px; + left: 0; a { background-color: @ini_button_background; diff --git a/css/base.less b/css/base.less index 766cc31..b79477c 100755 --- a/css/base.less +++ b/css/base.less @@ -23,6 +23,7 @@ @margin-small: 1rem; @margin-default: 2rem; @margin-big: 3.07rem; +@nav-margin: 1.3rem; @small-spacing: .3rem; @very-small-spacing: .2rem; diff --git a/css/base_structure.less b/css/base_structure.less index 4d88900..a671776 100755 --- a/css/base_structure.less +++ b/css/base_structure.less @@ -79,6 +79,10 @@ } } + .qc-output { + z-index: 1; // put qc-output above meta-box + } + #spr__meta-box { z-index: 1; // put meta-box above positioned content-elements such as aggregations, edit-buttons ul.meta-tabs > li.active { diff --git a/css/plugins/data.less b/css/plugins/data.less index 9d03409..6a6cf57 100644 --- a/css/plugins/data.less +++ b/css/plugins/data.less @@ -1,5 +1,5 @@ /** - * This file provides styles for old data plugin + * This file provides styles for "data plugin" * after importing struct data this can be deleted */ @@ -12,37 +12,37 @@ margin-left: 0; margin-right: 0; } + } - + .secedit.editbutton_plugin_data { - position: relative; - top: -1em; // as margin after DL - float: left; - font-size: @font-size-small; // for right position - margin-top: 0; + .editbutton_plugin_data { + position: relative; + top: -1em; // as margin after DL + float: left; + font-size: @font-size-small; // for right position + margin-top: 0; - form { - button { - min-height: 1rem; - height: 1.8em; - background-color: @ini_background; - border-top: solid 1px @ini_button_background; - border-color: @ini_border; - border-radius: 0 0 @fix_border-radius @fix_border-radius; - color: @ini_existing; - font-size: @font-size-small; - line-height: 1.8em; - margin-top: -1px; // for right position - margin-left: .6em; - padding: 0 .3em; - transition: @transition background-color, @transition border-color, @transition color; + form { + button { + min-height: 1rem; + height: 1.8em; + background-color: @ini_background; + border-top: solid 1px @ini_button_background; + border-color: @ini_border; + border-radius: 0 0 @fix_border-radius @fix_border-radius; + color: @ini_existing; + font-size: @font-size-small; + line-height: 1.8em; + margin-top: -1px; // for right position + margin-left: .6em; + padding: 0 .3em; + transition: @transition background-color, @transition border-color, @transition color; - &:hover, - &:focus, - &:active { - background-color: @ini_existing; - border-color: @ini_existing; - color: @ini_background; - } + &:hover, + &:focus, + &:active { + background-color: @ini_existing; + border-color: @ini_existing; + color: @ini_background; } } } diff --git a/css/plugins/do_tasks.less b/css/plugins/do_tasks.less index 9154aed..a17e873 100755 --- a/css/plugins/do_tasks.less +++ b/css/plugins/do_tasks.less @@ -25,19 +25,24 @@ ul.page-attributes { } } + +/* + + + + + usertool icon in header + + + + + */ #dokuwiki__usertools.nav-usertools { ul { li { &.user-task { + .btn-usertools-wrapper(); + .btn-usertools-num(); + position: relative; - button { + .plugin__do_usertasks { + width: 100%; + min-width: (@toggle-size + .25); + min-height: @toggle-size; border-radius: @ini_default_border_radius; border: 1px solid @wikiicons-border; padding: .14rem 0 0 0; - min-width: 2rem; - min-height: 28px; - background: @ini_background none; &::before { content: ''; // remove when fontello is removed from usertools @@ -46,26 +51,27 @@ ul.page-attributes { &:hover, &:focus, &:active { - background: @ini_nav_menu_hover_color none; + background-color: @ini_nav_menu_hover_color; border: none; svg path { - fill: @ini_background; + fill: @ini_nav_menu_hover_bg; } } } + button { + background-color: @ini_nav_menu_hover_bg; + } + svg { - width: 20px; - margin-top: 2px; + width: 1.2rem; + height: 1.2rem; // for IE 11 + margin-bottom: 2px; path { fill: @ini_nav_menu_hover_color; } - - @media @screen_max-md { - margin-top: 4px; - } } .noopentasks { @@ -86,10 +92,28 @@ ul.page-attributes { } } - @media @screen_max-sm { + @media @screen_max-xs { display: none; } } // user-task } // li } // ul } + +.plugin__do_usertasks_list { + background-color: transparent; + + @media @screen_max-sm { + right: 1.25rem !important; + left: 1.25rem !important; + } + + table.inline { + background-color: #FFF; + margin-top: .5rem; + + @media @screen_max-sm { + width: 100%; + } + } +} diff --git a/css/plugins/edittable.less b/css/plugins/edittable.less index ef3069c..bba123d 100644 --- a/css/plugins/edittable.less +++ b/css/plugins/edittable.less @@ -1,5 +1,5 @@ /** - * This file provides styles for qc edittable plugin + * This file provides styles for "edittable plugin" */ @@ -9,7 +9,7 @@ div.editbutton_table { position: relative; // for IE float: left; - margin-top: -1.46rem !important; // overwrite inline stales + margin-top: -1.4em !important; // overwrite inline styles form div.no { button, @@ -21,14 +21,10 @@ border-radius: 0 0 @fix_border-radius @fix_border-radius; color: @ini_existing; font-size: @font-size-small; - margin-top: 0; // for best position of edit-tab beneeth table + margin-top: -1px; // for best position of edit-tab beneath table padding-right: .3em; transition: @transition background-color, @transition border-color, @transition color; - @media @screen_md-xlg { - margin-top: -1px; // for best position of edit-tab beneeth table - } - &:hover, &:focus, &:active { diff --git a/css/plugins/magic-matcher.less b/css/plugins/magic-matcher.less index 72920d2..eb2fdbd 100755 --- a/css/plugins/magic-matcher.less +++ b/css/plugins/magic-matcher.less @@ -25,6 +25,10 @@ max-width: 50%; } + select[name="mmissues"] + div.chosen-container { + max-width: 67%; + } + button[name="toggleSuggestions"] { position: absolute; right: 0; diff --git a/css/plugins/qc.less b/css/plugins/qc.less index 25688b9..97a7911 100644 --- a/css/plugins/qc.less +++ b/css/plugins/qc.less @@ -16,37 +16,44 @@ font-size: (@font-size-small - .06); } } + + a { + &:hover, + &:focus, + &:active { + svg path { + fill: @ini_nav_menu_hover_bg; + } + } + } } /* + + + + + slideout output + + + + + */ .qc-output { + position: relative; min-width: 100%; width: auto; + background-color: @ini_background !important; font-size: 90%; box-shadow: @box-shadow-bottom; + border-bottom: solid 1px @ini_border_light; margin-bottom: 0; - - h2 { - font-size: 1.3rem; - } - h3 { - font-size: 1.1rem; - } - h4, h5, h6 { - font-size: 1rem; - } - + padding-top: 0 !important; // for JS overwrite @media @screen_min-xxs { - margin-top: -(@margin-default + 1); margin-right: -(@margin-default); margin-left: -(@margin-default); padding-left: @margin-default; padding-right: @margin-default; } + @media @screen_min-md { + top: -(@margin-small); + } + @media @screen_max-md { + top: 0; margin-top: -(@page_padding-top + 2); margin-right: -(@margin-default * 1.6); margin-left: -(@margin-default); @@ -59,6 +66,21 @@ padding-right: @margin-default; } + h1 { + @media @screen_min-md { + padding-top: 0; + } + } + h2 { + font-size: 1.3rem; + } + h3 { + font-size: 1.1rem; + } + h4, h5, h6 { + font-size: 1rem; + } + div, p { margin-left: 0; diff --git a/css/plugins/starred.less b/css/plugins/starred.less index cdb371f..f0ff348 100644 --- a/css/plugins/starred.less +++ b/css/plugins/starred.less @@ -4,16 +4,16 @@ .page-attributes { li.plugin_starred { - .starred svg { - margin-top: .1em; - width: 1.6em; - height: 1.6em; - font-size: 0.82rem; - fill: @ini_nav_menu_color; - } + .starred { + display: block; + padding-top: .05rem; - .starred.on svg { - fill: @ini_link; + svg { + width: 1.6em; + height: 1.6em; + font-size: 0.82rem; + fill: @ini_nav_menu_hover_color; + } } a:hover, @@ -23,21 +23,25 @@ fill: @ini_nav_menu_hover_bg; } } - } } nav.nav-starred { - margin-top: 1rem; + margin-top: @nav-margin; + ul { list-style: none; + &#sidebar-menu-starred { margin-left: 0; } + li { margin-left: 0; + svg { - vertical-align: middle; + vertical-align: text-top; + fill: @ini_nav_menu_color; } } } diff --git a/main.php b/main.php index 925f091..b72ec5f 100755 --- a/main.php +++ b/main.php @@ -245,11 +245,6 @@ $classWideContent = ($ACT === "show") ? "": "wide-content "; if($mm && $matcher !== ""){ include('tpl/nav-magicmatcher.php'); } - -/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ -/* Include Hook: header.html */ -/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ - tpl_includeFile('header.html'); ?>