Merge branch 'master' into autocomplete-gui

7 files changed, 21 insertions, 6 deletions

diff --git a/core/css/apps.scss b/core/css/apps.scss
index 4f17c91764e..159982e0bf1 100644
--- a/core/css/apps.scss
+++ b/core/css/apps.scss
@@ -864,6 +864,12 @@ kbd {
 				width: 16px;
 				padding: 0 10px;
 			}
+			> input.checkbox + label {
+				padding: 0 !important;
+				&::before {
+					margin: -2px 12px 0;
+				}
+			}
 		}
 		[class^='icon-'],
 		[class*=' icon-']{
diff --git a/core/css/guest.css b/core/css/guest.css
index 0c52d792f79..576efafec5f 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -389,6 +389,7 @@ form .warning input[type='checkbox']+label {
 	margin: 10px 0;
 	text-align: center;
 	width: 100%;
+	text-shadow: 0 0 2px rgba(0, 0, 0, .4); // better readability on bright background
 }
 #forgot-password {
 	padding: 11px;
@@ -559,6 +560,7 @@ fieldset.update legend + p {
 p.info {
 	margin: 0 auto;
 	padding-top: 20px;
+	text-shadow: 0 0 2px rgba(0, 0, 0, .4); // better readability on bright background
 	-webkit-user-select: none;
 	-moz-user-select: none;
 	-ms-user-select: none;
diff --git a/core/css/header.scss b/core/css/header.scss
index 656440520a0..c03fa2aa0d3 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -424,6 +424,7 @@ nav {
 		&:active,
 		&.active {
 			opacity: 1;
+			box-shadow: inset 2px 0 $color-primary;
 		}
 	}
 }
@@ -478,8 +479,6 @@ nav {
 		background-color: rgba($color-main-background, .97);
 		white-space: nowrap;
 		border: none;
-		-webkit-border-radius: 3px;
-		-moz-border-radius: 3px;
 		border-radius: 3px;
 		border-top-left-radius: 0;
 		border-top-right-radius: 0;
diff --git a/core/css/icons.scss b/core/css/icons.scss
index a4b209455fc..bdef106e3cd 100644
--- a/core/css/icons.scss
+++ b/core/css/icons.scss
@@ -94,6 +94,10 @@ img, object, video, button, textarea, input, select, div[contenteditable=true] {
 	background-image: url('../img/actions/add.svg?v=1');
 }
 
+.icon-address {
+	background-image: url('../img/actions/address.svg?v=1');
+}
+
 .icon-audio {
 	background-image: url('../img/actions/audio.svg?v=1');
 }
@@ -348,6 +352,10 @@ img, object, video, button, textarea, input, select, div[contenteditable=true] {
 	background-image: url('../img/actions/star.svg?v=1');
 }
 
+.icon-star-dark {
+	background-image: url('../img/actions/star-dark.svg?v=1');
+}
+
 .icon-starred {
 	&:hover, &:focus {
 		background-image: url('../img/actions/star.svg?v=1');
diff --git a/core/css/jquery.ocdialog.scss b/core/css/jquery.ocdialog.scss
index efb2cc2f2e3..414443a5d3c 100644
--- a/core/css/jquery.ocdialog.scss
+++ b/core/css/jquery.ocdialog.scss
@@ -6,8 +6,6 @@
 	padding: 15px;
 	z-index: 10000;
 	font-size: 100%;
-	-webkit-box-sizing: border-box;
-	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 	min-width: 200px;
 	top: 50%;
diff --git a/core/css/multiselect.scss b/core/css/multiselect.scss
index cf13563e772..3aa9eb639dd 100644
--- a/core/css/multiselect.scss
+++ b/core/css/multiselect.scss
@@ -31,8 +31,6 @@ ul.multiselectoptions {
 		border-bottom-right-radius: 3px;
 		width: 100%;
 		/* do not cut off group names */
-		-webkit-box-shadow: 0 1px 10px $color-box-shadow;
-		-moz-box-shadow: 0 1px 10px $color-box-shadow;
 		box-shadow: 0 1px 10px $color-box-shadow;
 	}
 	&.up {
diff --git a/core/css/styles.scss b/core/css/styles.scss
index 3b621d69862..d74840fe444 100644
--- a/core/css/styles.scss
+++ b/core/css/styles.scss
@@ -249,6 +249,10 @@ body {
 	left: 0;
 }
 
+#app-navigation * {
+	box-sizing: border-box;
+}
+
 #controls {
 	.button, button {
 		box-sizing: border-box;