From: Kai Moritz Date: Wed, 12 Jun 2013 23:16:34 +0000 (+0200) Subject: Von Linux Libertine auf Droid Serif umgestellt X-Git-Tag: src-main-frontend--juplo--home-kai~110 X-Git-Url: https://juplo.de/gitweb/?a=commitdiff_plain;h=9722924386a9b3aadd407915b8296f95f2562245;p=website Von Linux Libertine auf Droid Serif umgestellt --- diff --git a/src/main/webapp/css/base/fonts.css b/src/main/webapp/css/base/fonts.css index f9cbbd3..8262033 100644 --- a/src/main/webapp/css/base/fonts.css +++ b/src/main/webapp/css/base/fonts.css @@ -46,51 +46,55 @@ font-style: italic; } -font-face +@font-face { - font-family: 'LinuxLibertineO'; - src: url('../../fonts/LinLibertine_R-webfont.eot'); - src: url('../../fonts/LinLibertine_R-webfont.eot?#iefix') format('embedded-opentype'), - url('../../fonts/LinLibertine_R-webfont.woff') format('woff'), - url('../../fonts/LinLibertine_R-webfont.ttf') format('truetype'), - url('../../fonts/LinLibertine_R-webfont.svg#LinuxLibertineORegular') format('svg'); + font-family: 'DroidSerif'; + src: url('../../fonts/DroidSerif-Regular-webfont.eot'); + src: url('../../fonts/DroidSerif-Regular-webfont.eot?#iefix') format('embedded-opentype'), + url('../../fonts/DroidSerif-Regular-webfont.woff') format('woff'), + url('../../fonts/DroidSerif-Regular-webfont.ttf') format('truetype'), + url('../../fonts/DroidSerif-Regular-webfont.svg#DroidSerifRegular') format('svg'); font-weight: normal; font-style: normal; + } @font-face { - font-family: 'LinuxLibertineO'; - src: url('../../fonts/LinLibertine_RI-webfont.eot'); - src: url('../../fonts/LinLibertine_RI-webfont.eot?#iefix') format('embedded-opentype'), - url('../../fonts/LinLibertine_RI-webfont.woff') format('woff'), - url('../../fonts/LinLibertine_RI-webfont.ttf') format('truetype'), - url('../../fonts/LinLibertine_RI-webfont.svg#LinuxLibertineOItalic') format('svg'); + font-family: 'DroidSerif'; + src: url('../../fonts/DroidSerif-Italic-webfont.eot'); + src: url('../../fonts/DroidSerif-Italic-webfont.eot?#iefix') format('embedded-opentype'), + url('../../fonts/DroidSerif-Italic-webfont.woff') format('woff'), + url('../../fonts/DroidSerif-Italic-webfont.ttf') format('truetype'), + url('../../fonts/DroidSerif-Italic-webfont.svg#DroidSerifItalic') format('svg'); font-weight: normal; font-style: italic; + } @font-face { - font-family: 'LinuxLibertineO'; - src: url('../../fonts/LinLibertine_RB-webfont.eot'); - src: url('../../fonts/LinLibertine_RB-webfont.eot?#iefix') format('embedded-opentype'), - url('../../fonts/LinLibertine_RB-webfont.woff') format('woff'), - url('../../fonts/LinLibertine_RB-webfont.ttf') format('truetype'), - url('../../fonts/LinLibertine_RB-webfont.svg#LinuxLibertineOBold') format('svg'); + font-family: 'DroidSerif'; + src: url('../../fonts/DroidSerif-Bold-webfont.eot'); + src: url('../../fonts/DroidSerif-Bold-webfont.eot?#iefix') format('embedded-opentype'), + url('../../fonts/DroidSerif-Bold-webfont.woff') format('woff'), + url('../../fonts/DroidSerif-Bold-webfont.ttf') format('truetype'), + url('../../fonts/DroidSerif-Bold-webfont.svg#DroidSerifBold') format('svg'); font-weight: bold; font-style: normal; + } @font-face { - font-family: 'LinuxLibertineO'; - src: url('../../fonts/LinLibertine_RBI-webfont.eot'); - src: url('../../fonts/LinLibertine_RBI-webfont.eot?#iefix') format('embedded-opentype'), - url('../../fonts/LinLibertine_RBI-webfont.woff') format('woff'), - url('../../fonts/LinLibertine_RBI-webfont.ttf') format('truetype'), - url('../../fonts/LinLibertine_RBI-webfont.svg#LinuxLibertineOBoldItalic') format('svg'); + font-family: 'DroidSerif'; + src: url('../../fonts/DroidSerif-BoldItalic-webfont.eot'); + src: url('../../fonts/DroidSerif-BoldItalic-webfont.eot?#iefix') format('embedded-opentype'), + url('../../fonts/DroidSerif-BoldItalic-webfont.woff') format('woff'), + url('../../fonts/DroidSerif-BoldItalic-webfont.ttf') format('truetype'), + url('../../fonts/DroidSerif-BoldItalic-webfont.svg#DroidSerifBoldItalic') format('svg'); font-weight: bold; font-style: italic; + } diff --git a/src/main/webapp/css/base/typo.css b/src/main/webapp/css/base/typo.css index b7e9e45..02cdab2 100644 --- a/src/main/webapp/css/base/typo.css +++ b/src/main/webapp/css/base/typo.css @@ -10,7 +10,7 @@ body { - font-family: 'LinuxLibertineO', 'Times New Roman', 'Palatino Linotype' , serif; + font-family: 'DroidSerif', 'Times New Roman', 'Palatino Linotype' , serif; letter-spacing: 0; line-height: 1.5em; padding: 1em; diff --git a/src/main/webapp/fonts/Droid-Serif-fontfacekit.zip b/src/main/webapp/fonts/Droid-Serif-fontfacekit.zip new file mode 100644 index 0000000..f0c8fc8 Binary files /dev/null and b/src/main/webapp/fonts/Droid-Serif-fontfacekit.zip differ diff --git a/src/main/webapp/fonts/DroidSerif-Bold-webfont.eot b/src/main/webapp/fonts/DroidSerif-Bold-webfont.eot new file mode 100644 index 0000000..c0a081d Binary files /dev/null and b/src/main/webapp/fonts/DroidSerif-Bold-webfont.eot differ diff --git a/src/main/webapp/fonts/DroidSerif-Bold-webfont.svg b/src/main/webapp/fonts/DroidSerif-Bold-webfont.svg new file mode 100644 index 0000000..33b3d9f --- /dev/null +++ b/src/main/webapp/fonts/DroidSerif-Bold-webfont.svg @@ -0,0 +1,167 @@ + + + + +This is a custom SVG webfont generated by Font Squirrel. +Copyright : Digitized data copyright 2006 Google Corporation +Foundry : Ascender Corporation +Foundry URL : httpwwwascendercorpcom + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/fonts/DroidSerif-Bold-webfont.ttf b/src/main/webapp/fonts/DroidSerif-Bold-webfont.ttf new file mode 100644 index 0000000..995c73f Binary files /dev/null and b/src/main/webapp/fonts/DroidSerif-Bold-webfont.ttf differ diff --git a/src/main/webapp/fonts/DroidSerif-Bold-webfont.woff b/src/main/webapp/fonts/DroidSerif-Bold-webfont.woff new file mode 100644 index 0000000..56477f6 Binary files /dev/null and b/src/main/webapp/fonts/DroidSerif-Bold-webfont.woff differ diff --git a/src/main/webapp/fonts/DroidSerif-BoldItalic-webfont.eot b/src/main/webapp/fonts/DroidSerif-BoldItalic-webfont.eot new file mode 100644 index 0000000..139cbb1 Binary files /dev/null and b/src/main/webapp/fonts/DroidSerif-BoldItalic-webfont.eot differ diff --git a/src/main/webapp/fonts/DroidSerif-BoldItalic-webfont.svg b/src/main/webapp/fonts/DroidSerif-BoldItalic-webfont.svg new file mode 100644 index 0000000..d6b162e --- /dev/null +++ b/src/main/webapp/fonts/DroidSerif-BoldItalic-webfont.svg @@ -0,0 +1,167 @@ + + + + +This is a custom SVG webfont generated by Font Squirrel. +Copyright : Digitized data copyright 2007 Google Corporation +Foundry : Ascender Corporation +Foundry URL : httpwwwascendercorpcom + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/fonts/DroidSerif-BoldItalic-webfont.ttf b/src/main/webapp/fonts/DroidSerif-BoldItalic-webfont.ttf new file mode 100644 index 0000000..080aa21 Binary files /dev/null and b/src/main/webapp/fonts/DroidSerif-BoldItalic-webfont.ttf differ diff --git a/src/main/webapp/fonts/DroidSerif-BoldItalic-webfont.woff b/src/main/webapp/fonts/DroidSerif-BoldItalic-webfont.woff new file mode 100644 index 0000000..06729cf Binary files /dev/null and b/src/main/webapp/fonts/DroidSerif-BoldItalic-webfont.woff differ diff --git a/src/main/webapp/fonts/DroidSerif-Italic-webfont.eot b/src/main/webapp/fonts/DroidSerif-Italic-webfont.eot new file mode 100644 index 0000000..2674ceb Binary files /dev/null and b/src/main/webapp/fonts/DroidSerif-Italic-webfont.eot differ diff --git a/src/main/webapp/fonts/DroidSerif-Italic-webfont.svg b/src/main/webapp/fonts/DroidSerif-Italic-webfont.svg new file mode 100644 index 0000000..1572ab6 --- /dev/null +++ b/src/main/webapp/fonts/DroidSerif-Italic-webfont.svg @@ -0,0 +1,167 @@ + + + + +This is a custom SVG webfont generated by Font Squirrel. +Copyright : Digitized data copyright 2007 Google Corporation +Foundry : Ascender Corporation +Foundry URL : httpwwwascendercorpcom + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/fonts/DroidSerif-Italic-webfont.ttf b/src/main/webapp/fonts/DroidSerif-Italic-webfont.ttf new file mode 100644 index 0000000..71e4ab1 Binary files /dev/null and b/src/main/webapp/fonts/DroidSerif-Italic-webfont.ttf differ diff --git a/src/main/webapp/fonts/DroidSerif-Italic-webfont.woff b/src/main/webapp/fonts/DroidSerif-Italic-webfont.woff new file mode 100644 index 0000000..763cb62 Binary files /dev/null and b/src/main/webapp/fonts/DroidSerif-Italic-webfont.woff differ diff --git a/src/main/webapp/fonts/DroidSerif-Regular-webfont.eot b/src/main/webapp/fonts/DroidSerif-Regular-webfont.eot new file mode 100644 index 0000000..0a25a94 Binary files /dev/null and b/src/main/webapp/fonts/DroidSerif-Regular-webfont.eot differ diff --git a/src/main/webapp/fonts/DroidSerif-Regular-webfont.svg b/src/main/webapp/fonts/DroidSerif-Regular-webfont.svg new file mode 100644 index 0000000..4d37c8f --- /dev/null +++ b/src/main/webapp/fonts/DroidSerif-Regular-webfont.svg @@ -0,0 +1,167 @@ + + + + +This is a custom SVG webfont generated by Font Squirrel. +Copyright : Digitized data copyright 2006 Google Corporation +Foundry : Ascender Corporation +Foundry URL : httpwwwascendercorpcom + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/fonts/DroidSerif-Regular-webfont.ttf b/src/main/webapp/fonts/DroidSerif-Regular-webfont.ttf new file mode 100644 index 0000000..14c641b Binary files /dev/null and b/src/main/webapp/fonts/DroidSerif-Regular-webfont.ttf differ diff --git a/src/main/webapp/fonts/DroidSerif-Regular-webfont.woff b/src/main/webapp/fonts/DroidSerif-Regular-webfont.woff new file mode 100644 index 0000000..0ea54fd Binary files /dev/null and b/src/main/webapp/fonts/DroidSerif-Regular-webfont.woff differ diff --git a/src/main/webapp/fonts/LinLibertine_R-webfont.eot b/src/main/webapp/fonts/LinLibertine_R-webfont.eot deleted file mode 100644 index 4d928d8..0000000 Binary files a/src/main/webapp/fonts/LinLibertine_R-webfont.eot and /dev/null differ diff --git a/src/main/webapp/fonts/LinLibertine_R-webfont.svg b/src/main/webapp/fonts/LinLibertine_R-webfont.svg deleted file mode 100644 index 2e44ca8..0000000 --- a/src/main/webapp/fonts/LinLibertine_R-webfont.svg +++ /dev/null @@ -1,248 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Linux Libertine by Philipp H PollOpen Font under Terms of following Free Software LicensesGPL General Public License with fontexception and OFL Open Font LicenseCreated with FontForge httpfontforgesfnetSept 2003 2004 2005 2006 2007 2008 2009 2010 20112012 -Designer : Philipp H Poll -Foundry : Philipp H Poll -Foundry URL : httpwwwlinuxlibertineorg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/webapp/fonts/LinLibertine_R-webfont.ttf b/src/main/webapp/fonts/LinLibertine_R-webfont.ttf deleted file mode 100644 index bacbd3b..0000000 Binary files a/src/main/webapp/fonts/LinLibertine_R-webfont.ttf and /dev/null differ diff --git a/src/main/webapp/fonts/LinLibertine_R-webfont.woff b/src/main/webapp/fonts/LinLibertine_R-webfont.woff deleted file mode 100644 index 9b10831..0000000 Binary files a/src/main/webapp/fonts/LinLibertine_R-webfont.woff and /dev/null differ diff --git a/src/main/webapp/fonts/LinLibertine_RB-webfont.eot b/src/main/webapp/fonts/LinLibertine_RB-webfont.eot deleted file mode 100644 index 40065c6..0000000 Binary files a/src/main/webapp/fonts/LinLibertine_RB-webfont.eot and /dev/null differ diff --git a/src/main/webapp/fonts/LinLibertine_RB-webfont.svg b/src/main/webapp/fonts/LinLibertine_RB-webfont.svg deleted file mode 100644 index 8ea3ccf..0000000 --- a/src/main/webapp/fonts/LinLibertine_RB-webfont.svg +++ /dev/null @@ -1,248 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Linux Libertine by Philipp H PollOpen Font under Terms of following Free Software LicensesGPL General Public License with fontexception and OFL Open Font LicenseCreated with FontForge httpfontforgesfnetSept 2003 2004 2005 2006 2007 2008 2009 2010 20112012 -Designer : Philipp H Poll -Foundry : Philipp H Poll -Foundry URL : httpwwwlinuxlibertineorg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/webapp/fonts/LinLibertine_RB-webfont.ttf b/src/main/webapp/fonts/LinLibertine_RB-webfont.ttf deleted file mode 100644 index e3eae50..0000000 Binary files a/src/main/webapp/fonts/LinLibertine_RB-webfont.ttf and /dev/null differ diff --git a/src/main/webapp/fonts/LinLibertine_RB-webfont.woff b/src/main/webapp/fonts/LinLibertine_RB-webfont.woff deleted file mode 100644 index 5599abb..0000000 Binary files a/src/main/webapp/fonts/LinLibertine_RB-webfont.woff and /dev/null differ diff --git a/src/main/webapp/fonts/LinLibertine_RBI-webfont.eot b/src/main/webapp/fonts/LinLibertine_RBI-webfont.eot deleted file mode 100644 index 51b11bb..0000000 Binary files a/src/main/webapp/fonts/LinLibertine_RBI-webfont.eot and /dev/null differ diff --git a/src/main/webapp/fonts/LinLibertine_RBI-webfont.svg b/src/main/webapp/fonts/LinLibertine_RBI-webfont.svg deleted file mode 100644 index efb4d59..0000000 --- a/src/main/webapp/fonts/LinLibertine_RBI-webfont.svg +++ /dev/null @@ -1,248 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Linux Libertine by Philipp H PollOpen Font under Terms of following Free Software LicensesGPL General Public License with fontexception and OFL Open Font LicenseCreated with FontForge httpfontforgesfnetSept 2003 2004 2005 2006 2007 2008 2009 2010 20112012 -Designer : Philipp H Poll -Foundry : Philipp H Poll -Foundry URL : httpwwwlinuxlibertineorg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/webapp/fonts/LinLibertine_RBI-webfont.ttf b/src/main/webapp/fonts/LinLibertine_RBI-webfont.ttf deleted file mode 100644 index a6b4714..0000000 Binary files a/src/main/webapp/fonts/LinLibertine_RBI-webfont.ttf and /dev/null differ diff --git a/src/main/webapp/fonts/LinLibertine_RBI-webfont.woff b/src/main/webapp/fonts/LinLibertine_RBI-webfont.woff deleted file mode 100644 index fea2e60..0000000 Binary files a/src/main/webapp/fonts/LinLibertine_RBI-webfont.woff and /dev/null differ diff --git a/src/main/webapp/fonts/LinLibertine_RI-webfont.eot b/src/main/webapp/fonts/LinLibertine_RI-webfont.eot deleted file mode 100644 index b5d76d8..0000000 Binary files a/src/main/webapp/fonts/LinLibertine_RI-webfont.eot and /dev/null differ diff --git a/src/main/webapp/fonts/LinLibertine_RI-webfont.svg b/src/main/webapp/fonts/LinLibertine_RI-webfont.svg deleted file mode 100644 index c1261f2..0000000 --- a/src/main/webapp/fonts/LinLibertine_RI-webfont.svg +++ /dev/null @@ -1,248 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Linux Libertine by Philipp H PollOpen Font under Terms of following Free Software LicensesGPL General Public License with fontexception and OFL Open Font LicenseCreated with FontForge httpfontforgesfnetSept 2003 2004 2005 2006 2007 2008 2009 2010 20112012 -Designer : Philipp H Poll -Foundry : Philipp H Poll -Foundry URL : httpwwwlinuxlibertineorg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/webapp/fonts/LinLibertine_RI-webfont.ttf b/src/main/webapp/fonts/LinLibertine_RI-webfont.ttf deleted file mode 100644 index d223f14..0000000 Binary files a/src/main/webapp/fonts/LinLibertine_RI-webfont.ttf and /dev/null differ diff --git a/src/main/webapp/fonts/LinLibertine_RI-webfont.woff b/src/main/webapp/fonts/LinLibertine_RI-webfont.woff deleted file mode 100644 index e99fa17..0000000 Binary files a/src/main/webapp/fonts/LinLibertine_RI-webfont.woff and /dev/null differ