From b6dfbd408cf0ba9dde5a783977aeada41346bbe3 Mon Sep 17 00:00:00 2001
From: Casey Link <unnamedrambler@gmail.com>
Date: Thu, 29 May 2014 10:19:52 +0200
Subject: [PATCH] firefly: prettyify the fonts

---
 Firefly/firefly.css | 39 ++++++++++++++++++++++++++++++++++++++-
 Firefly/mixins.less | 45 +++++++++++++++++++++++++++++++++++++++++++++
 Firefly/styles.less |  7 ++++++-
 3 files changed, 89 insertions(+), 2 deletions(-)

diff --git a/Firefly/firefly.css b/Firefly/firefly.css
index d7f3c43b79..f24492b3b4 100644
--- a/Firefly/firefly.css
+++ b/Firefly/firefly.css
@@ -1,3 +1,30 @@
+@font-face {
+  font-family: 'aller';
+  src: url('https://ramblurr.github.io/roll20-character-sheets/font/aller_rg-webfont.eot');
+  src: url('https://ramblurr.github.io/roll20-character-sheets/font/aller_rg-webfont.eot?#iefix') format('embedded-opentype'), url('https://ramblurr.github.io/roll20-character-sheets/font/aller_rg-webfont.woff') format('woff'), url('https://ramblurr.github.io/roll20-character-sheets/font/aller_rg-webfont.ttf') format('truetype'), url('https://ramblurr.github.io/roll20-character-sheets/font/aller_rg-webfont.svg#allerregular') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+@font-face {
+  font-family: 'allerbold';
+  src: url('https://ramblurr.github.io/roll20-character-sheets/font/aller_bd-webfont.eot');
+  src: url('https://ramblurr.github.io/roll20-character-sheets/font/aller_bd-webfont.eot?#iefix') format('embedded-opentype'), url('https://ramblurr.github.io/roll20-character-sheets/font/aller_bd-webfont.woff') format('woff'), url('https://ramblurr.github.io/roll20-character-sheets/font/aller_bd-webfont.ttf') format('truetype'), url('https://ramblurr.github.io/roll20-character-sheets/font/aller_bd-webfont.svg#allerbold') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+@font-face {
+  font-family: 'alleritalic';
+  src: url('https://ramblurr.github.io/roll20-character-sheets/font/aller_it-webfont.eot');
+  src: url('https://ramblurr.github.io/roll20-character-sheets/font/aller_it-webfont.eot?#iefix') format('embedded-opentype'), url('https://ramblurr.github.io/roll20-character-sheets/font/aller_it-webfont.woff') format('woff'), url('https://ramblurr.github.io/roll20-character-sheets/font/aller_it-webfont.ttf') format('truetype'), url('https://ramblurr.github.io/roll20-character-sheets/font/aller_it-webfont.svg#alleritalic') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+@font-face {
+  font-family: 'Jura';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Jura Regular'), local('Jura-Regular'), url(https://themes.googleusercontent.com/static/fonts/jura/v5/pqMzP52_r6zHbOILcX8h-A.woff) format('woff');
+}
 @-webkit-keyframes fadeAnim {
   0% {
     opacity: 0;
@@ -229,6 +256,7 @@ hr {
   border-color: #cccccc;
   font-family: Jura, Calibri, Candara, Segoe, "Segoe UI", Optima, "Liberation Sans", Arial, sans-serif;
   border: 0px solid transparent;
+  font-weight: bold;
 }
 .sheet-page .sheet-section button[type=roll]:focus,
 .sheet-page .sheet-section button[type=roll]:active:focus,
@@ -372,6 +400,7 @@ fieldset[disabled] .sheet-page .sheet-section button[type=roll].active {
 .sheet-attributes .sheet-attribute > button {
   float: right;
   display: inline-block;
+  height: 35px;
 }
 /* Section: Skills */
 .sheet-skills table {
@@ -401,6 +430,8 @@ fieldset[disabled] .sheet-page .sheet-section button[type=roll].active {
   line-height: 1.5;
   border-radius: 3px;
   padding: 1px 1px;
+  font-weight: normal;
+  height: 23px;
 }
 .sheet-skills table td input.sheet-skill-spec + button[type=roll]:before {
   content: "t";
@@ -428,11 +459,13 @@ fieldset[disabled] .sheet-page .sheet-section button[type=roll].active {
   border-color: #cccccc;
   font-family: Jura, Calibri, Candara, Segoe, "Segoe UI", Optima, "Liberation Sans", Arial, sans-serif;
   border: 0px solid transparent;
+  font-weight: bold;
   padding: 5px 10px;
   font-size: 12px;
   line-height: 1.5;
   border-radius: 3px;
   min-width: 70px;
+  font-size: 0.75em;
 }
 .sheet-skills table td .sheet-dropdown button[type=roll]:focus,
 .sheet-skills table td .sheet-dropdown button[type=roll]:active:focus,
@@ -556,6 +589,7 @@ fieldset[disabled] .sheet-skills table td .sheet-dropdown button[type=roll].acti
   line-height: 1.5;
   border-radius: 3px;
   padding: 1px 1px;
+  font-weight: normal;
   width: 35px;
   height: 35px;
 }
@@ -564,12 +598,14 @@ fieldset[disabled] .sheet-skills table td .sheet-dropdown button[type=roll].acti
 }
 .sheet-distinctions .sheet-distinction-skills {
   font-variant: small-caps;
-  font-weight: bold;
   margin: 0;
 }
 .sheet-distinctions .sheet-distinction-skills input[type=text] {
+  font-family: Jura, Calibri, Candara, Segoe, "Segoe UI", Optima, "Liberation Sans", Arial, sans-serif;
   width: 50px;
   margin-left: 2px;
+  font-weight: bolder;
+  line-height: 1.5;
 }
 /* Section: Signature Assets*/
 .sheet-sigassets .sheet-sigasset-head {
@@ -596,6 +632,7 @@ fieldset[disabled] .sheet-skills table td .sheet-dropdown button[type=roll].acti
   line-height: 1.5;
   border-radius: 3px;
   padding: 1px 1px;
+  font-weight: normal;
   display: inline-block;
   float: right;
   width: 35px;
diff --git a/Firefly/mixins.less b/Firefly/mixins.less
index 175ca72a93..68341df052 100644
--- a/Firefly/mixins.less
+++ b/Firefly/mixins.less
@@ -19,6 +19,7 @@
     .btn-default;
     .fontSansSerif();
     border: 0px solid transparent;
+    font-weight: bold;
 }
 
 .rollButton() {
@@ -28,6 +29,7 @@
     line-height: 1.5;
     border-radius: 3px;
     padding: 1px 1px;
+    font-weight: normal;
     &:before {
         content: "t";
     }
@@ -40,6 +42,49 @@
     margin-bottom: 5px;
 
 }
+@aller-prefix: 'https://ramblurr.github.io/roll20-character-sheets/font';
+@font-face {
+    font-family: 'aller';
+    src: url('@{aller-prefix}/aller_rg-webfont.eot');
+    src: url('@{aller-prefix}/aller_rg-webfont.eot?#iefix') format('embedded-opentype'),
+         url('@{aller-prefix}/aller_rg-webfont.woff') format('woff'),
+         url('@{aller-prefix}/aller_rg-webfont.ttf') format('truetype'),
+         url('@{aller-prefix}/aller_rg-webfont.svg#allerregular') format('svg');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+@font-face {
+    font-family: 'allerbold';
+    src: url('@{aller-prefix}/aller_bd-webfont.eot');
+    src: url('@{aller-prefix}/aller_bd-webfont.eot?#iefix') format('embedded-opentype'),
+         url('@{aller-prefix}/aller_bd-webfont.woff') format('woff'),
+         url('@{aller-prefix}/aller_bd-webfont.ttf') format('truetype'),
+         url('@{aller-prefix}/aller_bd-webfont.svg#allerbold') format('svg');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+@font-face {
+    font-family: 'alleritalic';
+    src: url('@{aller-prefix}/aller_it-webfont.eot');
+    src: url('@{aller-prefix}/aller_it-webfont.eot?#iefix') format('embedded-opentype'),
+         url('@{aller-prefix}/aller_it-webfont.woff') format('woff'),
+         url('@{aller-prefix}/aller_it-webfont.ttf') format('truetype'),
+         url('@{aller-prefix}/aller_it-webfont.svg#alleritalic') format('svg');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+@font-face {
+  font-family: 'Jura';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Jura Regular'), local('Jura-Regular'), url(https://themes.googleusercontent.com/static/fonts/jura/v5/pqMzP52_r6zHbOILcX8h-A.woff) format('woff');
+}
 
 .fontSerif() {
     font-family: 'aller', palatino, Cambria, "Hoefler Text", "Liberation Serif", Times, "Times New Roman", serif;
diff --git a/Firefly/styles.less b/Firefly/styles.less
index 351d48f064..618fa5061e 100644
--- a/Firefly/styles.less
+++ b/Firefly/styles.less
@@ -144,6 +144,7 @@ hr {
         & > button {
             float: right;
             display: inline-block;
+            height: 35px;
         }
     }
 }
@@ -168,12 +169,14 @@ hr {
             line-height: 1.5;
             & + button[type=roll] {
                 .rollButton();
+                height: 23px;
             }
         }
         .sheet-dropdown button[type=roll] {
             .btn-clear();
             .btn-sm;
             min-width: 70px;
+            font-size: 0.75em;
         }
     }
     .sheet-dropdown {
@@ -231,11 +234,13 @@ hr {
     }
     .sheet-distinction-skills {
         font-variant: small-caps;
-        font-weight: bold;
         margin: 0;
         input[type=text] {
+            .fontSansSerif();
             width: 50px;
             margin-left: 2px;
+            font-weight: bolder;
+            line-height: 1.5;
         }
     }