Merge branch 'master' of https://github.com/nextcloud/server into gridview-table

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

11 files changed, 145 insertions, 86 deletions

diff --git a/core/css/apps.scss b/core/css/apps.scss
index a9e5a41910f..dc05d2b3fbb 100644
--- a/core/css/apps.scss
+++ b/core/css/apps.scss
@@ -21,7 +21,7 @@
 h2,
 h3,
 h4 {
-	font-weight: 600;
+	font-weight: bold;
 }
 
 h2 {
@@ -727,7 +727,7 @@ kbd {
 	border-radius: 0;
 	text-align: left;
 	padding-left: 42px;
-	font-weight: 400;
+	font-weight: normal;
 
 	/* like app-navigation a */
 	color: var(--color-main-text);
@@ -746,7 +746,6 @@ kbd {
 .section {
 	display: block;
 	padding: 30px;
-	color: var(--color-text-lighter);
 	margin-bottom: 24px;
 	&.hidden {
 		display: none !important;
@@ -789,12 +788,22 @@ kbd {
 		cursor: pointer;
 		color: var(--color-text-lighter);
 		margin-bottom: 1px;
+		.icon {
+			display: inline-block;
+			width: 16px;
+			height: 16px;
+			background-size: 16px;
+			vertical-align: middle;
+			margin-top: -2px;
+			margin-right: 3px;
+			opacity: .7;
+		}
 		a {
 			color: var(--color-text-lighter);
 			margin-bottom: 1px;
 		}
 		&.selected {
-			font-weight: 600;
+			font-weight: bold;
 		}
 		&.selected,
 		&:hover,
@@ -911,7 +920,7 @@ $popovericon-size: 16px;
 			align-items: flex-start;
 			height: auto;
 			margin: 0;
-			font-weight: 300;
+			font-weight: normal;
 			box-shadow: none;
 			width: 100%;
 			color: var(--color-main-text);
diff --git a/core/css/css-variables.scss b/core/css/css-variables.scss
index 825345aae2d..a2946672294 100644
--- a/core/css/css-variables.scss
+++ b/core/css/css-variables.scss
@@ -36,6 +36,7 @@
 	--color-border-dark: $color-border-dark;
 	--border-radius: $border-radius;
 	--border-radius-large: $border-radius-large;
+	--border-radius-pill: $border-radius-pill;
 
 	--font-face: $font-face;
 }
diff --git a/core/css/fonts.scss b/core/css/fonts.scss
index 441b48f3856..1e0b14af22f 100644
--- a/core/css/fonts.scss
+++ b/core/css/fonts.scss
@@ -1,26 +1,43 @@
-/* for low-res screens, use Regular font-weight instead of Light */
-@media (-webkit-max-device-pixel-ratio: 1.3), (max-resolution: 124.8dpi) {
-	@font-face {
-		font-family: 'Open Sans';
-		font-style: normal;
-		font-weight: normal;
-		src: local('Open Sans'), local('OpenSans'),
-			url('../fonts/OpenSans-Regular.woff') format('woff');
-	}
+/* latin-ext */
+@font-face {
+	font-family: 'Nunito';
+	font-style: normal;
+	font-weight: 400; /* normal */
+	src: local('Nunito Regular'), local('Nunito-Regular'),
+		url('../fonts/Nunito-Regular-latin-ext.woff2') format('woff2'),
+		url('../fonts/Nunito-Regular.ttf') format('truetype');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* latin */
+@font-face {
+	font-family: 'Nunito';
+	font-style: normal;
+	font-weight: 400; /* normal */
+	src: local('Nunito Regular'), local('Nunito-Regular'),
+		url('../fonts/Nunito-Regular.woff2') format('woff2'),
+		url('../fonts/Nunito-Regular.ttf') format('truetype');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 
+/* latin-ext */
 @font-face {
-	font-family: 'Open Sans';
+	font-family: 'Nunito';
 	font-style: normal;
-	font-weight: 300;
-	src: local('Open Sans Light'), local('OpenSans-Light'),
-		url('../fonts/OpenSans-Light.woff') format('woff');
+	font-weight: 700; /* bold */
+	src: local('Nunito Bold'), local('Nunito-Bold'),
+		url('../fonts/Nunito-Bold-latin-ext.woff2') format('woff2'),
+		url('../fonts/Nunito-Bold.ttf') format('truetype');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 
+/* latin */
 @font-face {
-	font-family: 'Open Sans';
+	font-family: 'Nunito';
 	font-style: normal;
-	font-weight: 600;
-	src: local('Open Sans Semibold'), local('OpenSans-Semibold'),
-		url('../fonts/OpenSans-Semibold.woff') format('woff');
+	font-weight: 700; /* bold */
+	src: local('Nunito Bold'), local('Nunito-Bold'),
+		url('../fonts/Nunito-Bold.woff2') format('woff2'),
+		url('../fonts/Nunito-Bold.ttf') format('truetype');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
diff --git a/core/css/guest.css b/core/css/guest.css
index ca15fee1894..ac12f171627 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -16,10 +16,10 @@ ul { list-style:none; }
 
 body {
 	background-color: #ffffff;
-	font-weight: 400;
+	font-weight: normal;
 	font-size: .8em;
 	line-height: 1.6em;
-	font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
+	font-family: 'Nunito', 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
 	color: #000;
 	text-align: center;
 	background-color: #0082c9;
@@ -56,7 +56,7 @@ em {
 h2,
 h3,
 h4 {
-	font-weight: 600;
+	font-weight: bold;
 }
 
 h2 {
@@ -175,7 +175,7 @@ form #datadirField legend {
 }
 
 input, textarea, select, button, div[contenteditable=true] {
-	font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
+	font-family: 'Nunito', 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
 }
 input,
 input:not([type='range']),
@@ -184,7 +184,7 @@ a.button {
 	margin: 5px;
 	padding: 11px 10px 9px;
 	outline: none;
-	border-radius: 3px;
+	border-radius: 3px; /* --border-radius */
 	-webkit-appearance: none;
 }
 input[type='submit'],
@@ -198,9 +198,10 @@ select {
 	min-width: 25px;
 	padding: 12px;
 	background-color: white;
-	font-weight: 600;
+	font-weight: bold;
 	color: #555;
 	border: none;
+	border-radius: 100px; /* --border-radius-pill */
 	cursor: pointer;
 }
 input[type='text'],
@@ -216,7 +217,7 @@ input[type='email'] {
 	-moz-appearance: textfield;
 	box-sizing: content-box;
 	border: none;
-	font-weight: 300;
+	font-weight: normal;
 }
 input.login {
 	width: 269px;
@@ -233,13 +234,19 @@ input.update-continue {
 	padding: 10px 20px;
 	color: #666 !important;
 	display: inline-block;
-	border-radius: 3px;
+	border-radius: 100px; /* --border-radius-pill */
 	margin: 15px 5px;
 }
 .updateAnyways a.updateAnywaysButton:hover {
 	color: #222 !important;
 }
 
+/* Get rid of the inside dotted line in Firefox */
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+	border: 0;
+}
+
 input.primary,
 button.primary,
 a.primary {
@@ -397,7 +404,7 @@ form .warning input[type='checkbox']+label {
 
 .two-factor-provider {
 	display: flex;
-	border-radius: 3px;
+	border-radius: 3px; /* --border-radius */
 	margin: 12px 0;
 	border: 1px solid transparent;
 	text-align: left;
@@ -421,7 +428,7 @@ form .warning input[type='checkbox']+label {
 	margin: 0;
 }
 .two-factor-provider p {
-	font-weight: 300;
+	font-weight: normal;
 }
 .two-factor-icon {
 	width: 100px;
@@ -432,7 +439,7 @@ form .warning input[type='checkbox']+label {
 	width: 100%;
 	padding: 10px;
 	margin: 0 0 5px 0;
-	border-radius: 3px;
+	border-radius: 100px; /* --border-radius-pill */
 	font-size: 20px;
 }
 .two-factor-primary {
@@ -456,12 +463,12 @@ 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
+	text-shadow: 0 0 2px rgba(0, 0, 0, .4); /* better readability on bright background */
 }
 .lost-password-container #lost-password,
 .lost-password-container #lost-password-back {
 	display: inline-block;
-	font-weight: 300;
+	font-weight: normal;
 	padding: 12px;
 	margin-top: -6px;
 	color: #fff;
@@ -489,7 +496,7 @@ form .warning input[type='checkbox']+label {
 	box-sizing: border-box;
 	background-color: #0082c9;
 	color: white;
-	border-radius: 3px;
+	border-radius: 100px; /* --border-radius-pill */
 }
 
 /* fixes for update page TODO should be fixed some time in a proper way */
@@ -575,7 +582,7 @@ form #selectDbType label.ui-state-active {
 	color: #fff;
 	text-align: left;
 	word-wrap: break-word;
-	border-radius: 10px;
+	border-radius: 10px; /* --border-radius-large */
 	cursor: default;
 	-moz-user-select: text;
 	-webkit-user-select: text;
@@ -607,7 +614,7 @@ form #selectDbType label.ui-state-active {
 .warning a,
 .error a {
 	color: #fff !important;
-	font-weight: 600 !important;
+	font-weight: bold !important;
 	opacity: 1;
 }
 .error a.button {
@@ -652,7 +659,7 @@ fieldset.update legend + p {
 }
 p.info {
 	margin: 20px auto;
-	text-shadow: 0 0 2px rgba(0, 0, 0, .4); // better readability on bright background
+	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;
@@ -803,7 +810,7 @@ footer {
 }
 
 footer .info .entity-name {
-	font-weight: 600;
+	font-weight: bold;
 }
 
 .hidden {
@@ -823,26 +830,47 @@ a.legal {
 	font-size: smaller;
 }
 
-/* for low-res screens, use Regular font-weight instead of Light */
-@media (-webkit-max-device-pixel-ratio: 1.3), (max-resolution: 124.8dpi) {
-	@font-face {
-		font-family: 'Open Sans';
-		font-style: normal;
-		font-weight: normal;
-		src: local('Open Sans'), local('OpenSans'), url('../fonts/OpenSans-Regular.woff') format('woff');
-	}
+
+/* latin-ext */
+@font-face {
+	font-family: 'Nunito';
+	font-style: normal;
+	font-weight: 400; /* normal */
+	src: local('Nunito Regular'), local('Nunito-Regular'),
+		url('../fonts/Nunito-Regular-latin-ext.woff2') format('woff2'),
+		url('../fonts/Nunito-Regular.ttf') format('truetype');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 
+/* latin */
 @font-face {
-	font-family: 'Open Sans';
+	font-family: 'Nunito';
 	font-style: normal;
-	font-weight: 300;
-	src: local('Open Sans Light'), local('OpenSans-Light'), url('../fonts/OpenSans-Light.woff') format('woff');
+	font-weight: 400; /* normal */
+	src: local('Nunito Regular'), local('Nunito-Regular'),
+		url('../fonts/Nunito-Regular.woff2') format('woff2'),
+		url('../fonts/Nunito-Regular.ttf') format('truetype');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 
+/* latin-ext */
 @font-face {
-	font-family: 'Open Sans';
+	font-family: 'Nunito';
 	font-style: normal;
-	font-weight: 600;
-	src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url('../fonts/OpenSans-Semibold.woff') format('woff');
+	font-weight: 700; /* bold */
+	src: local('Nunito Bold'), local('Nunito-Bold'),
+		url('../fonts/Nunito-Bold-latin-ext.woff2') format('woff2'),
+		url('../fonts/Nunito-Bold.ttf') format('truetype');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* latin */
+@font-face {
+	font-family: 'Nunito';
+	font-style: normal;
+	font-weight: 700; /* bold */
+	src: local('Nunito Bold'), local('Nunito-Bold'),
+		url('../fonts/Nunito-Bold.woff2') format('woff2'),
+		url('../fonts/Nunito-Bold.ttf') format('truetype');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
diff --git a/core/css/header.scss b/core/css/header.scss
index af98e20a9d3..f7c3175bb7a 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -81,7 +81,7 @@
 	.header-right > div > .menu {
 		background-color: var(--color-main-background);
 		filter: drop-shadow(0 1px 5px var(--color-box-shadow));
-		border-radius: 0 0 3px 3px;
+		border-radius: 0 0 var(--border-radius) var(--border-radius);
 		box-sizing: border-box;
 		z-index: 2000;
 		position: absolute;
@@ -212,7 +212,7 @@
 .header-appname {
 	color: var(--color-primary-text);
 	font-size: 16px;
-	font-weight: 600;
+	font-weight: bold;
 	margin: 0;
 	padding: 0;
 	padding-right: 5px;
@@ -615,7 +615,7 @@ nav[role='navigation'] {
 		background-color: transparent;
 		color: var(--color-primary-text);
 		border: 0;
-		border-radius: var(--border-radius);
+		border-radius: var(--border-radius-pill);
 		height: 34px;
 		width: 0;
 		cursor: pointer;
diff --git a/core/css/inputs.scss b/core/css/inputs.scss
index d28884d0c53..2611e1bb2f4 100644
--- a/core/css/inputs.scss
+++ b/core/css/inputs.scss
@@ -14,7 +14,7 @@
 
  /* Specifically override browser styles */
 input, textarea, select, button, div[contenteditable=true], div[contenteditable=false] {
-	font-family: var(--font-face)
+	font-family: var(--font-face);
 }
 .select2-container-multi .select2-choices .select2-search-field input, .select2-search input, .ui-widget {
 	font-family: var(--font-face) !important;
@@ -174,7 +174,9 @@ input[type='button'],
 input[type='submit'],
 input[type='reset'] {
 	font-weight: bold;
-	/* Get rid of the ugly firefox dotted line */
+	border-radius: var(--border-radius-pill);
+
+	/* Get rid of the inside dotted line in Firefox */
 	&::-moz-focus-inner {
 		border: 0;
 	}
@@ -286,7 +288,7 @@ button img,
 }
 select,
 .button.multiselect {
-	font-weight: 400;
+	font-weight: normal;
 }
 
 /* Radio & Checkboxes */
@@ -662,7 +664,7 @@ input {
 		border: 1px solid var(--color-border-dark);
 		cursor: pointer;
 		position: relative;
-		border-radius: 3px;
+		border-radius: var(--border-radius);
 		height: 34px;
 		/* tag wrapper */
 		.multiselect__tags-wrap {
@@ -692,7 +694,7 @@ input {
 				border: 1px solid var(--color-border-dark);
 				display: inline-flex;
 				align-items: center;
-				border-radius: 3px;
+				border-radius: var(--border-radius);
 				/* require to override the default width
 				   and force the tag to shring properly */
 				min-width: 0;
diff --git a/core/css/public.scss b/core/css/public.scss
index 0edf391fa49..20048870e2c 100644
--- a/core/css/public.scss
+++ b/core/css/public.scss
@@ -70,7 +70,7 @@ $footer-height: 65px;
 			color: var(--color-text-lighter);
 			a {
 				color: var(--color-text-lighter);
-				font-weight: 600;
+				font-weight: bold;
 				white-space: nowrap;
 				/* increasing clickability to more than the text height */
 				padding: 13px;
diff --git a/core/css/publicshareauth.css b/core/css/publicshareauth.css
index 2f7622ea221..2206f21dff6 100644
--- a/core/css/publicshareauth.css
+++ b/core/css/publicshareauth.css
@@ -3,10 +3,13 @@ form fieldset {
 	flex-direction: column;
 }
 
+form fieldset > p {
+	position: relative;
+}
+
 #password {
-	margin-right: 0 !important;
-	border-top-right-radius: 0;
-	border-bottom-right-radius: 0;
+	margin: 5px 0;
+	padding-right: 45px;
 	height: 45px;
 	box-sizing: border-box;
 	flex: 1 1 auto;
@@ -16,13 +19,10 @@ form fieldset {
 
 input[type='submit'],
 input[type='submit'].icon-confirm {
-	width: 45px;
+	position: absolute;
+	top: 0px;
+	right: -5px;
+	width: 45px !important;
 	height: 45px;
-	margin-left: 0 !important;
-	border-top-left-radius: 0;
-	border-bottom-left-radius: 0;
-}
-
-fieldset > p {
-	display: inline-flex;
+	background-color: transparent !important;
 }
diff --git a/core/css/styles.scss b/core/css/styles.scss
index d9c0d7c6e4c..0927687fc76 100644
--- a/core/css/styles.scss
+++ b/core/css/styles.scss
@@ -84,7 +84,7 @@ ul {
 
 body {
 	background-color: var(--color-main-background);
-	font-weight: 300;
+	font-weight: normal;
 	font-size: .8em;
 	line-height: 1.6em;
 	font-family: var(--font-face);
@@ -327,14 +327,14 @@ label.infield {
 .warning {
 	legend, a {
 		color: var(--color-primary-text) !important;
-		font-weight: 600 !important;
+		font-weight: bold !important;
 	}
 }
 
 .error {
 	a {
 		color: var(--color-primary-text) !important;
-		font-weight: 600 !important;
+		font-weight: bold !important;
 		&.button {
 			color: var(--color-text-lighter) !important;
 			display: inline-block;
@@ -541,7 +541,7 @@ code {
 
 		.ui-datepicker-title {
 			line-height: 1;
-			font-weight: 300;
+			font-weight: normal;
 		}
 		.ui-icon {
 			opacity: .5;
@@ -622,7 +622,7 @@ code {
 
 		.ui-timepicker-title {
 			line-height: 1;
-			font-weight: 300;
+			font-weight: normal;
 		}
 	}
 	/* AM/PM fix */
@@ -1091,7 +1091,7 @@ div.crumb {
 	&:not(:first-child) a {
 	}
 	&:last-child {
-		font-weight: 600;
+		font-weight: bold;
 		margin-right: 10px;
 		// Allow multiple span next to the main 'a'
 		a ~ span {
diff --git a/core/css/tooltip.scss b/core/css/tooltip.scss
index ad433185f1c..a23f5d3c34d 100644
--- a/core/css/tooltip.scss
+++ b/core/css/tooltip.scss
@@ -13,9 +13,9 @@
 .tooltip {
     position: absolute;
     display: block;
-    font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
+    font-family: 'Nunito', 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
     font-style: normal;
-    font-weight: 400;
+    font-weight: normal;
     letter-spacing: normal;
     line-break: auto;
     line-height: 1.6;
@@ -135,4 +135,4 @@
     height: 0;
     border-color: transparent;
     border-style: solid;
-}
\ No newline at end of file
+}
diff --git a/core/css/variables.scss b/core/css/variables.scss
index 3914389a53e..dffd6403471 100644
--- a/core/css/variables.scss
+++ b/core/css/variables.scss
@@ -31,7 +31,7 @@
 
 // SCSS variables
 // DEPRECATED, please use CSS4 vars
-$color-main-text: #000 !default;
+$color-main-text: #222 !default; // Not #000 for better readability
 $color-main-background: #fff !default;
 $color-main-background-translucent: rgba($color-main-background, .97) !default;
 
@@ -74,9 +74,11 @@ $color-border: nc-darken($color-main-background, 7%) !default;
 // darker border like inputs or very visible elements
 $color-border-dark: nc-darken($color-main-background, 14%) !default;
 $border-radius: 3px !default;
-$border-radius-large: 10px;
+$border-radius-large: 10px !default;
+// Pill-style button, value is large so big buttons also have correct roundness
+$border-radius-pill: 100px !default;
 
-$font-face: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif !default;
+$font-face: 'Nunito', 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif !default;
 
 
 // various structure data