Clean scss, use proper loading icon and menu position on narrow screens

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

1 files changed, 7 insertions, 2 deletions

diff --git a/core/js/js.js b/core/js/js.js
index fa92508ff7a..89f6f465ead 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -681,6 +681,7 @@ var OCP = {},
 	 * @returns {undefined}
 	 */
 	registerMenu: function($toggle, $menuEl, toggle) {
+		console.trace();
 		var self = this;
 		$menuEl.addClass('menu');
 		$toggle.on('click.menu', function(event) {
@@ -696,6 +697,9 @@ var OCP = {},
 				// close it
 				self.hideMenus();
 			}
+
+			$(event.currentTarget).addClass('openedMenu');
+
 			$menuEl.slideToggle(OC.menuSpeed, toggle);
 			OC._currentMenu = $menuEl;
 			OC._currentMenuToggle = $toggle;
@@ -730,6 +734,7 @@ var OCP = {},
 				}
 			});
 		}
+		$('.openedMenu').removeClass('openedMenu');
 		OC._currentMenu = null;
 		OC._currentMenuToggle = null;
 	},
@@ -1480,7 +1485,7 @@ function initCore() {
 			if(event.which === 1 && !event.ctrlKey && !event.metaKey) {
 				$page.find('img').remove();
 				$page.find('div').remove(); // prevent odd double-clicks
-				$page.prepend($('<div/>').addClass('icon-loading-small-dark'));
+				$page.prepend($('<div/>').addClass('icon-loading-small'));
 			} else {
 				// Close navigation when opening menu entry in
 				// a new tab
@@ -1702,7 +1707,7 @@ OC.PasswordConfirmation = {
 	requiresPasswordConfirmation: function() {
 		var serverTimeDiff = this.pageLoadTime - (nc_pageLoad * 1000);
 		var timeSinceLogin = moment.now() - (serverTimeDiff + (nc_lastLogin * 1000));
-		
+
 		// if timeSinceLogin > 30 minutes and user backend allows password confirmation
 		return (backendAllowsPasswordConfirmation && timeSinceLogin > 30 * 60 * 1000);
 	},