From 4f626e3342f190c4331a0225c8b993ffc6c8d1eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jana=20Deutschl=C3=A4nder?= Date: Tue, 26 Sep 2017 12:39:45 +0200 Subject: [PATCH 1/6] SPR-950 changes for mobile header, Bugfix edit Mode of document --- css/area_header.less | 15 +++++++++++++++ css/area_nav-page-attributes.less | 4 ++++ css/area_nav-pagetools.less | 4 ++++ css/area_nav-usertools.less | 4 +++- css/base_design.less | 4 ++++ css/plugins/edit.less | 20 ++++++++++++++++++++ lang/de/lang.php | 1 + lang/en/lang.php | 1 + main.php | 5 +++++ 9 files changed, 57 insertions(+), 1 deletion(-) diff --git a/css/area_header.less b/css/area_header.less index 81eb17a..f524543 100755 --- a/css/area_header.less +++ b/css/area_header.less @@ -161,6 +161,21 @@ } } + /* + + + mobile select for doku wiki tools + + + */ + .menu-tool-select { + position: relative; + z-index: 1000; + display: none; + @media @screen_max-xxs { + display: block; + } + + select { + display: block; + width:100%; + } + } + /* + + + + + with magic matcher + + + + + */ &.has-magicmatcher { diff --git a/css/area_nav-page-attributes.less b/css/area_nav-page-attributes.less index a36e400..9074226 100644 --- a/css/area_nav-page-attributes.less +++ b/css/area_nav-page-attributes.less @@ -72,5 +72,9 @@ top: -.6em; font-size: @font-size-very-small; } + + &:empty { + display: none; + } } } diff --git a/css/area_nav-pagetools.less b/css/area_nav-pagetools.less index 56b1c5e..7cd1529 100755 --- a/css/area_nav-pagetools.less +++ b/css/area_nav-pagetools.less @@ -41,6 +41,10 @@ nav#dokuwiki__pagetools { right: 8px; } + @media @screen_max-xxs { + display: none; + } + ul { li { @page-tools_svg-size: 25px; diff --git a/css/area_nav-usertools.less b/css/area_nav-usertools.less index 1750625..2710719 100755 --- a/css/area_nav-usertools.less +++ b/css/area_nav-usertools.less @@ -50,11 +50,13 @@ @media @screen_max-xs { display: block; float: none; + margin-bottom: @headericons-margin-xxs; } @media @screen_max-xxs { margin-bottom: (@headericons-margin-xxs - .2); + display: none; } > span, @@ -110,7 +112,7 @@ @media @screen_max-xxs { left: -10px; - right: (@toggle-size + @headericons-margin-xxs); // 1.75rem + .45rem + right: 0; width: auto; padding-top: .35rem; } diff --git a/css/base_design.less b/css/base_design.less index 28155df..2cbe4df 100755 --- a/css/base_design.less +++ b/css/base_design.less @@ -70,6 +70,10 @@ html, body { @media @screen_max-xs { padding-left: @margin-small; } + + @media @screen_max-xxs { + padding-right: @margin-small; + } } .content #dokuwiki__pagetools { diff --git a/css/plugins/edit.less b/css/plugins/edit.less index ee99b30..888ab5c 100644 --- a/css/plugins/edit.less +++ b/css/plugins/edit.less @@ -42,6 +42,26 @@ color: @color-editBox; } } + + @media @screen_max-xs { + div.summary { + label[for=edit__summary] { + white-space: normal; + display: block; + width: 100%; + span { + display: inline-block; + padding-bottom: .4rem; + } + input#edit__summary{ + max-width: 100%; + box-sizing: border-box; + } + } + } + } + + } } diff --git a/lang/de/lang.php b/lang/de/lang.php index 0f94a43..bbfb5ab 100755 --- a/lang/de/lang.php +++ b/lang/de/lang.php @@ -24,6 +24,7 @@ $lang['head_breadcrumb_youarehere'] = 'Standortanzeiger'; $lang['head_menu_trace'] = 'Zuletzt Angesehen'; $lang['head_meta_box'] = 'Metainformationen zur Seite'; $lang['head_menu_starred'] = 'gemerkte Seite'; +$lang['head_menu_tool-select'] = 'Werkzeuge'; $lang['jump_to_quicksearch'] = 'Springe zur Schnellsuche'; diff --git a/lang/en/lang.php b/lang/en/lang.php index c0bdf34..7474e88 100755 --- a/lang/en/lang.php +++ b/lang/en/lang.php @@ -24,6 +24,7 @@ $lang['head_breadcrumb_youarehere'] = 'location indicator'; $lang['head_menu_trace'] = 'Last Visited Pages'; $lang['head_meta_box'] = 'meta data for this page'; $lang['head_menu_starred'] = 'Starred Pages'; +$lang['head_menu_tool-select'] = 'Tools'; $lang['jump_to_quicksearch'] = 'Jump to quick search'; diff --git a/main.php b/main.php index b72ec5f..21c9ada 100755 --- a/main.php +++ b/main.php @@ -136,6 +136,11 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";

