From 3e7800910f8007f33603361590068db80750910b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Raimund=20Schl=C3=BC=C3=9Fler?=
 <raimund.schluessler@mailbox.org>
Date: Thu, 16 Aug 2018 21:37:22 +0200
Subject: [PATCH] Rename icon to not interfere with icon-menu server class

---
 css/src/style.scss                    | 4 ++--
 img/src/{menu.svg => list.svg}        | 0
 js/app/controllers/taskscontroller.js | 2 +-
 templates/main.php                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename img/src/{menu.svg => list.svg} (100%)

diff --git a/css/src/style.scss b/css/src/style.scss
index 59fad94e..12d13e91 100644
--- a/css/src/style.scss
+++ b/css/src/style.scss
@@ -1314,8 +1314,8 @@ ol[dnd-list] {
 				padding: 0;
 				background-size: auto;
 
-				&.icon-menu {
-					@extend .icon-menu;
+				&.icon-list {
+					@extend .icon-list;
 				}
 
 				&.icon-calendar {
diff --git a/img/src/menu.svg b/img/src/list.svg
similarity index 100%
rename from img/src/menu.svg
rename to img/src/list.svg
diff --git a/js/app/controllers/taskscontroller.js b/js/app/controllers/taskscontroller.js
index 33ac362b..90926913 100644
--- a/js/app/controllers/taskscontroller.js
+++ b/js/app/controllers/taskscontroller.js
@@ -376,7 +376,7 @@
 					case 'manual':
 						return 'icon-manual';
 					default:
-						return 'icon-menu';
+						return 'icon-list';
 				}
 			};
 
diff --git a/templates/main.php b/templates/main.php
index b116f7b6..8a2c30a6 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -199,7 +199,7 @@
             <ul>
                 <li ng-click="setSortOrder($event, 'default')" ng-class="{active: settingsmodel.getById('various').sortOrder == 'default'}" class="handler">
                     <a>
-                        <span class="icon icon-menu"></span>
+                        <span class="icon icon-list"></span>
                         <span class="label"><?php p($l->t('Default')); ?></span>
                         <span class="icon sort-indicator" ng-class="{'icon-sort-up': settingsmodel.getById('various').sortDirection, 'icon-sort-down': !settingsmodel.getById('various').sortDirection}"></span>
                     </a>