From c152f80b93ff6d1443ca375197112cb496e77bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
 <skjnldsv@protonmail.com>
Date: Sat, 4 Nov 2017 13:12:18 +0100
Subject: [PATCH] Fix popover layout
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 core/css/apps.scss | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/core/css/apps.scss b/core/css/apps.scss
index 06a105971bb..c68bc488d2c 100644
--- a/core/css/apps.scss
+++ b/core/css/apps.scss
@@ -837,8 +837,25 @@ kbd {
 			font-weight: 300;
 			box-shadow: none;
 			width: 100%;
+			color: $color-main-text;
 			/* Override the app-navigation li opacity */
 			opacity: .7 !important;
+			[class^='icon-'],
+			[class*=' icon-'] {
+				/* Keep padding to define the width to
+				 assure correct position of a possible text */
+				padding: 18px 0 18px 36px;
+				min-width: 0; /* Overwrite icons*/
+				min-height: 0;
+				background-position: 10px center;
+			}
+			&[class^='icon-'],
+			&[class*=' icon-'] {
+				padding: 0 10px 0 36px !important;
+				min-width: 0; /* Overwrite icons*/
+				min-height: 0;
+				background-position: 10px center;
+			}
 			&:hover, &:focus, &.active {
 				opacity: 1 !important;
 			}
@@ -857,7 +874,6 @@ kbd {
 			}
 			/* Add padding if contains icon+text */
 			&:not(:empty) {
-				padding: 0 !important;
 				padding-right: 10px !important;
 			}
 			> img {
@@ -871,14 +887,12 @@ kbd {
 				}
 			}
 		}
-		[class^='icon-'],
-		[class*=' icon-']{
-			/* Keep padding to define the width to
-			 assure correct position of a possible text */
-			padding: 18px 0 18px 36px;
-			min-width: 0; /* Overwrite icons*/
-			min-height: 0;
-			background-position: 10px center;
+		> button {
+			padding: 0;
+			span {
+				opacity: 1;
+			}
 		}
+
 	}
 }