+ +
+
+ +
From ccbf6d932d4d39ad83829bbceecd225f6bf57e17 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Mon, 16 Oct 2017 11:42:54 +0200 Subject: [PATCH 2/6] allgemein: schriften --- css/base_structure.less | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/css/base_structure.less b/css/base_structure.less index a671776..2b0cfe9 100755 --- a/css/base_structure.less +++ b/css/base_structure.less @@ -19,13 +19,13 @@ @media @screen_min-xxs { html { - font-size: 114%; //16px + font-size: 100%; //16px } } @media @screen_min-xs { html { - font-size: 114%; //16px + font-size: 100%; //16px } } @@ -40,7 +40,6 @@ .make-grid(md); html { font-size: 87.5%; //14px - //font-size: 81.25%; //13px } } From 7e5b31af0fa893735dfe7d0c412e3f8c915f3897 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Mon, 16 Oct 2017 12:05:56 +0200 Subject: [PATCH 3/6] qs mainnav in mediaqueries --- css/area_main-sidebar-nav.less | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/css/area_main-sidebar-nav.less b/css/area_main-sidebar-nav.less index bc1c7fb..f894e59 100755 --- a/css/area_main-sidebar-nav.less +++ b/css/area_main-sidebar-nav.less @@ -313,10 +313,32 @@ } +/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* max-width: 1440px */ + +@media @screen_max-xlg { + #dokuwiki__aside { + div.nav { + a { + margin-left: 1px; + } + } + } +} + + /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* max-width: 1023px */ @media @screen_max-md { + #dokuwiki__aside { + div.nav { + a { + margin-left: 0; + } + } + } + body.show-mobile-sidebar { #dokuwiki__aside { display: block !important; From 5b3e899e4c60edf9b51667b4b48220ba0c620b1e Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Mon, 16 Oct 2017 14:10:02 +0200 Subject: [PATCH 4/6] qs image-detail DL --- css/template_detail.less | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/css/template_detail.less b/css/template_detail.less index 410e937..97ef1ce 100644 --- a/css/template_detail.less +++ b/css/template_detail.less @@ -60,7 +60,6 @@ /* + + + + + meta data + + + + + */ div.img_detail { - @media screen { /* vertical minus margin of .img-detail corresponds to the padding of .page */ background-color: @ini_background_page_header; @@ -85,7 +84,6 @@ } dl { - @media screen { .display-flex(); .flex-wrap(); @@ -112,18 +110,16 @@ width: 40%; } } - @media screen { - dd { - padding-left: (@small-spacing * 2); + dd { + padding-left: (@small-spacing * 2); - @media @screen_min-xs { - width: 66.6%; - } + @media @screen_min-xs { + width: 66.6%; + } - @media @screen_max-xs { - width: 59.9%; - } + @media @screen_max-xs { + width: 59.9%; } } } From 0dbbf264a982c7073f9b84ce0942c89f76ea5143 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Mon, 16 Oct 2017 14:52:13 +0200 Subject: [PATCH 5/6] empty lines addes --- main.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/main.php b/main.php index 21c9ada..7374d5f 100755 --- a/main.php +++ b/main.php @@ -130,6 +130,7 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
@@ -149,6 +150,7 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
@@ -156,6 +158,7 @@ $classWideContent = ($ACT === "show") ? "": "wide-content "; @@ -163,6 +166,7 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
+ @@ -192,6 +196,7 @@ $classWideContent = ($ACT === "show") ? "": "wide-content "; include('tpl/main-sidebar-search.php'); ?> +
@@ -214,6 +219,8 @@ $classWideContent = ($ACT === "show") ? "": "wide-content "; ?> Date: Mon, 16 Oct 2017 14:57:50 +0200 Subject: [PATCH 6/6] header: toggle + select for mobile menu, logo added --- detail.php | 44 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/detail.php b/detail.php index 3e909ae..d69c24a 100755 --- a/detail.php +++ b/detail.php @@ -92,7 +92,13 @@ include('tpl/favicon_tiles.php');
- + + + +
+ + + ?>
+
+
+ +
+ +
+
@@ -153,8 +166,6 @@ include('tpl/favicon_tiles.php');
- -
@@ -173,19 +184,35 @@ include('tpl/favicon_tiles.php'); /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* Include Hook: sidebarheader.html */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ - tpl_includeFile('sidebarheader.html') + tpl_includeFile('sidebarheader.html') ?>
-
+ + getInclude( + 'sidebarheader', + '
', + '
' + ); + ?> + + + getInclude( + 'sidebarfooter', + '
', + '
' + ); ?>
@@ -194,6 +221,7 @@ include('tpl/favicon_tiles.php');
+