Change typeface from Open Sans to Nunito

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>

4 files changed, 19 insertions, 23 deletions

diff --git a/core/css/fonts.scss b/core/css/fonts.scss
index 11e40d06328..2b1fe7c31d8 100644
--- a/core/css/fonts.scss
+++ b/core/css/fonts.scss
@@ -1,17 +1,15 @@
 @font-face {
-	font-family: 'Open Sans';
+	font-family: 'Nunito';
 	font-style: normal;
 	font-weight: normal;
-	src: local('Open Sans'), local('OpenSans'),
-		url('../fonts/OpenSans.woff') format('woff'),
-		url('../fonts/OpenSans.ttf') format('ttf');
+	src: local('Nunito Regular'), local('Nunito-Regular'),
+		url('../fonts/Nunito-Regular.ttf') format('ttf');
 }
 
 @font-face {
-	font-family: 'Open Sans';
+	font-family: 'Nunito';
 	font-style: normal;
 	font-weight: bold;
-	src: local('Open Sans Bold'), local('OpenSans-Bold'),
-		url('../fonts/OpenSans-Bold.woff') format('woff'),
-		url('../fonts/OpenSans-Bold.ttf') format('ttf');
+	src: local('Nunito Bold'), local('Nunito-Bold'),
+		url('../fonts/Nunito-Bold.ttf') format('ttf');
 }
diff --git a/core/css/guest.css b/core/css/guest.css
index 99e7e8c9648..d620237e826 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -19,7 +19,7 @@ body {
 	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;
@@ -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']),
@@ -421,7 +421,7 @@ form .warning input[type='checkbox']+label {
 	margin: 0;
 }
 .two-factor-provider p {
-	font-weight: 300;
+	font-weight: normal;
 }
 .two-factor-icon {
 	width: 100px;
@@ -461,7 +461,7 @@ form .warning input[type='checkbox']+label {
 .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;
@@ -824,19 +824,17 @@ a.legal {
 }
 
 @font-face {
-	font-family: 'Open Sans';
+	font-family: 'Nunito';
 	font-style: normal;
 	font-weight: normal;
-	src: local('Open Sans'), local('OpenSans'),
-		url('../fonts/OpenSans.woff') format('woff'),
-		url('../fonts/OpenSans.ttf') format('ttf');
+	src: local('Nunito Regular'), local('Nunito-Regular'),
+		url('../fonts/Nunito-Regular.ttf') format('ttf');
 }
 
 @font-face {
-	font-family: 'Open Sans';
+	font-family: 'Nunito';
 	font-style: normal;
 	font-weight: bold;
-	src: local('Open Sans Bold'), local('OpenSans-Bold'),
-		url('../fonts/OpenSans-Bold.woff') format('woff'),
-		url('../fonts/OpenSans-Bold.ttf') format('ttf');
+	src: local('Nunito Bold'), local('Nunito-Bold'),
+		url('../fonts/Nunito-Bold.ttf') format('ttf');
 }
diff --git a/core/css/tooltip.scss b/core/css/tooltip.scss
index 35718c822bb..a23f5d3c34d 100644
--- a/core/css/tooltip.scss
+++ b/core/css/tooltip.scss
@@ -13,7 +13,7 @@
 .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: normal;
     letter-spacing: normal;
@@ -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 8617c6e27d0..d217a9bfa71 100644
--- a/core/css/variables.scss
+++ b/core/css/variables.scss
@@ -75,7 +75,7 @@ $color-border-dark: nc-darken($color-main-background, 14%) !default;
 $border-radius: 3px !default;
 $border-radius-large: 10px;
 
-$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