From dd257e14e835738f3c17152407a023d095909cb1 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Wed, 3 May 2017 10:46:03 +0200 Subject: [PATCH 01/11] SPR-908: qc hover, after merge toggle --- css/area_main-sidebar-search.less | 2 +- css/plugins/qc.less | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/css/area_main-sidebar-search.less b/css/area_main-sidebar-search.less index 77a7552..45567e5 100644 --- a/css/area_main-sidebar-search.less +++ b/css/area_main-sidebar-search.less @@ -194,7 +194,7 @@ z-index: 1; display: block; float: left; - width: 100%; + width: auto; } form { diff --git a/css/plugins/qc.less b/css/plugins/qc.less index 25688b9..5412913 100644 --- a/css/plugins/qc.less +++ b/css/plugins/qc.less @@ -16,6 +16,16 @@ font-size: (@font-size-small - .06); } } + + a { + &:hover, + &:focus, + &:active { + svg path { + fill: @ini_nav_menu_hover_bg; + } + } + } } From af3d99dd763b306042f3bafb99bc98be3542be2a Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Fri, 5 May 2017 10:24:20 +0200 Subject: [PATCH 02/11] SPR-942: subsublist alignment in sidebar --- css/area_main-sidebar-nav.less | 1 + 1 file changed, 1 insertion(+) diff --git a/css/area_main-sidebar-nav.less b/css/area_main-sidebar-nav.less index 618e8c3..dbcb5fa 100755 --- a/css/area_main-sidebar-nav.less +++ b/css/area_main-sidebar-nav.less @@ -273,6 +273,7 @@ ul { margin-bottom: 0; + margin-left: 16px; } } } From 96ba5aa0ba902b61fbb8cd92922d58a9d609bc4c Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Fri, 5 May 2017 10:25:33 +0200 Subject: [PATCH 03/11] SPR-742: wrong colors (for configure) --- css/plugins/do_tasks.less | 6 +++--- css/plugins/qc.less | 1 + css/plugins/starred.less | 9 ++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/css/plugins/do_tasks.less b/css/plugins/do_tasks.less index 02ae281..445c426 100755 --- a/css/plugins/do_tasks.less +++ b/css/plugins/do_tasks.less @@ -37,7 +37,7 @@ ul.page-attributes { padding: .14rem 0 0 0; min-width: 2rem; min-height: 28px; - background: @ini_background none; + background-color: @ini_nav_menu_hover_bg; &::before { content: ''; // remove when fontello is removed from usertools @@ -46,11 +46,11 @@ 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; } } } diff --git a/css/plugins/qc.less b/css/plugins/qc.less index 5412913..c140f77 100644 --- a/css/plugins/qc.less +++ b/css/plugins/qc.less @@ -35,6 +35,7 @@ width: auto; font-size: 90%; box-shadow: @box-shadow-bottom; + border-bottom: solid 1px @ini_border_light; margin-bottom: 0; h2 { diff --git a/css/plugins/starred.less b/css/plugins/starred.less index a43c04d..4a1e0ea 100644 --- a/css/plugins/starred.less +++ b/css/plugins/starred.less @@ -9,11 +9,7 @@ width: 1.6em; height: 1.6em; font-size: 0.82rem; - fill: @ini_nav_menu_color; - } - - .starred.on svg { - fill: @ini_link; + fill: @ini_nav_menu_hover_color; } a:hover, @@ -30,11 +26,14 @@ nav.nav-starred { ul { list-style: none; + &#sidebar-menu-starred { margin-left: 0; } + li { margin-left: 0; + svg { vertical-align: middle; } From cabcae22c157ed7857ba961967de949cab8f95ef Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Fri, 5 May 2017 11:41:34 +0200 Subject: [PATCH 04/11] SPR-882: section edit button improvements --- css/area_main-content-secedit.less | 4 +-- css/plugins/data.less | 58 +++++++++++++++--------------- css/plugins/edittable.less | 10 ++---- 3 files changed, 34 insertions(+), 38 deletions(-) diff --git a/css/area_main-content-secedit.less b/css/area_main-content-secedit.less index 3881c79..14fadc3 100644 --- a/css/area_main-content-secedit.less +++ b/css/area_main-content-secedit.less @@ -1,10 +1,10 @@ /** - * This styles the "section editing button" + * This styles the "section editing button" (data-plugin) */ #dokuwiki__content.main-content { - .editbutton_section { + .secedit:not([class*="plugin"]):not([class*="table"]) { position: relative; z-index: 2; top: 0; 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/edittable.less b/css/plugins/edittable.less index 0a2c2e4..1d22dff 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" */ @@ -10,7 +10,7 @@ position: relative; // for IE z-index: 1; // for IE float: left; - margin-top: -1.46rem !important; // overwrite inline stales + margin-top: -1.4em !important; // overwrite inline stales form div.no { button, @@ -22,14 +22,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 beneeth 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 { From eb3c04ae9fe07c0108997720171e1625cf8fe22f Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Fri, 5 May 2017 13:30:32 +0200 Subject: [PATCH 05/11] SPR-908: QS - nav margin --- css/area_main-sidebar-nav.less | 9 +++++++-- css/base.less | 1 + css/plugins/starred.less | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/css/area_main-sidebar-nav.less b/css/area_main-sidebar-nav.less index 28ef40f..f1fc784 100755 --- a/css/area_main-sidebar-nav.less +++ b/css/area_main-sidebar-nav.less @@ -35,7 +35,7 @@ nav { &.nav-main { - margin-bottom: 1rem; + margin-bottom: @nav-margin; } > p { @@ -50,6 +50,11 @@ } } + ul, + div.nav { + margin-bottom: 0; + } + li { color: @ini_nav_menu_color; @@ -105,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; 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/plugins/starred.less b/css/plugins/starred.less index 66eb95a..a67610c 100644 --- a/css/plugins/starred.less +++ b/css/plugins/starred.less @@ -24,7 +24,7 @@ } nav.nav-starred { - margin-top: 1rem; + margin-top: @nav-margin; ul { list-style: none; From 852015903c1f3fd5aa2bdc959bf0da065dd708e7 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Fri, 5 May 2017 14:14:52 +0200 Subject: [PATCH 06/11] SPR-908: QS - starred, do margin + ie: height --- css/area_nav-usertools.less | 6 ++++-- css/plugins/do_tasks.less | 3 ++- css/plugins/starred.less | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/css/area_nav-usertools.less b/css/area_nav-usertools.less index a18909f..ef25bf5 100755 --- a/css/area_nav-usertools.less +++ b/css/area_nav-usertools.less @@ -82,6 +82,8 @@ } } + /* !!! &.user-task FIND in plugins/do_tasks.less !!! */ + &.user { @space-min-xxlg: .35rem; @space-max-xxlg: .4rem; @@ -91,7 +93,7 @@ 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; @@ -290,4 +292,4 @@ } } // a } // ul -} // nav-usertools \ No newline at end of file +} // nav-usertools diff --git a/css/plugins/do_tasks.less b/css/plugins/do_tasks.less index 445c426..6f63908 100755 --- a/css/plugins/do_tasks.less +++ b/css/plugins/do_tasks.less @@ -57,7 +57,8 @@ ul.page-attributes { svg { width: 20px; - margin-top: 2px; + height: 20px; // for IE 11 + margin-bottom: 2px; path { fill: @ini_nav_menu_hover_color; diff --git a/css/plugins/starred.less b/css/plugins/starred.less index a67610c..49758de 100644 --- a/css/plugins/starred.less +++ b/css/plugins/starred.less @@ -37,7 +37,7 @@ nav.nav-starred { margin-left: 0; svg { - vertical-align: middle; + vertical-align: text-top; } } } From 8e5fef321fe788b9b79979ba94beaef78a56472f Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Mon, 8 May 2017 15:38:25 +0200 Subject: [PATCH 07/11] SPR-950: Headerstyling in Mobile optimieren --- css/area_nav-page-attributes.less | 2 +- css/area_nav-usertools.less | 17 ++++++----------- css/plugins/do_tasks.less | 27 ++++++++++++++++----------- css/plugins/starred.less | 16 ++++++++++------ 4 files changed, 33 insertions(+), 29 deletions(-) diff --git a/css/area_nav-page-attributes.less b/css/area_nav-page-attributes.less index b7ab433..667cdbf 100644 --- a/css/area_nav-page-attributes.less +++ b/css/area_nav-page-attributes.less @@ -19,7 +19,6 @@ > li { .btn-usertools-wrapper(); // uniform li - .btn-usertools-num(); position: relative; float: left; @@ -70,6 +69,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 ef25bf5..65e252e 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,6 +53,10 @@ margin-bottom: @headericons-margin-xxs; } + @media @screen_max-xxs { + margin-bottom: (@headericons-margin-xxs - .2); + } + > span, > a { display: block; @@ -69,14 +72,6 @@ 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; } @@ -118,7 +113,7 @@ @media @screen_max-xs { position: absolute; top: @headericons-margin-xxs; - right: 2.9rem; + right: (@toggle-size + @headericons-margin-xxs + @space-max-xlg + .5); // 1.75rem + .45 + .5 + (button login/out margin-right) overflow: hidden; white-space: nowrap; margin: -1px 0 0; @@ -126,7 +121,7 @@ @media @screen_max-xxs { left: -10px; - right: (@toggle-size + @headericons-margin-xxs); + right: (@toggle-size + @headericons-margin-xxs); // 1.75rem + .45rem width: auto; } diff --git a/css/plugins/do_tasks.less b/css/plugins/do_tasks.less index 6f63908..87012de 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; + 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-color: @ini_nav_menu_hover_bg; &::before { content: ''; // remove when fontello is removed from usertools @@ -55,18 +60,18 @@ ul.page-attributes { } } + button { + background-color: @ini_nav_menu_hover_bg; + } + svg { - width: 20px; - height: 20px; // for IE 11 + 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 { @@ -87,7 +92,7 @@ ul.page-attributes { } } - @media @screen_max-sm { + @media @screen_max-xs { display: none; } } // user-task diff --git a/css/plugins/starred.less b/css/plugins/starred.less index 49758de..7e3bada 100644 --- a/css/plugins/starred.less +++ b/css/plugins/starred.less @@ -4,12 +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_hover_color; + .starred { + display: block; + padding-top: .05rem; + + svg { + width: 1.6em; + height: 1.6em; + font-size: 0.82rem; + fill: @ini_nav_menu_hover_color; + } } a:hover, From 2217bea00dab056489d84727a4462836407a0d8e Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Thu, 11 May 2017 15:17:01 +0200 Subject: [PATCH 08/11] SPR-908: QS - do plugin mit angezeigter table --- css/area_nav-page-attributes.less | 1 + css/plugins/do_tasks.less | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/css/area_nav-page-attributes.less b/css/area_nav-page-attributes.less index 667cdbf..a36e400 100644 --- a/css/area_nav-page-attributes.less +++ b/css/area_nav-page-attributes.less @@ -19,6 +19,7 @@ > li { .btn-usertools-wrapper(); // uniform li + .btn-usertools-num(); position: relative; float: left; diff --git a/css/plugins/do_tasks.less b/css/plugins/do_tasks.less index 87012de..211e656 100755 --- a/css/plugins/do_tasks.less +++ b/css/plugins/do_tasks.less @@ -102,4 +102,19 @@ ul.page-attributes { .plugin__do_usertasks_list { z-index: 5; + 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%; + } + } } From 6724d6913025e007457d74ae651268bb46e0b2b7 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Thu, 11 May 2017 15:22:30 +0200 Subject: [PATCH 09/11] after Merge branch 'master': do_tasks.less ohne z-index --- css/plugins/do_tasks.less | 1 - 1 file changed, 1 deletion(-) diff --git a/css/plugins/do_tasks.less b/css/plugins/do_tasks.less index 211e656..53ea3ec 100755 --- a/css/plugins/do_tasks.less +++ b/css/plugins/do_tasks.less @@ -101,7 +101,6 @@ ul.page-attributes { } .plugin__do_usertasks_list { - z-index: 5; background-color: transparent; @media @screen_max-sm { From 1b45b4fd79d6105d1bb6697994309044d0262a5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jana=20Deutschla=CC=88nder?= Date: Thu, 11 May 2017 16:16:27 +0200 Subject: [PATCH 10/11] orthographically adjustments in comments --- css/plugins/edittable.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/plugins/edittable.less b/css/plugins/edittable.less index 487c003..04907ec 100644 --- a/css/plugins/edittable.less +++ b/css/plugins/edittable.less @@ -10,7 +10,7 @@ position: relative; // for IE z-index: 1; // for IE float: left; - margin-top: -1.46rem !important; // overwrite inline stales + margin-top: -1.46rem !important; // overwrite inline styles form div.no { button, @@ -22,7 +22,7 @@ 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: 0; // for best position of edit-tab beneath table padding-right: .3em; transition: @transition background-color, @transition border-color, @transition color; From c0ecc7ec5b23a4c61580e7d49b29757a4442389c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jana=20Deutschla=CC=88nder?= Date: Thu, 11 May 2017 16:30:07 +0200 Subject: [PATCH 11/11] comments corrections --- css/area_main-content-secedit.less | 4 ++-- css/plugins/edittable.less | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/css/area_main-content-secedit.less b/css/area_main-content-secedit.less index 8725449..6101952 100644 --- a/css/area_main-content-secedit.less +++ b/css/area_main-content-secedit.less @@ -1,5 +1,5 @@ /** - * This styles the "section editing button" (data-plugin) + * This styles the "section editing button" (if not added by data-plugin) */ @@ -8,7 +8,7 @@ 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/plugins/edittable.less b/css/plugins/edittable.less index cdd0e3c..bba123d 100644 --- a/css/plugins/edittable.less +++ b/css/plugins/edittable.less @@ -21,7 +21,7 @@ border-radius: 0 0 @fix_border-radius @fix_border-radius; color: @ini_existing; font-size: @font-size-small; - margin-top: -1px; // 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;