From 4a3538bbd854ccad51fa79d2ae060383f2bbe83d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Wed, 28 Mar 2018 10:41:00 +0200
Subject: [PATCH] Fix app menu, popovers and searchbox
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 core/css/header.scss | 24 ++++++++++++------------
 core/css/styles.scss |  5 +++--
 core/js/js.js        |  4 ----
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/core/css/header.scss b/core/css/header.scss
index 7aa4990823..228c6869d1 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -80,7 +80,7 @@
 		position: absolute;
 		max-width: 350px;
 		max-height: 280px;
-		right: 12px;
+		right: 5px;
 		top: 50px;
 		margin: 0;
 
@@ -98,7 +98,7 @@
 			width: 0;
 			position: absolute;
 			pointer-events: none;
-			right: 12px;
+			right: 10px;
 		}
 	}
 	.logo {
@@ -159,17 +159,17 @@
 	.header-right {
 		> div,
 		> form {
+			height: 100%;
 			position: relative;
 			> .menutoggle {
 				display: flex;
 				justify-content: center;
 				align-items: center;
-				width: 44px;
+				width: 50px;
 				height: 100%;
 				cursor: pointer;
 				opacity: 0.6;
 				padding: 0;
-				padding-right: 12px;
 				margin: 0;
 			}
 		}
@@ -224,14 +224,14 @@
 /* NAVIGATION --------------------------------------------------------------- */
 nav[role='navigation'] {
 	display: inline-block;
-	width: 44px;
-	height: 44px;
-	margin-left: -44px;
+	width: 50px;
+	height: 50px;
+	margin-left: -50px;
 }
 
 .header-left #navigation {
 	position: relative;
-	left: 22px; /* half the togglemenu */
+	left: 25px; /* half the togglemenu */
 	transform: translateX(-50%);
 	width: 160px;
 }
@@ -347,6 +347,7 @@ nav[role='navigation'] {
 	/* User menu on the right */
 	#expand {
 		opacity: 1; /* override icon opacity */
+		padding-right: 12px;
 
 		img {
 			opacity: .7;
@@ -438,7 +439,7 @@ nav[role='navigation'] {
 #appmenu {
 	display: inline-block;
 	width: auto;
-	min-width: 88px;
+	min-width: 50px;
 	height: 100%;
 	clear: both;
 
@@ -447,14 +448,14 @@ nav[role='navigation'] {
 		display: inline-block;
 		position: relative;
 		vertical-align: top !important;
-		height: 45px;
+		height: 100%;
 		cursor: pointer;
 
 		a {
 			position: relative;
 			display: inline-block;
 			margin: 0;
-			padding: 15px 12px;
+			padding: 15px 15px;
 			height: 20px;
 			text-align: center;
 			vertical-align: top !important;
@@ -496,7 +497,6 @@ nav[role='navigation'] {
 		border-radius: $border-radius;
 		border-top-left-radius: 0;
 		border-top-right-radius: 0;
-		margin-top: 5px;
 		color: rgba($color-main-text, .7);
 		width: auto;
 		left: 50%;
diff --git a/core/css/styles.scss b/core/css/styles.scss
index 134ee9476d..0bbd89f075 100644
--- a/core/css/styles.scss
+++ b/core/css/styles.scss
@@ -184,17 +184,18 @@ body {
 		padding: 3px;
 		padding-left: 25px;
 		padding-right: 20px;
-		background: transparent url('../img/actions/search-white.svg?v=1') no-repeat 6px center;
+		background: transparent url('../img/actions/search-white.svg?v=1') no-repeat center center;
 		color: $color-primary-text;
 		border: 0;
 		border-radius: $border-radius;
-		margin-top: 3px;
+		margin-top: 9px;
 		width: 0;
 		cursor: pointer;
 		-webkit-transition: all 100ms;
 		transition: all 100ms;
 		opacity: .6;
 		&:focus, &:active, &:valid {
+			background-position-x: 6px;
 			color: $color-primary-text;
 			width: 155px;
 			cursor: text;
diff --git a/core/js/js.js b/core/js/js.js
index 26dbbdb6e6..3d5f489895 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1553,10 +1553,6 @@ function initCore() {
 		if(appList.length-1-appCount >= 1) {
 			appCount--;
 		}
-		// show at least one icon
-		if(appCount < 1) {
-			appCount = 1;
-		}
 
 		$('#more-apps a').removeClass('active');
 		var lastShownApp;