From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 5 May 2017 10:41:55 +0000 (+0200)
Subject: done #1387 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=6997588f2edca7ce521a11f3748465997748d1af;p=fluidbook-html5.git

done #1387 @0.5
---

diff --git a/style/fluidbook.css b/style/fluidbook.css
index 34abb6b0..32f07b1c 100644
--- a/style/fluidbook.css
+++ b/style/fluidbook.css
@@ -86,7 +86,7 @@ body {
 }
 body,
 input {
-  font-family: Ubuntu, Arial, Helvetica, sans-serif;
+  font-family: 'Open Sans', Arial, Helvetica, sans-serif;
 }
 body.loading * {
   cursor: progress !important;
@@ -1065,7 +1065,7 @@ ul.chapters.shareList a.level0 img {
 /* Form elements */
 #innerView form input[type="text"],
 #innerView form input[type="email"] {
-  font-family: Ubuntu;
+  font-family: 'Open Sans', Arial, Helvetica, sans-serif;
   padding: 5px;
   border-radius: 5px;
   border: 0;
@@ -1148,7 +1148,7 @@ ul.chapters a {
 }
 ul.chapters a.level-1 {
   font-size: 200%;
-  font-family: Ubuntu;
+  font-family: 'Open Sans', Arial, Helvetica, sans-serif;
   font-weight: 600;
   text-align: center;
 }
@@ -1163,7 +1163,7 @@ ul.chapters a.level3 {
 }
 ul.chapters a.level0 {
   font-size: 150%;
-  font-family: Ubuntu;
+  font-family: 'Open Sans', Arial, Helvetica, sans-serif;
   font-weight: 600;
 }
 ul.chapters a.level1 {
@@ -1577,14 +1577,14 @@ body.zoomPopup #zoomPopupOverlay {
   font-style: normal;
 }
 @font-face {
-  font-family: 'Ubuntu';
-  src: url('fonts/Ubuntu-R-webfont.ttf') format('truetype');
+  font-family: 'Open Sans';
+  src: url("fonts/OpenSans-Regular.woff2") format("woff2"), url("fonts/OpenSans-Regular.woff") format("woff");
   font-weight: 400;
   font-style: normal;
 }
 @font-face {
-  font-family: 'Ubuntu';
-  src: url('fonts/Ubuntu-M-webfont.ttf') format('truetype');
+  font-family: 'Open Sans';
+  src: url("fonts/OpenSans-Semibold.woff2") format("woff2"), url("fonts/OpenSans-Semibold.woff") format("woff");
   font-weight: 600;
   font-style: normal;
 }
diff --git a/style/fluidbook.less b/style/fluidbook.less
index 304bb861..050186df 100644
--- a/style/fluidbook.less
+++ b/style/fluidbook.less
@@ -1252,7 +1252,7 @@ ul.chapters.shareList a.level0 img {
 /* Form elements */
 #innerView form input[type="text"],
 #innerView form input[type="email"] {
-	font-family: Ubuntu;
+	font-family: @font;
 	padding: 5px;
 	border-radius: 5px;
 	border: 0;
@@ -1342,7 +1342,7 @@ ul.chapters a {
 
 ul.chapters a.level-1 {
 	font-size: 200%;
-	font-family: Ubuntu;
+	font-family: @font;
 	font-weight: 600;
 	text-align: center;
 }
@@ -1357,7 +1357,7 @@ ul.chapters a.level0, ul.chapters a.level1, ul.chapters a.level2, ul.chapters a.
 
 ul.chapters a.level0 {
 	font-size: 150%;
-	font-family: Ubuntu;
+	font-family: @font;
 	font-weight: 600;
 }
 
@@ -1842,15 +1842,15 @@ a.button {
 }
 
 @font-face {
-	font-family: 'Ubuntu';
-	src: url('fonts/Ubuntu-R-webfont.ttf') format('truetype');
+	font-family: 'Open Sans';
+	src: url("fonts/OpenSans-Regular.woff2") format("woff2"), url("fonts/OpenSans-Regular.woff") format("woff");
 	font-weight: 400;
 	font-style: normal;
 }
 
 @font-face {
-	font-family: 'Ubuntu';
-	src: url('fonts/Ubuntu-M-webfont.ttf') format('truetype');
+	font-family: 'Open Sans';
+	src: url("fonts/OpenSans-Semibold.woff2") format("woff2"), url("fonts/OpenSans-Semibold.woff") format("woff");
 	font-weight: 600;
 	font-style: normal;
 }
diff --git a/style/fonts/OpenSans-Regular.woff b/style/fonts/OpenSans-Regular.woff
new file mode 100644
index 00000000..bd0f824b
Binary files /dev/null and b/style/fonts/OpenSans-Regular.woff differ
diff --git a/style/fonts/OpenSans-Regular.woff2 b/style/fonts/OpenSans-Regular.woff2
new file mode 100644
index 00000000..f778f9c8
Binary files /dev/null and b/style/fonts/OpenSans-Regular.woff2 differ
diff --git a/style/fonts/OpenSans-Semibold.woff b/style/fonts/OpenSans-Semibold.woff
new file mode 100644
index 00000000..8c0313ff
Binary files /dev/null and b/style/fonts/OpenSans-Semibold.woff differ
diff --git a/style/fonts/OpenSans-Semibold.woff2 b/style/fonts/OpenSans-Semibold.woff2
new file mode 100644
index 00000000..852f7106
Binary files /dev/null and b/style/fonts/OpenSans-Semibold.woff2 differ
diff --git a/style/fonts/Ubuntu-M-webfont.ttf b/style/fonts/Ubuntu-M-webfont.ttf
deleted file mode 100644
index 5c4967c9..00000000
Binary files a/style/fonts/Ubuntu-M-webfont.ttf and /dev/null differ
diff --git a/style/fonts/Ubuntu-R-webfont.ttf b/style/fonts/Ubuntu-R-webfont.ttf
deleted file mode 100644
index 147d98e1..00000000
Binary files a/style/fonts/Ubuntu-R-webfont.ttf and /dev/null differ
diff --git a/style/special/wescosales.css b/style/special/wescosales.css
index e4c3e358..e791e0c3 100644
--- a/style/special/wescosales.css
+++ b/style/special/wescosales.css
@@ -4,7 +4,7 @@
   padding: 8px 30px 0 15px;
 }
 #wescosalesselector #wescosalesselect {
-  font-family: Ubuntu, Arial, Helvetica, sans-serif;
+  font-family: 'Open Sans', Arial, Helvetica, sans-serif;
   background-color: #5592c9;
   background-image: url("../../images/select-arrow.svg");
   background-repeat: no-repeat;
diff --git a/style/variables.less b/style/variables.less
index 32426e97..d7742036 100644
--- a/style/variables.less
+++ b/style/variables.less
@@ -1 +1 @@
-@font:Ubuntu, Arial, Helvetica, sans-serif;
\ No newline at end of file
+@font: 'Open Sans', Arial, Helvetica, sans-serif;
\ No newline at end of file