+
Date: Wed, 4 Jan 2017 15:28:47 +0100 Subject: [PATCH 5/9] ignore unzipped fontello folder --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b5b25cf..dc3c123 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ ._.DS_Store /._* ._* +fonts/icons/fontello From 605f78d818a1464b484a3901c24c1ab13af8d1cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jana=20Deutschl=C3=A4nder?= Date: Wed, 4 Jan 2017 16:04:15 +0100 Subject: [PATCH 6/9] debug show or hide sidebar in edit mode --- css/area_footer.less | 12 +++++++++++- main.php | 3 --- tpl/nav-main.php | 2 ++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/css/area_footer.less b/css/area_footer.less index 8a14a1a..6ad4f7a 100755 --- a/css/area_footer.less +++ b/css/area_footer.less @@ -42,13 +42,23 @@ #dokuwiki__footer { .col-xs-12 { float: right; - width: 73%; + width: 100%; } .main-footer { padding: @margin-default 0; } } + + .showSidebar { + #dokuwiki__footer { + .col-xs-12 { + width: 73%; + } + } + } + + } diff --git a/main.php b/main.php index 2e4a625..5daf5a3 100755 --- a/main.php +++ b/main.php @@ -148,8 +148,6 @@ $showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show'); - -
@@ -223,7 +221,6 @@ $showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show');