From 83efa0de010dbd4219c46aa24e98e0c7f68bf1c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jana=20Deutschl=C3=A4nder?= <deutschlaender@cosmocode.de>
Date: Thu, 5 Jan 2017 18:23:56 +0100
Subject: [PATCH] mobile view part 1

---
 conf/default.php               |  2 ++
 css/area_nav-pagetools.less    |  2 +-
 css/area_sidetools.less        | 31 ++++++++++++++++++++++++----
 css/base_structure.less        | 37 ++++++++++++++++++++++++++++++++++
 css/plugins/magic-matcher.less |  9 +++++++++
 tpl/main-sidebar-logo.php      |  7 +++++--
 6 files changed, 81 insertions(+), 7 deletions(-)

diff --git a/conf/default.php b/conf/default.php
index fff2ca5..04268b6 100755
--- a/conf/default.php
+++ b/conf/default.php
@@ -5,6 +5,8 @@
  */
 
 $conf['logo']             = 'logo.png';
+$conf['mobile_logo']      = 'images/fav/favicon-32x32.png';
+
 $conf['logo_spacer']      = 'logo_spacer.png';
 
 $conf['discussionPage']   = 'discussion:@ID@';
diff --git a/css/area_nav-pagetools.less b/css/area_nav-pagetools.less
index c91c25a..e95c33f 100755
--- a/css/area_nav-pagetools.less
+++ b/css/area_nav-pagetools.less
@@ -156,6 +156,6 @@ nav#dokuwiki__pagetools{
 
 @media @screen_max-md {
     nav#dokuwiki__pagetools {
-        right: 0;
+        right: 8px;
     }
 }
diff --git a/css/area_sidetools.less b/css/area_sidetools.less
index 0bca9ac..3193fb5 100644
--- a/css/area_sidetools.less
+++ b/css/area_sidetools.less
@@ -55,10 +55,29 @@
             transition: @transition background-color;
         }
 
-        + ul {
-            margin-top: .5em;
-            margin-bottom: .25em;
+        + ul,+ div {
+            height: auto;
+            overflow: hidden;
         }
+
+        &.opened {
+            + ul, + div {
+                height: auto;
+                overflow: hidden;
+            }
+            + ul {
+                margin-top: .5em;
+                margin-bottom: .25em;
+            }
+        }
+
+        &.closed {
+            + ul, + div {
+                height: 0;
+                padding: 0;
+            }
+        }
+
     }
 
 
@@ -78,6 +97,10 @@
         background-color: @background_page-header;
         border: 1px solid @color-border;
         padding: .4rem;
+        font-size: .8rem;
+        *{
+            font-size: inherit;
+        }
 
         .bchead,
         .bcsep {
@@ -169,4 +192,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/css/base_structure.less b/css/base_structure.less
index 72c0a9c..c0318d2 100755
--- a/css/base_structure.less
+++ b/css/base_structure.less
@@ -193,3 +193,40 @@
     }
 }
 
+
+@media @screen_max-md {
+
+    .container {
+        margin: 0 2.5rem 0 1.25rem;
+    }
+
+    #dokuwiki__usertools{
+        margin-top: 0;
+        max-width: 75%;
+        position: absolute;
+        top: 0;
+    }
+
+    .content{
+        position: relative;
+        #dokuwiki__pagetools{
+            top: 0;
+
+        }
+    }
+
+    #dokuwiki__header{
+        .logo{
+            width: 200px;
+            max-width: 33%;
+            margin: .8rem 0;
+        }
+    }
+
+    .tools{
+        .main-sidebar{
+            display: none;
+        }
+    }
+}
+
diff --git a/css/plugins/magic-matcher.less b/css/plugins/magic-matcher.less
index d1963b1..0ed1723 100755
--- a/css/plugins/magic-matcher.less
+++ b/css/plugins/magic-matcher.less
@@ -77,6 +77,15 @@ a.jiralink {
     }
 }
 
+@media @screen_max-md {
+    #dokuwiki_magic-matcher {
+        position: relative;
+        .container{
+            margin: .8rem 0 -5px;
+        }
+    }
+}
+
 
 
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
diff --git a/tpl/main-sidebar-logo.php b/tpl/main-sidebar-logo.php
index b740aa4..5408ddd 100755
--- a/tpl/main-sidebar-logo.php
+++ b/tpl/main-sidebar-logo.php
@@ -4,8 +4,11 @@
 
     /* homepage logo should not link to itself (BITV accessibility requirement) */
     if (strcmp(wl(), $_SERVER['REQUEST_URI']) === 0 ){
-        echo '<img src="'.ml(tpl_getConf('logo')).'" alt="'.tpl_getLang('adjunct_start_logo_text').$conf['title'].'" />';
+        echo '<img class="mobile-hide" src="'.ml(tpl_getConf('logo')).'" alt="'.tpl_getLang('adjunct_start_logo_text').$conf['title'].'" />';
+        echo '<img class="mobile-only" src="'.tpl_getMediaFile(array(':wiki:favicon-32x32.png', 'images/fav/favicon-32x32.png')).'" alt="'.tpl_getLang('adjunct_start_logo_text').$conf['title'].'" />';
+
     } else{
-        tpl_link( wl(),'<img src="'.ml(tpl_getConf('logo')).'" alt="'.$conf['title'].tpl_getLang('adjunct_linked_logo_text').'" />','accesskey="h" title="[H]"' );
+        tpl_link( wl(),'<img class="mobile-hide" src="'.ml(tpl_getConf('logo')).'" alt="'.$conf['title'].tpl_getLang('adjunct_linked_logo_text').'" />','accesskey="h" title="[H]"' );
+        tpl_link( wl(),'<img class="mobile-only" src="'.tpl_getMediaFile(array(':wiki:favicon-32x32.png', 'images/fav/favicon-32x32.png')).'" alt="'.$conf['title'].tpl_getLang('adjunct_linked_logo_text').'" />','accesskey="h" title="[H]"' );
     }
     echo "<hr class=\"structure\" /></div>";