Merge pull request #1504 from dwaltz/gh-pages

Font family change for fuelux-fusion site
ExactTarget · Sep 14, 2015 · 4dfc35e · 4dfc35e
2 parents 856a663 + 7c67f24
commit 4dfc35e
Show file tree

Hide file tree

Showing 7 changed files with 457 additions and 1 deletion.
diff --git a/assets/css/fusion.css b/assets/css/fusion.css
@@ -1,7 +1,33 @@
+@font-face {
+    font-family:"Salesforce Sans";
+    src:url(../fonts/SalesforceSans-Regular.eot) format("eot"),
+    url(../fonts/SalesforceSans-Regular.woff) format("woff"),
+    url(../fonts/SalesforceSans-Regular.ttf) format("truetype"),
+    url(../fonts/SalesforceSans-Regular.svg) format("svg")
+}
+
 #fusion-body{
     padding:50px;
-    padding-top:0px;
+    padding-top:0;
+    font-size: 14px;
+    font-family: "Salesforce Sans","Helvetica Neue",Helvetica,Arial,sans-serif;
+}
+
+#fusion-body .page-header {
+    font-size: 24px;
+    color: #333;
+}
+
+#fusion-body .fu-docs-section > h2 {
+    font-size: 18px;
+    color: #333;
+}
+
+#fusion-body .fu-docs-section > p {
+    font-size: 14px;
+    color: #333;
 }
+
 h1 .header-anchor{
     left:-1px;   
 }

diff --git a/assets/css/salesforce-font.css b/assets/css/salesforce-font.css
diff --git a/assets/fonts/SalesforceSans-Regular.eot b/assets/fonts/SalesforceSans-Regular.eot
diff --git a/assets/fonts/SalesforceSans-Regular.svg b/assets/fonts/SalesforceSans-Regular.svg
diff --git a/assets/fonts/SalesforceSans-Regular.ttf b/assets/fonts/SalesforceSans-Regular.ttf
diff --git a/assets/fonts/SalesforceSans-Regular.woff b/assets/fonts/SalesforceSans-Regular.woff
diff --git a/assets/fonts/SalesforceSans-Regular.woff2 b/assets/fonts/SalesforceSans-Regular.woff2