diff --git a/media/css/screen.css b/media/css/screen.css index 52a77a9..530242e 100644 --- a/media/css/screen.css +++ b/media/css/screen.css @@ -3,9 +3,14 @@ License: none (public domain) */ -@import url(http://fonts.googleapis.com/css?family=Galdeano); -@import url(http://fonts.googleapis.com/css?family=Electrolize); -@import url(http://fonts.googleapis.com/css?family=Cuprum); +@font-face{font-family:'MuseoSans';src:url('../fonts/museosans_300-webfont.eot');src:url('../fonts/museosans_300-webfont.eot?#iefix') format('embedded-opentype'),url('../fonts/museosans_300-webfont.woff') format('woff'),url('../fonts/museosans_300-webfont.ttf') format('truetype'),url('../fonts/museosans_300-webfont.svg#MuseoSans300Regular') format('svg');font-weight:normal;font-style:normal} +@font-face{font-family:'MuseoSans';src:url('../fonts/museosans_100_italic-webfont.eot');src:url('../fonts/museosans_100_italic-webfont.eot?#iefix') format('embedded-opentype'),url('../fonts/museosans_100_italic-webfont.woff') format('woff'),url('../fonts/museosans_100_italic-webfont.ttf') format('truetype'),url('../fonts/museosans_100_italic-webfont.svg#MuseoSans100Italic') format('svg');font-weight:normal;font-style:italic} +@font-face{font-family:'MuseoSans';src:url('../fonts/museosans_700-webfont.eot');src:url('../fonts/museosans_700-webfont.eot?#iefix') format('embedded-opentype'),url('../fonts/museosans_700-webfont.woff') format('woff'),url('../fonts/museosans_700-webfont.ttf') format('truetype'),url('../fonts/museosans_700-webfont.svg#MuseoSans700Regular') format('svg');font-weight:bold;font-style:normal} +@font-face{font-family:'MuseoSans_light';src:url('../fonts/museosans_100-webfont.eot');src:url('../fonts/museosans_100-webfont.eot?#iefix') format('embedded-opentype'),url('../fonts/museosans_100-webfont.woff') format('woff'),url('../fonts/museosans_100-webfont.ttf') format('truetype'),url('../fonts/museosans_100-webfont.svg#MuseoSans100') format('svg');font-weight:normal;font-style:normal} +@font-face{font-family:'MuseoSans_bold';src:url('../fonts/museosans_900-webfont.eot');src:url('../fonts/museosans_900-webfont.eot?#iefix') format('embedded-opentype'),url('../fonts/museosans_900-webfont.woff') format('woff'),url('../fonts/museosans_900-webfont.ttf') format('truetype'),url('../fonts/museosans_900-webfont.svg#MuseoSans900') format('svg');font-weight:normal;font-style:normal} +@font-face{font-family:'museo_300regular';src:url('../fonts/museo300-regular-webfont.eot');src:url('../fonts/museo300-regular-webfont.eot?#iefix') format('embedded-opentype'),url('../fonts/museo300-regular-webfont.woff') format('woff'),url('../fonts/museo300-regular-webfont.ttf') format('truetype'),url('../fonts/museo300-regular-webfont.svg#museo_300regular') format('svg');font-weight:normal;font-style:normal} +@font-face{font-family:'museo_500regular';src:url('../fonts/museo500-regular-webfont.eot');src:url('../fonts/museo500-regular-webfont.eot?#iefix') format('embedded-opentype'),url('../fonts/museo500-regular-webfont.woff') format('woff'),url('../fonts/museo500-regular-webfont.ttf') format('truetype'),url('../fonts/museo500-regular-webfont.svg#museo_500regular') format('svg');font-weight:normal;font-style:normal} +@font-face{font-family:'museo_700regular';src:url('../fonts/museo700-regular-webfont.eot');src:url('../fonts/museo700-regular-webfont.eot?#iefix') format('embedded-opentype'),url('../fonts/museo700-regular-webfont.woff') format('woff'),url('../fonts/museo700-regular-webfont.ttf') format('truetype'),url('../fonts/museo700-regular-webfont.svg#museo_700regular') format('svg');font-weight:normal;font-style:normal} html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, @@ -56,7 +61,7 @@ body{ font-size:16px;word-spacing:1px; margin-left:auto; margin-right:auto; - font-family:"Galdeano","Hiragino Sans GB","Microsoft YaHei",Trebuchet,"Trebuchet MS",Tahoma,"Lucida Grande","Lucida Sans Unicode",Verdana,sans-serif; + font-family:MuseoSans,Georgia,"Microsoft YaHei",Trebuchet,"Trebuchet MS",Tahoma,"Lucida Grande","Lucida Sans Unicode",Verdana,sans-serif; color:#000000; background-color:#ffffff; } diff --git a/media/fonts/museo300-regular-webfont.eot b/media/fonts/museo300-regular-webfont.eot new file mode 100644 index 0000000..ce97124 Binary files /dev/null and b/media/fonts/museo300-regular-webfont.eot differ diff --git a/media/fonts/museo300-regular-webfont.svg b/media/fonts/museo300-regular-webfont.svg new file mode 100644 index 0000000..7dd8de0 --- /dev/null +++ b/media/fonts/museo300-regular-webfont.svg @@ -0,0 +1,242 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/media/fonts/museo300-regular-webfont.ttf b/media/fonts/museo300-regular-webfont.ttf new file mode 100644 index 0000000..eb86063 Binary files /dev/null and b/media/fonts/museo300-regular-webfont.ttf differ diff --git a/media/fonts/museo300-regular-webfont.woff b/media/fonts/museo300-regular-webfont.woff new file mode 100644 index 0000000..5b9f7d6 Binary files /dev/null and b/media/fonts/museo300-regular-webfont.woff differ diff --git a/media/fonts/museo500-regular-webfont.eot b/media/fonts/museo500-regular-webfont.eot new file mode 100644 index 0000000..0f125e2 Binary files /dev/null and b/media/fonts/museo500-regular-webfont.eot differ diff --git a/media/fonts/museo500-regular-webfont.svg b/media/fonts/museo500-regular-webfont.svg new file mode 100644 index 0000000..1c7ccce --- /dev/null +++ b/media/fonts/museo500-regular-webfont.svg @@ -0,0 +1,242 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/media/fonts/museo500-regular-webfont.ttf b/media/fonts/museo500-regular-webfont.ttf new file mode 100644 index 0000000..2e3fcfe Binary files /dev/null and b/media/fonts/museo500-regular-webfont.ttf differ diff --git a/media/fonts/museo500-regular-webfont.woff b/media/fonts/museo500-regular-webfont.woff new file mode 100644 index 0000000..45ab336 Binary files /dev/null and b/media/fonts/museo500-regular-webfont.woff differ diff --git a/media/fonts/museo700-regular-webfont.eot b/media/fonts/museo700-regular-webfont.eot new file mode 100644 index 0000000..cfebd06 Binary files /dev/null and b/media/fonts/museo700-regular-webfont.eot differ diff --git a/media/fonts/museo700-regular-webfont.svg b/media/fonts/museo700-regular-webfont.svg new file mode 100644 index 0000000..6f0bd4d --- /dev/null +++ b/media/fonts/museo700-regular-webfont.svg @@ -0,0 +1,242 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/media/fonts/museo700-regular-webfont.ttf b/media/fonts/museo700-regular-webfont.ttf new file mode 100644 index 0000000..aa167ce Binary files /dev/null and b/media/fonts/museo700-regular-webfont.ttf differ diff --git a/media/fonts/museo700-regular-webfont.woff b/media/fonts/museo700-regular-webfont.woff new file mode 100644 index 0000000..6a08e8e Binary files /dev/null and b/media/fonts/museo700-regular-webfont.woff differ diff --git a/media/fonts/museosans_100-webfont.eot b/media/fonts/museosans_100-webfont.eot new file mode 100644 index 0000000..3dd0463 Binary files /dev/null and b/media/fonts/museosans_100-webfont.eot differ diff --git a/media/fonts/museosans_100-webfont.svg b/media/fonts/museosans_100-webfont.svg new file mode 100644 index 0000000..f9b7a42 --- /dev/null +++ b/media/fonts/museosans_100-webfont.svg @@ -0,0 +1,241 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/media/fonts/museosans_100-webfont.ttf b/media/fonts/museosans_100-webfont.ttf new file mode 100644 index 0000000..d0c3f9f Binary files /dev/null and b/media/fonts/museosans_100-webfont.ttf differ diff --git a/media/fonts/museosans_100-webfont.woff b/media/fonts/museosans_100-webfont.woff new file mode 100644 index 0000000..9507fa2 Binary files /dev/null and b/media/fonts/museosans_100-webfont.woff differ diff --git a/media/fonts/museosans_100_italic-webfont.eot b/media/fonts/museosans_100_italic-webfont.eot new file mode 100644 index 0000000..fc45341 Binary files /dev/null and b/media/fonts/museosans_100_italic-webfont.eot differ diff --git a/media/fonts/museosans_100_italic-webfont.svg b/media/fonts/museosans_100_italic-webfont.svg new file mode 100644 index 0000000..12a8b96 --- /dev/null +++ b/media/fonts/museosans_100_italic-webfont.svg @@ -0,0 +1,241 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/media/fonts/museosans_100_italic-webfont.ttf b/media/fonts/museosans_100_italic-webfont.ttf new file mode 100644 index 0000000..fa416e1 Binary files /dev/null and b/media/fonts/museosans_100_italic-webfont.ttf differ diff --git a/media/fonts/museosans_100_italic-webfont.woff b/media/fonts/museosans_100_italic-webfont.woff new file mode 100644 index 0000000..5badcc1 Binary files /dev/null and b/media/fonts/museosans_100_italic-webfont.woff differ diff --git a/media/fonts/museosans_300-webfont.eot b/media/fonts/museosans_300-webfont.eot new file mode 100644 index 0000000..69cef0a Binary files /dev/null and b/media/fonts/museosans_300-webfont.eot differ diff --git a/media/fonts/museosans_300-webfont.svg b/media/fonts/museosans_300-webfont.svg new file mode 100644 index 0000000..177137a --- /dev/null +++ b/media/fonts/museosans_300-webfont.svg @@ -0,0 +1,241 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/media/fonts/museosans_300-webfont.ttf b/media/fonts/museosans_300-webfont.ttf new file mode 100644 index 0000000..c8a7a06 Binary files /dev/null and b/media/fonts/museosans_300-webfont.ttf differ diff --git a/media/fonts/museosans_300-webfont.woff b/media/fonts/museosans_300-webfont.woff new file mode 100644 index 0000000..7a95420 Binary files /dev/null and b/media/fonts/museosans_300-webfont.woff differ diff --git a/media/fonts/museosans_700-webfont.eot b/media/fonts/museosans_700-webfont.eot new file mode 100644 index 0000000..9e10e61 Binary files /dev/null and b/media/fonts/museosans_700-webfont.eot differ diff --git a/media/fonts/museosans_700-webfont.svg b/media/fonts/museosans_700-webfont.svg new file mode 100644 index 0000000..994fadc --- /dev/null +++ b/media/fonts/museosans_700-webfont.svg @@ -0,0 +1,241 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/media/fonts/museosans_700-webfont.ttf b/media/fonts/museosans_700-webfont.ttf new file mode 100644 index 0000000..ec91c4c Binary files /dev/null and b/media/fonts/museosans_700-webfont.ttf differ diff --git a/media/fonts/museosans_700-webfont.woff b/media/fonts/museosans_700-webfont.woff new file mode 100644 index 0000000..7b4a929 Binary files /dev/null and b/media/fonts/museosans_700-webfont.woff differ diff --git a/media/fonts/museosans_900-webfont.eot b/media/fonts/museosans_900-webfont.eot new file mode 100644 index 0000000..783c58c Binary files /dev/null and b/media/fonts/museosans_900-webfont.eot differ diff --git a/media/fonts/museosans_900-webfont.svg b/media/fonts/museosans_900-webfont.svg new file mode 100644 index 0000000..625305f --- /dev/null +++ b/media/fonts/museosans_900-webfont.svg @@ -0,0 +1,241 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/media/fonts/museosans_900-webfont.ttf b/media/fonts/museosans_900-webfont.ttf new file mode 100644 index 0000000..d7e73bd Binary files /dev/null and b/media/fonts/museosans_900-webfont.ttf differ diff --git a/media/fonts/museosans_900-webfont.woff b/media/fonts/museosans_900-webfont.woff new file mode 100644 index 0000000..1857422 Binary files /dev/null and b/media/fonts/museosans_900-webfont.woff differ