diff --git a/dist/css/typography.css b/dist/css/typography.css
index 27c3751a..3235edd9 100644
--- a/dist/css/typography.css
+++ b/dist/css/typography.css
@@ -1,26 +1,14 @@
-/* droid-sans-regular - latin */
+/* Google Font's Droid Sans */
@font-face {
font-family: 'Droid Sans';
font-style: normal;
font-weight: 400;
- src: url('../fonts/droid-sans-v6-latin-regular.eot'); /* IE9 Compat Modes */
- src: local('Droid Sans'), local('DroidSans'),
- url('../fonts/droid-sans-v6-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
- url('../fonts/droid-sans-v6-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
- url('../fonts/droid-sans-v6-latin-regular.woff') format('woff'), /* Modern Browsers */
- url('../fonts/droid-sans-v6-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
- url('../fonts/droid-sans-v6-latin-regular.svg#DroidSans') format('svg'); /* Legacy iOS */
+ src: local('Droid Sans'), local('DroidSans'), url('../fonts/DroidSans.ttf') format('truetype');
}
-/* droid-sans-700 - latin */
+/* Google Font's Droid Sans Bold */
@font-face {
font-family: 'Droid Sans';
font-style: normal;
font-weight: 700;
- src: url('../fonts/droid-sans-v6-latin-700.eot'); /* IE9 Compat Modes */
- src: local('Droid Sans Bold'), local('DroidSans-Bold'),
- url('../fonts/droid-sans-v6-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
- url('../fonts/droid-sans-v6-latin-700.woff2') format('woff2'), /* Super Modern Browsers */
- url('../fonts/droid-sans-v6-latin-700.woff') format('woff'), /* Modern Browsers */
- url('../fonts/droid-sans-v6-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
- url('../fonts/droid-sans-v6-latin-700.svg#DroidSans') format('svg'); /* Legacy iOS */
+ src: local('Droid Sans Bold'), local('DroidSans-Bold'), url('../fonts/DroidSans-Bold.ttf') format('truetype');
}
diff --git a/src/main/html/fonts/droid-sans-v6-latin-700.ttf b/dist/fonts/DroidSans-Bold.ttf
similarity index 86%
rename from src/main/html/fonts/droid-sans-v6-latin-700.ttf
rename to dist/fonts/DroidSans-Bold.ttf
index 15896c44..befea09e 100644
Binary files a/src/main/html/fonts/droid-sans-v6-latin-700.ttf and b/dist/fonts/DroidSans-Bold.ttf differ
diff --git a/dist/fonts/droid-sans-v6-latin-regular.ttf b/dist/fonts/DroidSans.ttf
similarity index 86%
rename from dist/fonts/droid-sans-v6-latin-regular.ttf
rename to dist/fonts/DroidSans.ttf
index fb8cea66..71e547f7 100644
Binary files a/dist/fonts/droid-sans-v6-latin-regular.ttf and b/dist/fonts/DroidSans.ttf differ
diff --git a/dist/fonts/droid-sans-v6-latin-700.eot b/dist/fonts/droid-sans-v6-latin-700.eot
deleted file mode 100644
index d8524983..00000000
Binary files a/dist/fonts/droid-sans-v6-latin-700.eot and /dev/null differ
diff --git a/dist/fonts/droid-sans-v6-latin-700.svg b/dist/fonts/droid-sans-v6-latin-700.svg
deleted file mode 100644
index a54bbbbf..00000000
--- a/dist/fonts/droid-sans-v6-latin-700.svg
+++ /dev/null
@@ -1,411 +0,0 @@
-
-
-
diff --git a/dist/fonts/droid-sans-v6-latin-700.woff b/dist/fonts/droid-sans-v6-latin-700.woff
deleted file mode 100644
index 67e3e25f..00000000
Binary files a/dist/fonts/droid-sans-v6-latin-700.woff and /dev/null differ
diff --git a/dist/fonts/droid-sans-v6-latin-700.woff2 b/dist/fonts/droid-sans-v6-latin-700.woff2
deleted file mode 100644
index 1e726a7c..00000000
Binary files a/dist/fonts/droid-sans-v6-latin-700.woff2 and /dev/null differ
diff --git a/dist/fonts/droid-sans-v6-latin-regular.eot b/dist/fonts/droid-sans-v6-latin-regular.eot
deleted file mode 100644
index ac2698e8..00000000
Binary files a/dist/fonts/droid-sans-v6-latin-regular.eot and /dev/null differ
diff --git a/dist/fonts/droid-sans-v6-latin-regular.svg b/dist/fonts/droid-sans-v6-latin-regular.svg
deleted file mode 100644
index d9f2a214..00000000
--- a/dist/fonts/droid-sans-v6-latin-regular.svg
+++ /dev/null
@@ -1,403 +0,0 @@
-
-
-
diff --git a/dist/fonts/droid-sans-v6-latin-regular.woff b/dist/fonts/droid-sans-v6-latin-regular.woff
deleted file mode 100644
index abf19899..00000000
Binary files a/dist/fonts/droid-sans-v6-latin-regular.woff and /dev/null differ
diff --git a/dist/fonts/droid-sans-v6-latin-regular.woff2 b/dist/fonts/droid-sans-v6-latin-regular.woff2
deleted file mode 100644
index 9f93f74c..00000000
Binary files a/dist/fonts/droid-sans-v6-latin-regular.woff2 and /dev/null differ
diff --git a/src/main/html/css/typography.css b/src/main/html/css/typography.css
index 27c3751a..3235edd9 100644
--- a/src/main/html/css/typography.css
+++ b/src/main/html/css/typography.css
@@ -1,26 +1,14 @@
-/* droid-sans-regular - latin */
+/* Google Font's Droid Sans */
@font-face {
font-family: 'Droid Sans';
font-style: normal;
font-weight: 400;
- src: url('../fonts/droid-sans-v6-latin-regular.eot'); /* IE9 Compat Modes */
- src: local('Droid Sans'), local('DroidSans'),
- url('../fonts/droid-sans-v6-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
- url('../fonts/droid-sans-v6-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
- url('../fonts/droid-sans-v6-latin-regular.woff') format('woff'), /* Modern Browsers */
- url('../fonts/droid-sans-v6-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
- url('../fonts/droid-sans-v6-latin-regular.svg#DroidSans') format('svg'); /* Legacy iOS */
+ src: local('Droid Sans'), local('DroidSans'), url('../fonts/DroidSans.ttf') format('truetype');
}
-/* droid-sans-700 - latin */
+/* Google Font's Droid Sans Bold */
@font-face {
font-family: 'Droid Sans';
font-style: normal;
font-weight: 700;
- src: url('../fonts/droid-sans-v6-latin-700.eot'); /* IE9 Compat Modes */
- src: local('Droid Sans Bold'), local('DroidSans-Bold'),
- url('../fonts/droid-sans-v6-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
- url('../fonts/droid-sans-v6-latin-700.woff2') format('woff2'), /* Super Modern Browsers */
- url('../fonts/droid-sans-v6-latin-700.woff') format('woff'), /* Modern Browsers */
- url('../fonts/droid-sans-v6-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
- url('../fonts/droid-sans-v6-latin-700.svg#DroidSans') format('svg'); /* Legacy iOS */
+ src: local('Droid Sans Bold'), local('DroidSans-Bold'), url('../fonts/DroidSans-Bold.ttf') format('truetype');
}
diff --git a/dist/fonts/droid-sans-v6-latin-700.ttf b/src/main/html/fonts/DroidSans-Bold.ttf
similarity index 86%
rename from dist/fonts/droid-sans-v6-latin-700.ttf
rename to src/main/html/fonts/DroidSans-Bold.ttf
index 15896c44..befea09e 100644
Binary files a/dist/fonts/droid-sans-v6-latin-700.ttf and b/src/main/html/fonts/DroidSans-Bold.ttf differ
diff --git a/src/main/html/fonts/droid-sans-v6-latin-regular.ttf b/src/main/html/fonts/DroidSans.ttf
similarity index 86%
rename from src/main/html/fonts/droid-sans-v6-latin-regular.ttf
rename to src/main/html/fonts/DroidSans.ttf
index fb8cea66..71e547f7 100644
Binary files a/src/main/html/fonts/droid-sans-v6-latin-regular.ttf and b/src/main/html/fonts/DroidSans.ttf differ
diff --git a/src/main/html/fonts/droid-sans-v6-latin-700.eot b/src/main/html/fonts/droid-sans-v6-latin-700.eot
deleted file mode 100644
index d8524983..00000000
Binary files a/src/main/html/fonts/droid-sans-v6-latin-700.eot and /dev/null differ
diff --git a/src/main/html/fonts/droid-sans-v6-latin-700.svg b/src/main/html/fonts/droid-sans-v6-latin-700.svg
deleted file mode 100644
index a54bbbbf..00000000
--- a/src/main/html/fonts/droid-sans-v6-latin-700.svg
+++ /dev/null
@@ -1,411 +0,0 @@
-
-
-
diff --git a/src/main/html/fonts/droid-sans-v6-latin-700.woff b/src/main/html/fonts/droid-sans-v6-latin-700.woff
deleted file mode 100644
index 67e3e25f..00000000
Binary files a/src/main/html/fonts/droid-sans-v6-latin-700.woff and /dev/null differ
diff --git a/src/main/html/fonts/droid-sans-v6-latin-700.woff2 b/src/main/html/fonts/droid-sans-v6-latin-700.woff2
deleted file mode 100644
index 1e726a7c..00000000
Binary files a/src/main/html/fonts/droid-sans-v6-latin-700.woff2 and /dev/null differ
diff --git a/src/main/html/fonts/droid-sans-v6-latin-regular.eot b/src/main/html/fonts/droid-sans-v6-latin-regular.eot
deleted file mode 100644
index ac2698e8..00000000
Binary files a/src/main/html/fonts/droid-sans-v6-latin-regular.eot and /dev/null differ
diff --git a/src/main/html/fonts/droid-sans-v6-latin-regular.svg b/src/main/html/fonts/droid-sans-v6-latin-regular.svg
deleted file mode 100644
index d9f2a214..00000000
--- a/src/main/html/fonts/droid-sans-v6-latin-regular.svg
+++ /dev/null
@@ -1,403 +0,0 @@
-
-
-
diff --git a/src/main/html/fonts/droid-sans-v6-latin-regular.woff b/src/main/html/fonts/droid-sans-v6-latin-regular.woff
deleted file mode 100644
index abf19899..00000000
Binary files a/src/main/html/fonts/droid-sans-v6-latin-regular.woff and /dev/null differ
diff --git a/src/main/html/fonts/droid-sans-v6-latin-regular.woff2 b/src/main/html/fonts/droid-sans-v6-latin-regular.woff2
deleted file mode 100644
index 9f93f74c..00000000
Binary files a/src/main/html/fonts/droid-sans-v6-latin-regular.woff2 and /dev/null differ