From b1e08fa684e028eafffea51d68f19c15707e6843 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Tue, 2 May 2017 12:09:47 +0200 Subject: [PATCH 1/8] Merge branch 'SPR-950' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master - check --- css/area_header.less | 12 +----------- css/area_main-sidebar-search.less | 21 ++++++++++++++++----- css/area_nav-usertools.less | 13 +++++++++++-- css/base_mixins.less | 2 +- 4 files changed, 29 insertions(+), 19 deletions(-) diff --git a/css/area_header.less b/css/area_header.less index eedc601..9a560ab 100755 --- a/css/area_header.less +++ b/css/area_header.less @@ -142,33 +142,23 @@ a { .fontello(); .icon-menu(); + .btn-hover(); display: block; min-height: @toggle-size; min-width: @toggle-size; box-sizing: border-box; - background-color: #fff; border: 1px solid @ini_border; border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius - color: @ini_nav_menu_color; font-size: 1rem; text-align: center; text-decoration: none; line-height: 1; - transition: @transition color, @transition background-color, @transition border-color; &::before { font-size: 1.5rem; margin: .1rem 0 0; } - - &:hover, - &:active, - &:focus { - background-color: @ini_nav_menu_hover_bg; - border-color: @ini_nav_menu_hover_color; - color: @ini_nav_menu_hover_color; - } } } diff --git a/css/area_main-sidebar-search.less b/css/area_main-sidebar-search.less index 337ef5b..70987bf 100644 --- a/css/area_main-sidebar-search.less +++ b/css/area_main-sidebar-search.less @@ -184,14 +184,12 @@ @media @screen_min-md { .wide-content { .search.main-sidebar { - display: block; - p.toggleSearch { position: relative; z-index: 1; display: block; float: left; - width: auto; + width: 100%; } form { @@ -217,9 +215,22 @@ @media @screen_max-md { - .show-mobile-sidebar { + // show when toggled + body.show-mobile-sidebar { + p.toggleSearch { + display: none !important; + } + .search.main-sidebar { - display: block; + display: block !important; + position: relative; + z-index: 1; + margin-left: -1px; + margin-right: -1px; + + form { + margin-bottom: 1rem; + } } } } diff --git a/css/area_nav-usertools.less b/css/area_nav-usertools.less index 26f5a1a..a18909f 100755 --- a/css/area_nav-usertools.less +++ b/css/area_nav-usertools.less @@ -33,6 +33,14 @@ padding: 0; margin: (@very-small-spacing * 2) -.25rem 0 0; + @media @screen_max-md { + margin-right: .5rem; + } + + @media @screen_max-xxs { + margin-right: -.3rem; + } + li { .btn-usertools-wrapper(); // uniform li .btn-usertools-num(); @@ -108,7 +116,7 @@ @media @screen_max-xs { position: absolute; top: @headericons-margin-xxs; - right: (@toggle-size + @headericons-margin-xxs); + right: 2.9rem; overflow: hidden; white-space: nowrap; margin: -1px 0 0; @@ -116,6 +124,7 @@ @media @screen_max-xxs { left: -10px; + right: (@toggle-size + @headericons-margin-xxs); width: auto; } @@ -178,11 +187,11 @@ &:focus, &:active { background-color: @ini_nav_menu_hover_color; - border-color: @ini_nav_menu_hover_color; color: @ini_nav_menu_hover_bg; &::before { opacity: 1; + border-color: @ini_nav_menu_hover_bg; } bdi, diff --git a/css/base_mixins.less b/css/base_mixins.less index 9725764..e17ee37 100755 --- a/css/base_mixins.less +++ b/css/base_mixins.less @@ -151,7 +151,7 @@ &:active, &:focus { background-color: @ini_nav_menu_hover_color; - border-color: @ini_nav_menu_hover_bg; + border-color: @ini_nav_menu_hover_color; color: @ini_nav_menu_hover_bg; .prefix { From 320fcb9f7c974e6672cbd180abd7cdbdc9de026e Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Tue, 2 May 2017 12:31:01 +0200 Subject: [PATCH 2/8] Merge branch 'SPR-953' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master - check --- css/area_main-sidebar-nav.less | 58 ++++++++++++++----------------- css/area_main-sidebar-search.less | 1 + 2 files changed, 27 insertions(+), 32 deletions(-) diff --git a/css/area_main-sidebar-nav.less b/css/area_main-sidebar-nav.less index f5b4eea..143f232 100755 --- a/css/area_main-sidebar-nav.less +++ b/css/area_main-sidebar-nav.less @@ -300,26 +300,6 @@ } -/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ -/* max-width: 1439px */ - -@media @screen_max-xlg { - #dokuwiki__aside { - nav { - li:not([class]), - .li { - font-size: @font-size-default; - - * { - font-size: inherit; - font-weight: inherit; - } - } - } - } -} - - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* max-width: 1023px */ @@ -359,21 +339,35 @@ } } + /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ -/* max-width: 1439px */ +/* max-width: 768px */ -@media @screen_max-xlg { - #dokuwiki__aside { - nav { - li:not([class]), - .li { - font-size: @font-size-default; +@media @screen_max-xs { + body.show-mobile-sidebar { + .page-wrapper > .tools { + top: 2.5rem; + } - * { - font-size: inherit; - font-weight: inherit; - } - } + #dokuwiki__aside { + left: 1.25rem; + right: 1.25rem; + width: auto; + max-width: 100%; + margin-top: -1rem; + } + } +} + + +/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* max-width: 480px */ + +@media @screen_max-xxs { + body.show-mobile-sidebar { + #dokuwiki__aside { + left: 4px; + right: 4px; } } } diff --git a/css/area_main-sidebar-search.less b/css/area_main-sidebar-search.less index 70987bf..d92cedd 100644 --- a/css/area_main-sidebar-search.less +++ b/css/area_main-sidebar-search.less @@ -4,6 +4,7 @@ * @author Jana Deutschlaender */ + .search.main-sidebar { @main-ico-dummy: @font-size-big + @margin-small*2; //FIXME copied from area_main-sidebar-nav @icon-size: @page-header_height; From 22063034402fa45fdd744e96a78cecbebedf9db8 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Tue, 2 May 2017 12:33:20 +0200 Subject: [PATCH 3/8] comments --- css/area_main-sidebar-search.less | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/css/area_main-sidebar-search.less b/css/area_main-sidebar-search.less index d92cedd..77a7552 100644 --- a/css/area_main-sidebar-search.less +++ b/css/area_main-sidebar-search.less @@ -181,8 +181,12 @@ } -/* + + + + + wide page content + + + + + */ +/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* min-width: 1024px */ + @media @screen_min-md { + + // wide page content .wide-content { .search.main-sidebar { p.toggleSearch { @@ -215,7 +219,11 @@ } +/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* max-width: 1023px */ + @media @screen_max-md { + // show when toggled body.show-mobile-sidebar { p.toggleSearch { From 4ff30cee372087939d09633c164ffeee2282d99e Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Tue, 2 May 2017 12:57:30 +0200 Subject: [PATCH 4/8] SPR-908: firefox aside padding in nav --- css/area_main-sidebar-nav.less | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/css/area_main-sidebar-nav.less b/css/area_main-sidebar-nav.less index 143f232..1243b21 100755 --- a/css/area_main-sidebar-nav.less +++ b/css/area_main-sidebar-nav.less @@ -91,10 +91,9 @@ // the toggle element a { + cursor: pointer; display: table; width: 100%; - - cursor: pointer; min-height: @icon-size + @margin-small; opacity: 1; border: 1px solid transparent; @@ -103,6 +102,8 @@ 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) + padding-bottom: .4rem; + padding-top: .4rem; transition: @transition color, @transition background-color, @transition border-color; span { @@ -200,6 +201,7 @@ min-width: @menu-margin; height: @icon-size; text-align: center; + vertical-align: middle; color: inherit; &::after { @@ -217,7 +219,7 @@ // wordbreak too late in IE 10 @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) { - top: .5rem; + top: 0; bottom: .5rem; height: 100%; margin: 0; From f8aefa32bcf359fa28b464e16b8b973882ec50e2 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Tue, 2 May 2017 13:18:37 +0200 Subject: [PATCH 5/8] SPR-908: pagetools focus --- css/area_nav-pagetools.less | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/css/area_nav-pagetools.less b/css/area_nav-pagetools.less index d86af60..43f71ff 100755 --- a/css/area_nav-pagetools.less +++ b/css/area_nav-pagetools.less @@ -21,6 +21,7 @@ .pagetools-item(img_backto, 12); */ + #dokuwiki__aside { @media @screen_max-md { display: none !important; @@ -82,6 +83,27 @@ nav#dokuwiki__pagetools { background-color: transparent; } + &:focus { + box-shadow: @box-shadow; + background-image: none; + background-color: @ini_background; + color: @ini_existing; + padding-top: 2px; + padding-bottom: 2px; + padding-right: .1rem; + + span { + position: relative; + display: inline; + width: auto; + height: auto; + } + + svg { + fill: @ini_existing; + } + } + span { .sr-only(); From 637578a52c33d9b3fc52dcbbed9a98888a8da5d5 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Tue, 2 May 2017 13:41:37 +0200 Subject: [PATCH 6/8] SPR-908: aside font-size in mobile --- css/area_main-sidebar-nav.less | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/css/area_main-sidebar-nav.less b/css/area_main-sidebar-nav.less index 1243b21..618e8c3 100755 --- a/css/area_main-sidebar-nav.less +++ b/css/area_main-sidebar-nav.less @@ -256,6 +256,7 @@ span.lbl { display: table-cell; + font-size: inherit; padding-left: .5rem; } } @@ -325,6 +326,10 @@ &:first-child { margin-top: 1.2rem; } + + a { + font-size: @font-size-small; + } } a.nav { @@ -335,6 +340,7 @@ div.nav-panel, a.nav { + margin-top: 0; padding-right: .8em; } } @@ -370,6 +376,12 @@ #dokuwiki__aside { left: 4px; right: 4px; + + > nav { + a { + font-size: @font-size-default; + } + } } } } From b3aa151af476d317b6ae1192643feec22bad29c1 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Tue, 2 May 2017 14:05:13 +0200 Subject: [PATCH 7/8] SPR-908: edit-button pixelbug --- css/plugins/edittable.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/css/plugins/edittable.less b/css/plugins/edittable.less index 487c003..0a2c2e4 100644 --- a/css/plugins/edittable.less +++ b/css/plugins/edittable.less @@ -26,6 +26,10 @@ 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 2d411b738249ee07c2eaeffc6d27b737dfaaa710 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Tue, 2 May 2017 14:45:39 +0200 Subject: [PATCH 8/8] SPR-976: focus Pagetools --- css/area_nav-pagetools.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/area_nav-pagetools.less b/css/area_nav-pagetools.less index 43f71ff..5a0dc24 100755 --- a/css/area_nav-pagetools.less +++ b/css/area_nav-pagetools.less @@ -90,7 +90,7 @@ nav#dokuwiki__pagetools { color: @ini_existing; padding-top: 2px; padding-bottom: 2px; - padding-right: .1rem; + padding-right: 0; span { position: relative;