From b3db3daf9103e26e2fe7fc03e806515f4355d526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Wed, 8 Nov 2017 20:59:19 +0100
Subject: [PATCH] Add fix for nc<13 app menu
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 css/comp-appnav.scss | 45 ++++++++++++++++++++++++++++++++++++++++++++
 css/nc11.scss        | 15 ---------------
 css/style.scss       |  2 ++
 3 files changed, 47 insertions(+), 15 deletions(-)
 create mode 100644 css/comp-appnav.scss
 delete mode 100644 css/nc11.scss

diff --git a/css/comp-appnav.scss b/css/comp-appnav.scss
new file mode 100644
index 000000000..49b0b2543
--- /dev/null
+++ b/css/comp-appnav.scss
@@ -0,0 +1,45 @@
+/*
+ * @copyright Copyright (c) 2017 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * Hotfix for support <NC13 with new app sidebar
+ */
+#app-navigation {
+  .app-navigation-entry-menu.open {
+    ul li a {
+      background-position: 10px center;
+      padding: 0 10px 0 36px !important;
+    }
+  }
+  .app-navigation-entry-edit {
+    display: none;
+  }
+  .editing {
+    .app-navigation-entry-edit {
+      display: block;
+      position: absolute;
+      background: $color-main-background;
+      height: auto;
+      z-index: 250;
+    }
+  }
+}
diff --git a/css/nc11.scss b/css/nc11.scss
deleted file mode 100644
index 78fe2a017..000000000
--- a/css/nc11.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-// maybe keep those just for nc11/12 support?
-.app-navigation-entry-utils {
-  .app-navigation-entry-utils-menu-button {
-    display: block !important; // TODO: is this needed?
-  }
-
-  .app-navigation-entry-utils-menu-share {
-    display: flex !important;
-    padding: 14px;
-    opacity: 0.5;
-  }
-}
-.app-navigation-entry-menu ul {
-  flex-direction: row;
-}
\ No newline at end of file
diff --git a/css/style.scss b/css/style.scss
index 5a02b7192..dd2632d03 100644
--- a/css/style.scss
+++ b/css/style.scss
@@ -1196,3 +1196,5 @@ input.input-inline {
 .ui-select-dropdown.select2-drop-active {
 	opacity: 1 !important;
 }
+
+@import 'comp-appnav.scss';
\ No newline at end of file