From 1e2a082cd29cef0f6a7c56402720fd005f2bf292 Mon Sep 17 00:00:00 2001
From: "John Molakvoæ (skjnldsv)" <skjnldsv@protonmail.com>
Date: Thu, 22 Feb 2018 12:13:35 +0100
Subject: Use popovermenu instead of dropdown and small fix to popovermenu
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 | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'core/css')

diff --git a/core/css/apps.scss b/core/css/apps.scss
index a92db4ed4ab..50c48d132ef 100644
--- a/core/css/apps.scss
+++ b/core/css/apps.scss
@@ -683,10 +683,9 @@ kbd {
 
 /* DROPDOWN ----------------------------------------------------------------- */
 .dropdown {
-	background: nc-darken($color-main-background, 8%);
-	border-bottom-left-radius: 5px;
-	border-bottom-right-radius: 5px;
-	box-shadow: 0 1px 1px $color-box-shadow;
+	background: $color-main-background;
+	border-radius: 0 0 $border-radius $border-radius;
+	filter: drop-shadow(0 1px 3px $color-box-shadow);
 	display: block;
 	margin-right: 0;
 	position: absolute;
@@ -868,17 +867,17 @@ kbd {
 				width: 16px;
 				padding: 0 10px;
 			}
+			/* checkbox/radio fixes */
+			> input.radio + label,
 			> input.checkbox + label {
 				padding: 0 !important;
-				&::before {
-					margin: -2px 12px 0;
-				}
+				width: 100%;
 			}
-			> input.radio + label {
-				padding: 0 !important;
-				&::before {
-					margin: -2px 11px 0;
-				}
+			> input.checkbox + label::before {
+				margin: -2px 12px 0;
+			}
+			> input.radio + label::before {
+				margin: -2px 11px 0;
 			}
 		}
 		> button {
-- 
cgit v1.2.3


From 3d2b3a13099a7949297543fe1950164897fcdb2e Mon Sep 17 00:00:00 2001
From: "John Molakvoæ (skjnldsv)" <skjnldsv@protonmail.com>
Date: Thu, 22 Feb 2018 12:24:55 +0100
Subject: fixup! Use popovermenu instead of dropdown and small fix to
 popovermenu
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 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'core/css')

diff --git a/core/css/apps.scss b/core/css/apps.scss
index 50c48d132ef..5b400c4629f 100644
--- a/core/css/apps.scss
+++ b/core/css/apps.scss
@@ -683,9 +683,10 @@ kbd {
 
 /* DROPDOWN ----------------------------------------------------------------- */
 .dropdown {
-	background: $color-main-background;
-	border-radius: 0 0 $border-radius $border-radius;
-	filter: drop-shadow(0 1px 3px $color-box-shadow);
+	background: nc-darken($color-main-background, 8%);
+	border-bottom-left-radius: 5px;
+	border-bottom-right-radius: 5px;
+	box-shadow: 0 1px 1px $color-box-shadow;
 	display: block;
 	margin-right: 0;
 	position: absolute;
-- 
cgit v1.2.3


From dab83c4a494f3c87200b086fceff364d16e85864 Mon Sep 17 00:00:00 2001
From: "John Molakvoæ (skjnldsv)" <skjnldsv@protonmail.com>
Date: Thu, 22 Feb 2018 15:41:40 +0100
Subject: Select in popover fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 apps/files_external/js/settings.js | 2 +-
 core/css/apps.scss                 | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'core/css')

diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index b0f71c03245..eaaed025104 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -33,7 +33,7 @@ var MOUNT_OPTIONS_DROPDOWN_TEMPLATE =
 	'			</span>'+
 	'		</li>'+
 	'		<li>'+
-	'			<span class="menuitem">'+
+	'			<span class="menuitem icon-search">'+
 	'				<label for="mountOptionsFilesystemCheck">{{t "files_external" "Check for changes"}}</label>'+
 	'				<select id="mountOptionsFilesystemCheck" name="filesystem_check_changes" data-type="int">'+
 	'					<option value="0">{{t "files_external" "Never"}}</option>'+
diff --git a/core/css/apps.scss b/core/css/apps.scss
index 5b400c4629f..f8c87eda43d 100644
--- a/core/css/apps.scss
+++ b/core/css/apps.scss
@@ -860,6 +860,10 @@ kbd {
 				line-height: 1.6em;
 				padding: 8px 0;
 			}
+			> select {
+				margin: 0;
+				margin-left: 6px;
+			}
 			/* Add padding if contains icon+text */
 			&:not(:empty) {
 				padding-right: 10px !important;
-- 
cgit v1.2.3