Browse Source

switching fonts

Casey DeLorme 10 năm trước cách đây
mục cha
commit
bde77f2c59
1 tập tin đã thay đổi với 28 bổ sung89 xóa
  1. 28 89
      public/css/main.css

+ 28 - 89
public/css/main.css

@@ -50,93 +50,41 @@ table {
 
 /* fonts */
 @font-face {
-    font-family: 'fertigo_proregular';
-    src: url('/cdn/fonts/fertigo_pro_regular-webfont.eot');
-    src: url('/cdn/fonts/fertigo_pro_regular-webfont.eot?#iefix') format('embedded-opentype'),
-         url('/cdn/fonts/fertigo_pro_regular-webfont.woff2') format('woff2'),
-         url('/cdn/fonts/fertigo_pro_regular-webfont.woff') format('woff'),
-         url('/cdn/fonts/fertigo_pro_regular-webfont.ttf') format('truetype'),
-         url('/cdn/fonts/fertigo_pro_regular-webfont.svg#fertigo_proregular') format('svg');
-    font-weight: normal;
-    font-style: normal;
-}
-@font-face {
-    font-family: 'allerbold';
-    src: url('/cdn/fonts/aller_bd-webfont.eot');
-    src: url('/cdn/fonts/aller_bd-webfont.eot?#iefix') format('embedded-opentype'),
-         url('/cdn/fonts/aller_bd-webfont.woff2') format('woff2'),
-         url('/cdn/fonts/aller_bd-webfont.woff') format('woff'),
-         url('/cdn/fonts/aller_bd-webfont.ttf') format('truetype'),
-         url('/cdn/fonts/aller_bd-webfont.svg#allerbold') format('svg');
-    font-weight: normal;
-    font-style: normal;
-}
-@font-face {
-    font-family: 'allerbold_italic';
-    src: url('/cdn/fonts/aller_bdit-webfont.eot');
-    src: url('/cdn/fonts/aller_bdit-webfont.eot?#iefix') format('embedded-opentype'),
-         url('/cdn/fonts/aller_bdit-webfont.woff2') format('woff2'),
-         url('/cdn/fonts/aller_bdit-webfont.woff') format('woff'),
-         url('/cdn/fonts/aller_bdit-webfont.ttf') format('truetype'),
-         url('/cdn/fonts/aller_bdit-webfont.svg#allerbold_italic') format('svg');
-    font-weight: normal;
-    font-style: normal;
-}
-@font-face {
-    font-family: 'aller_lightitalic';
-    src: url('/cdn/fonts/aller_ltit-webfont.eot');
-    src: url('/cdn/fonts/aller_ltit-webfont.eot?#iefix') format('embedded-opentype'),
-         url('/cdn/fonts/aller_ltit-webfont.woff2') format('woff2'),
-         url('/cdn/fonts/aller_ltit-webfont.woff') format('woff'),
-         url('/cdn/fonts/aller_ltit-webfont.ttf') format('truetype'),
-         url('/cdn/fonts/aller_ltit-webfont.svg#aller_lightitalic') format('svg');
-    font-weight: normal;
-    font-style: normal;
-}
-@font-face {
-    font-family: 'alleritalic';
-    src: url('/cdn/fonts/aller_it-webfont.eot');
-    src: url('/cdn/fonts/aller_it-webfont.eot?#iefix') format('embedded-opentype'),
-         url('/cdn/fonts/aller_it-webfont.woff2') format('woff2'),
-         url('/cdn/fonts/aller_it-webfont.woff') format('woff'),
-         url('/cdn/fonts/aller_it-webfont.ttf') format('truetype'),
-         url('/cdn/fonts/aller_it-webfont.svg#alleritalic') format('svg');
-    font-weight: normal;
-    font-style: normal;
-}
-@font-face {
-    font-family: 'aller_displayregular';
-    src: url('/cdn/fonts/allerdisplay-webfont.eot');
-    src: url('/cdn/fonts/allerdisplay-webfont.eot?#iefix') format('embedded-opentype'),
-         url('/cdn/fonts/allerdisplay-webfont.woff2') format('woff2'),
-         url('/cdn/fonts/allerdisplay-webfont.woff') format('woff'),
-         url('/cdn/fonts/allerdisplay-webfont.ttf') format('truetype'),
-         url('/cdn/fonts/allerdisplay-webfont.svg#aller_displayregular') format('svg');
+    font-family: 'allerregular';
+    src: url('/cdn/fonts/aller_rg-webfont.eot');
+    src: url('/cdn/fonts/aller_rg-webfont.eot?#iefix') format('embedded-opentype'),
+         url('/cdn/fonts/aller_rg-webfont.woff2') format('woff2'),
+         url('/cdn/fonts/aller_rg-webfont.woff') format('woff'),
+         url('/cdn/fonts/aller_rg-webfont.ttf') format('truetype'),
+         url('/cdn/fonts/aller_rg-webfont.svg#allerregular') format('svg');
     font-weight: normal;
     font-style: normal;
 }
 @font-face {
-    font-family: 'aller_lightregular';
-    src: url('/cdn/fonts/aller_lt-webfont.eot');
-    src: url('/cdn/fonts/aller_lt-webfont.eot?#iefix') format('embedded-opentype'),
-         url('/cdn/fonts/aller_lt-webfont.woff2') format('woff2'),
-         url('/cdn/fonts/aller_lt-webfont.woff') format('woff'),
-         url('/cdn/fonts/aller_lt-webfont.ttf') format('truetype'),
-         url('/cdn/fonts/aller_lt-webfont.svg#aller_lightregular') format('svg');
+    font-family: 'droid_sansregular';
+    src: url('/cdn/fonts/droidsans-webfont.eot');
+    src: url('/cdn/fonts/droidsans-webfont.eot?#iefix') format('embedded-opentype'),
+         url('/cdn/fonts/droidsans-webfont.woff2') format('woff2'),
+         url('/cdn/fonts/droidsans-webfont.woff') format('woff'),
+         url('/cdn/fonts/droidsans-webfont.ttf') format('truetype'),
+         url('/cdn/fonts/droidsans-webfont.svg#allerregular') format('svg');
     font-weight: normal;
     font-style: normal;
 }
+/* alternative for body text
 @font-face {
-    font-family: 'allerregular';
-    src: url('/cdn/fonts/aller_rg-webfont.eot');
-    src: url('/cdn/fonts/aller_rg-webfont.eot?#iefix') format('embedded-opentype'),
-         url('/cdn/fonts/aller_rg-webfont.woff2') format('woff2'),
-         url('/cdn/fonts/aller_rg-webfont.woff') format('woff'),
-         url('/cdn/fonts/aller_rg-webfont.ttf') format('truetype'),
-         url('/cdn/fonts/aller_rg-webfont.svg#allerregular') format('svg');
+    font-family: 'fertigo_proregular';
+    src: url('/cdn/fonts/fertigo_pro_regular-webfont.eot');
+    src: url('/cdn/fonts/fertigo_pro_regular-webfont.eot?#iefix') format('embedded-opentype'),
+         url('/cdn/fonts/fertigo_pro_regular-webfont.woff2') format('woff2'),
+         url('/cdn/fonts/fertigo_pro_regular-webfont.woff') format('woff'),
+         url('/cdn/fonts/fertigo_pro_regular-webfont.ttf') format('truetype'),
+         url('/cdn/fonts/fertigo_pro_regular-webfont.svg#fertigo_proregular') format('svg');
     font-weight: normal;
     font-style: normal;
 }
+*/
+/* alternative for headings
 @font-face {
     font-family: 'droid_sansbold';
     src: url('/cdn/fonts/droidsans-bold-webfont.eot');
@@ -148,26 +96,17 @@ table {
     font-weight: normal;
     font-style: normal;
 }
-@font-face {
-    font-family: 'droid_sansregular';
-    src: url('/cdn/fonts/droidsans-webfont.eot');
-    src: url('/cdn/fonts/droidsans-webfont.eot?#iefix') format('embedded-opentype'),
-         url('/cdn/fonts/droidsans-webfont.woff2') format('woff2'),
-         url('/cdn/fonts/droidsans-webfont.woff') format('woff'),
-         url('/cdn/fonts/droidsans-webfont.ttf') format('truetype'),
-         url('/cdn/fonts/droidsans-webfont.svg#allerregular') format('svg');
-    font-weight: normal;
-    font-style: normal;
-}
+*/
 
 /* default styles */
 html {
-    font-family: 'droid_sansregular', 'fertigo_proregular', helvetica;
+    font-family: 'droid_sansregular', helvetica;
 }
 h1, h2, h3, h4 {
-    font-family: 'aller_displayregular', 'allerbold', sans-serif, georgia, helvetica;
+    font-family: 'allerregular', sans-serif, georgia;
     margin-bottom: 15px;
     margin-top: 20px;
+    letter-spacing: 2px;
 }
 h1, h2 {
     font-weight: bolder;