font family grouping

BONCOM · Jan 23, 2015 · 7a1670b · 7a1670b
1 parent cbd69a6
commit 7a1670b
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 203 deletions.
diff --git a/public/css/core.css b/public/css/core.css
@@ -347,84 +347,21 @@ td, th {
   padding: 0; }
 
 @font-face {
-  font-family: 'source_sans_problack_italic';
-  src: url('../fonts/source-sans/sourcesanspro-blackit-webfont.eot');
-  src: url('../fonts/source-sans/sourcesanspro-blackit-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/source-sans/sourcesanspro-blackit-webfont.woff2') format('woff2'), url('../fonts/source-sans/sourcesanspro-blackit-webfont.woff') format('woff'), url('../fonts/source-sans/sourcesanspro-blackit-webfont.ttf') format('truetype'), url('../fonts/source-sans/sourcesanspro-blackit-webfont.svg#source_sans_problack_italic') format('svg');
-  font-weight: normal;
-  font-style: normal; }
-
-@font-face {
-  font-family: 'source_sans_problack';
-  src: url('../fonts/source-sans/sourcesanspro-black-webfont.eot');
-  src: url('../fonts/source-sans/sourcesanspro-black-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/source-sans/sourcesanspro-black-webfont.woff2') format('woff2'), url('../fonts/source-sans/sourcesanspro-black-webfont.woff') format('woff'), url('../fonts/source-sans/sourcesanspro-black-webfont.ttf') format('truetype'), url('../fonts/source-sans/sourcesanspro-black-webfont.svg#source_sans_problack') format('svg');
-  font-weight: normal;
-  font-style: normal; }
-
-@font-face {
-  font-family: 'source_sans_probold_italic';
-  src: url('../fonts/source-sans/sourcesanspro-boldit-webfont.eot');
-  src: url('../fonts/source-sans/sourcesanspro-boldit-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/source-sans/sourcesanspro-boldit-webfont.woff2') format('woff2'), url('../fonts/source-sans/sourcesanspro-boldit-webfont.woff') format('woff'), url('../fonts/source-sans/sourcesanspro-boldit-webfont.ttf') format('truetype'), url('../fonts/source-sans/sourcesanspro-boldit-webfont.svg#source_sans_probold_italic') format('svg');
-  font-weight: normal;
-  font-style: normal; }
-
-@font-face {
-  font-family: 'source_sans_prolight_italic';
-  src: url('../fonts/source-sans/sourcesanspro-lightit-webfont.eot');
-  src: url('../fonts/source-sans/sourcesanspro-lightit-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/source-sans/sourcesanspro-lightit-webfont.woff2') format('woff2'), url('../fonts/source-sans/sourcesanspro-lightit-webfont.woff') format('woff'), url('../fonts/source-sans/sourcesanspro-lightit-webfont.ttf') format('truetype'), url('../fonts/source-sans/sourcesanspro-lightit-webfont.svg#source_sans_prolight_italic') format('svg');
-  font-weight: normal;
-  font-style: normal; }
-
-@font-face {
-  font-family: 'source_sans_proextralight';
-  src: url('../fonts/source-sans/sourcesanspro-extralight-webfont.eot');
-  src: url('../fonts/source-sans/sourcesanspro-extralight-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/source-sans/sourcesanspro-extralight-webfont.woff2') format('woff2'), url('../fonts/source-sans/sourcesanspro-extralight-webfont.woff') format('woff'), url('../fonts/source-sans/sourcesanspro-extralight-webfont.ttf') format('truetype'), url('../fonts/source-sans/sourcesanspro-extralight-webfont.svg#source_sans_proextralight') format('svg');
-  font-weight: normal;
-  font-style: normal; }
-
-@font-face {
-  font-family: 'source_sans_prolight';
-  src: url('../fonts/source-sans/sourcesanspro-light-webfont.eot');
-  src: url('../fonts/source-sans/sourcesanspro-light-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/source-sans/sourcesanspro-light-webfont.woff2') format('woff2'), url('../fonts/source-sans/sourcesanspro-light-webfont.woff') format('woff'), url('../fonts/source-sans/sourcesanspro-light-webfont.ttf') format('truetype'), url('../fonts/source-sans/sourcesanspro-light-webfont.svg#source_sans_prolight') format('svg');
-  font-weight: normal;
-  font-style: normal; }
-
-@font-face {
-  font-family: 'source_sans_proitalic';
+  font-family: 'source_sans';
   src: url('../fonts/source-sans/sourcesanspro-it-webfont.eot');
   src: url('../fonts/source-sans/sourcesanspro-it-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/source-sans/sourcesanspro-it-webfont.woff2') format('woff2'), url('../fonts/source-sans/sourcesanspro-it-webfont.woff') format('woff'), url('../fonts/source-sans/sourcesanspro-it-webfont.ttf') format('truetype'), url('../fonts/source-sans/sourcesanspro-it-webfont.svg#source_sans_proitalic') format('svg');
   font-weight: normal;
-  font-style: normal; }
-
-@font-face {
-  font-family: 'source_sans_proXLtIt';
-  src: url('../fonts/source-sans/sourcesanspro-extralightit-webfont.eot');
-  src: url('../fonts/source-sans/sourcesanspro-extralightit-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/source-sans/sourcesanspro-extralightit-webfont.woff2') format('woff2'), url('../fonts/source-sans/sourcesanspro-extralightit-webfont.woff') format('woff'), url('../fonts/source-sans/sourcesanspro-extralightit-webfont.ttf') format('truetype'), url('../fonts/source-sans/sourcesanspro-extralightit-webfont.svg#source_sans_proXLtIt') format('svg');
-  font-weight: normal;
-  font-style: normal; }
-
-@font-face {
-  font-family: 'source_sans_prosemibold';
-  src: url('../fonts/source-sans/sourcesanspro-semibold-webfont.eot');
-  src: url('../fonts/source-sans/sourcesanspro-semibold-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/source-sans/sourcesanspro-semibold-webfont.woff2') format('woff2'), url('../fonts/source-sans/sourcesanspro-semibold-webfont.woff') format('woff'), url('../fonts/source-sans/sourcesanspro-semibold-webfont.ttf') format('truetype'), url('../fonts/source-sans/sourcesanspro-semibold-webfont.svg#source_sans_prosemibold') format('svg');
-  font-weight: normal;
-  font-style: normal; }
-
-@font-face {
-  font-family: 'source_sans_proSBdIt';
-  src: url('../fonts/source-sans/sourcesanspro-semiboldit-webfont.eot');
-  src: url('../fonts/source-sans/sourcesanspro-semiboldit-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/source-sans/sourcesanspro-semiboldit-webfont.woff2') format('woff2'), url('../fonts/source-sans/sourcesanspro-semiboldit-webfont.woff') format('woff'), url('../fonts/source-sans/sourcesanspro-semiboldit-webfont.ttf') format('truetype'), url('../fonts/source-sans/sourcesanspro-semiboldit-webfont.svg#source_sans_proSBdIt') format('svg');
-  font-weight: normal;
-  font-style: normal; }
+  font-style: italic; }
 
 @font-face {
-  font-family: 'source_sans_probold';
+  font-family: 'source_sans';
   src: url('../fonts/source-sans/sourcesanspro-bold-webfont.eot');
   src: url('../fonts/source-sans/sourcesanspro-bold-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/source-sans/sourcesanspro-bold-webfont.woff2') format('woff2'), url('../fonts/source-sans/sourcesanspro-bold-webfont.woff') format('woff'), url('../fonts/source-sans/sourcesanspro-bold-webfont.ttf') format('truetype'), url('../fonts/source-sans/sourcesanspro-bold-webfont.svg#source_sans_probold') format('svg');
-  font-weight: normal;
+  font-weight: bold;
   font-style: normal; }
 
 @font-face {
-  font-family: 'source_sans_proregular';
+  font-family: 'source_sans';
   src: url('../fonts/source-sans/sourcesanspro-regular-webfont.eot');
   src: url('../fonts/source-sans/sourcesanspro-regular-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/source-sans/sourcesanspro-regular-webfont.woff2') format('woff2'), url('../fonts/source-sans/sourcesanspro-regular-webfont.woff') format('woff'), url('../fonts/source-sans/sourcesanspro-regular-webfont.ttf') format('truetype'), url('../fonts/source-sans/sourcesanspro-regular-webfont.svg#source_sans_proregular') format('svg');
   font-weight: normal;
@@ -434,7 +371,7 @@ html {
   overflow-x: hidden;
   overflow-y: auto;
   height: 100%;
-  font: 112.5%/1.5 "source_sans_proregular", "Lucida Grande", "Lucida Sans", sans-serif;
+  font: 112.5%/1.5 "source_sans", "Lucida Grande", "Lucida Sans", sans-serif;
   -webkit-text-size-adjust: 100%;
   -ms-text-size-adjust: 100%; }
   @media only screen and (min-width: 600px) {
@@ -705,7 +642,7 @@ h1, .h1, h2, .h2, h3, .h3, h4, .h4, h5, .h5, h6, .h6 {
   color: #444444;
   font-weight: 400;
   line-height: 1;
-  font-family: "source_sans_proregular", "Lucida Grande", "Lucida Sans", sans-serif;
+  font-family: "source_sans", "Lucida Grande", "Lucida Sans", sans-serif;
   margin-bottom: 27px;
   -webkit-font-smoothing: antialiased; }
   h1 small, .h1 small, h2 small, .h2 small, h3 small, .h3 small, h4 small, .h4 small, h5 small, .h5 small, h6 small, .h6 small {

diff --git a/public/css/core.min.css b/public/css/core.min.css
@@ -46,19 +46,10 @@ textarea{overflow:auto}
 optgroup{font-weight:700}
 table{border-collapse:collapse;border-spacing:0}
 td,th{padding:0}
-@font-face{font-family:source_sans_problack_italic;src:url(../fonts/source-sans/sourcesanspro-blackit-webfont.eot);src:url(../fonts/source-sans/sourcesanspro-blackit-webfont.eot?#iefix) format('embedded-opentype'),url(../fonts/source-sans/sourcesanspro-blackit-webfont.woff2) format('woff2'),url(../fonts/source-sans/sourcesanspro-blackit-webfont.woff) format('woff'),url(../fonts/source-sans/sourcesanspro-blackit-webfont.ttf) format('truetype'),url(../fonts/source-sans/sourcesanspro-blackit-webfont.svg#source_sans_problack_italic) format('svg');font-weight:400;font-style:normal}
-@font-face{font-family:source_sans_problack;src:url(../fonts/source-sans/sourcesanspro-black-webfont.eot);src:url(../fonts/source-sans/sourcesanspro-black-webfont.eot?#iefix) format('embedded-opentype'),url(../fonts/source-sans/sourcesanspro-black-webfont.woff2) format('woff2'),url(../fonts/source-sans/sourcesanspro-black-webfont.woff) format('woff'),url(../fonts/source-sans/sourcesanspro-black-webfont.ttf) format('truetype'),url(../fonts/source-sans/sourcesanspro-black-webfont.svg#source_sans_problack) format('svg');font-weight:400;font-style:normal}
-@font-face{font-family:source_sans_probold_italic;src:url(../fonts/source-sans/sourcesanspro-boldit-webfont.eot);src:url(../fonts/source-sans/sourcesanspro-boldit-webfont.eot?#iefix) format('embedded-opentype'),url(../fonts/source-sans/sourcesanspro-boldit-webfont.woff2) format('woff2'),url(../fonts/source-sans/sourcesanspro-boldit-webfont.woff) format('woff'),url(../fonts/source-sans/sourcesanspro-boldit-webfont.ttf) format('truetype'),url(../fonts/source-sans/sourcesanspro-boldit-webfont.svg#source_sans_probold_italic) format('svg');font-weight:400;font-style:normal}
-@font-face{font-family:source_sans_prolight_italic;src:url(../fonts/source-sans/sourcesanspro-lightit-webfont.eot);src:url(../fonts/source-sans/sourcesanspro-lightit-webfont.eot?#iefix) format('embedded-opentype'),url(../fonts/source-sans/sourcesanspro-lightit-webfont.woff2) format('woff2'),url(../fonts/source-sans/sourcesanspro-lightit-webfont.woff) format('woff'),url(../fonts/source-sans/sourcesanspro-lightit-webfont.ttf) format('truetype'),url(../fonts/source-sans/sourcesanspro-lightit-webfont.svg#source_sans_prolight_italic) format('svg');font-weight:400;font-style:normal}
-@font-face{font-family:source_sans_proextralight;src:url(../fonts/source-sans/sourcesanspro-extralight-webfont.eot);src:url(../fonts/source-sans/sourcesanspro-extralight-webfont.eot?#iefix) format('embedded-opentype'),url(../fonts/source-sans/sourcesanspro-extralight-webfont.woff2) format('woff2'),url(../fonts/source-sans/sourcesanspro-extralight-webfont.woff) format('woff'),url(../fonts/source-sans/sourcesanspro-extralight-webfont.ttf) format('truetype'),url(../fonts/source-sans/sourcesanspro-extralight-webfont.svg#source_sans_proextralight) format('svg');font-weight:400;font-style:normal}
-@font-face{font-family:source_sans_prolight;src:url(../fonts/source-sans/sourcesanspro-light-webfont.eot);src:url(../fonts/source-sans/sourcesanspro-light-webfont.eot?#iefix) format('embedded-opentype'),url(../fonts/source-sans/sourcesanspro-light-webfont.woff2) format('woff2'),url(../fonts/source-sans/sourcesanspro-light-webfont.woff) format('woff'),url(../fonts/source-sans/sourcesanspro-light-webfont.ttf) format('truetype'),url(../fonts/source-sans/sourcesanspro-light-webfont.svg#source_sans_prolight) format('svg');font-weight:400;font-style:normal}
-@font-face{font-family:source_sans_proitalic;src:url(../fonts/source-sans/sourcesanspro-it-webfont.eot);src:url(../fonts/source-sans/sourcesanspro-it-webfont.eot?#iefix) format('embedded-opentype'),url(../fonts/source-sans/sourcesanspro-it-webfont.woff2) format('woff2'),url(../fonts/source-sans/sourcesanspro-it-webfont.woff) format('woff'),url(../fonts/source-sans/sourcesanspro-it-webfont.ttf) format('truetype'),url(../fonts/source-sans/sourcesanspro-it-webfont.svg#source_sans_proitalic) format('svg');font-weight:400;font-style:normal}
-@font-face{font-family:source_sans_proXLtIt;src:url(../fonts/source-sans/sourcesanspro-extralightit-webfont.eot);src:url(../fonts/source-sans/sourcesanspro-extralightit-webfont.eot?#iefix) format('embedded-opentype'),url(../fonts/source-sans/sourcesanspro-extralightit-webfont.woff2) format('woff2'),url(../fonts/source-sans/sourcesanspro-extralightit-webfont.woff) format('woff'),url(../fonts/source-sans/sourcesanspro-extralightit-webfont.ttf) format('truetype'),url(../fonts/source-sans/sourcesanspro-extralightit-webfont.svg#source_sans_proXLtIt) format('svg');font-weight:400;font-style:normal}
-@font-face{font-family:source_sans_prosemibold;src:url(../fonts/source-sans/sourcesanspro-semibold-webfont.eot);src:url(../fonts/source-sans/sourcesanspro-semibold-webfont.eot?#iefix) format('embedded-opentype'),url(../fonts/source-sans/sourcesanspro-semibold-webfont.woff2) format('woff2'),url(../fonts/source-sans/sourcesanspro-semibold-webfont.woff) format('woff'),url(../fonts/source-sans/sourcesanspro-semibold-webfont.ttf) format('truetype'),url(../fonts/source-sans/sourcesanspro-semibold-webfont.svg#source_sans_prosemibold) format('svg');font-weight:400;font-style:normal}
-@font-face{font-family:source_sans_proSBdIt;src:url(../fonts/source-sans/sourcesanspro-semiboldit-webfont.eot);src:url(../fonts/source-sans/sourcesanspro-semiboldit-webfont.eot?#iefix) format('embedded-opentype'),url(../fonts/source-sans/sourcesanspro-semiboldit-webfont.woff2) format('woff2'),url(../fonts/source-sans/sourcesanspro-semiboldit-webfont.woff) format('woff'),url(../fonts/source-sans/sourcesanspro-semiboldit-webfont.ttf) format('truetype'),url(../fonts/source-sans/sourcesanspro-semiboldit-webfont.svg#source_sans_proSBdIt) format('svg');font-weight:400;font-style:normal}
-@font-face{font-family:source_sans_probold;src:url(../fonts/source-sans/sourcesanspro-bold-webfont.eot);src:url(../fonts/source-sans/sourcesanspro-bold-webfont.eot?#iefix) format('embedded-opentype'),url(../fonts/source-sans/sourcesanspro-bold-webfont.woff2) format('woff2'),url(../fonts/source-sans/sourcesanspro-bold-webfont.woff) format('woff'),url(../fonts/source-sans/sourcesanspro-bold-webfont.ttf) format('truetype'),url(../fonts/source-sans/sourcesanspro-bold-webfont.svg#source_sans_probold) format('svg');font-weight:400;font-style:normal}
-@font-face{font-family:source_sans_proregular;src:url(../fonts/source-sans/sourcesanspro-regular-webfont.eot);src:url(../fonts/source-sans/sourcesanspro-regular-webfont.eot?#iefix) format('embedded-opentype'),url(../fonts/source-sans/sourcesanspro-regular-webfont.woff2) format('woff2'),url(../fonts/source-sans/sourcesanspro-regular-webfont.woff) format('woff'),url(../fonts/source-sans/sourcesanspro-regular-webfont.ttf) format('truetype'),url(../fonts/source-sans/sourcesanspro-regular-webfont.svg#source_sans_proregular) format('svg');font-weight:400;font-style:normal}
-html{overflow-x:hidden;overflow-y:auto;height:100%;font:112.5%/1.5 source_sans_proregular,"Lucida Grande","Lucida Sans",sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}
+@font-face{font-family:source_sans;src:url(../fonts/source-sans/sourcesanspro-it-webfont.eot);src:url(../fonts/source-sans/sourcesanspro-it-webfont.eot?#iefix) format('embedded-opentype'),url(../fonts/source-sans/sourcesanspro-it-webfont.woff2) format('woff2'),url(../fonts/source-sans/sourcesanspro-it-webfont.woff) format('woff'),url(../fonts/source-sans/sourcesanspro-it-webfont.ttf) format('truetype'),url(../fonts/source-sans/sourcesanspro-it-webfont.svg#source_sans_proitalic) format('svg');font-weight:400;font-style:italic}
+@font-face{font-family:source_sans;src:url(../fonts/source-sans/sourcesanspro-bold-webfont.eot);src:url(../fonts/source-sans/sourcesanspro-bold-webfont.eot?#iefix) format('embedded-opentype'),url(../fonts/source-sans/sourcesanspro-bold-webfont.woff2) format('woff2'),url(../fonts/source-sans/sourcesanspro-bold-webfont.woff) format('woff'),url(../fonts/source-sans/sourcesanspro-bold-webfont.ttf) format('truetype'),url(../fonts/source-sans/sourcesanspro-bold-webfont.svg#source_sans_probold) format('svg');font-weight:700;font-style:normal}
+@font-face{font-family:source_sans;src:url(../fonts/source-sans/sourcesanspro-regular-webfont.eot);src:url(../fonts/source-sans/sourcesanspro-regular-webfont.eot?#iefix) format('embedded-opentype'),url(../fonts/source-sans/sourcesanspro-regular-webfont.woff2) format('woff2'),url(../fonts/source-sans/sourcesanspro-regular-webfont.woff) format('woff'),url(../fonts/source-sans/sourcesanspro-regular-webfont.ttf) format('truetype'),url(../fonts/source-sans/sourcesanspro-regular-webfont.svg#source_sans_proregular) format('svg');font-weight:400;font-style:normal}
+html{overflow-x:hidden;overflow-y:auto;height:100%;font:112.5%/1.5 source_sans,"Lucida Grande","Lucida Sans",sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}
 @media only screen and (min-width:600px){html{height:100vh}}
 body{min-height:100%;max-width:100%;overflow-x:hidden;background:#fff;color:#777;text-rendering:optimizeLegibility;overflow-y:auto}
 @media only screen and (min-width:600px){body{height:100vh;overflow-y:hidden}}
@@ -111,7 +102,7 @@ svg{width:100%;height:100%;fill:currentColor!important}
 [bs-svg-icon]{display:inline-block;width:27px;height:27px;line-height:inherit;position:relative;top:7px}
 [bs-svg-icon] use{width:27px;height:27px}
 address,blockquote,details,dl,fieldset,figcaption,figure,h1,h2,h3,h4,h5,h6,hgroup,ol,p,pre,table,ul{margin-bottom:14px}
-.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{color:#444;font-weight:400;line-height:1;font-family:source_sans_proregular,"Lucida Grande","Lucida Sans",sans-serif;margin-bottom:27px;-webkit-font-smoothing:antialiased}
+.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{color:#444;font-weight:400;line-height:1;font-family:source_sans,"Lucida Grande","Lucida Sans",sans-serif;margin-bottom:27px;-webkit-font-smoothing:antialiased}
 .h1 small,.h2 small,.h3 small,.h4 small,.h5 small,.h6 small,h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-size:inherit;font-weight:400}
 .h1,h1{font-size:30px;font-size:1.66667rem}
 .h2,h2{font-size:24px;font-size:1.33333rem}

diff --git a/src/scss/_vars.scss b/src/scss/_vars.scss
@@ -34,9 +34,9 @@ $twitter: #00ACEE;
 //
 // Type
 //
-$sans: "source_sans_proregular", "Lucida Grande", "Lucida Sans",sans-serif;
-$sans-light: "source_sans_proextralight", "Lucida Grande", "Lucida Sans",sans-serif;
-$sans-heavy: "source_sans_probold", "Lucida Grande", "Lucida Sans",sans-serif;
+$sans: "source_sans", "Lucida Grande", "Lucida Sans", sans-serif;
+// $sans-light: "source_sans_proextralight", "Lucida Grande", "Lucida Sans",sans-serif;
+$sans-heavy: "source_sans", "Lucida Grande", "Lucida Sans", sans-serif;
 $serif: Georgia, serif;
 $mono: Consolas, Monaco, monospace;
 

diff --git a/src/scss/theme/_forms.scss b/src/scss/theme/_forms.scss
@@ -10,7 +10,7 @@ $input-height: 40px;
     padding-left: $half-spacing;
     padding-right: $half-spacing;
     max-width: 100%;
-    font-family: $sans-light;
+    font-family: $sans;
 
     @extend %panel;
 }
@@ -25,7 +25,7 @@ textarea {
     @extend %base-input
 }
 
-[bs-Input] { } 
+[bs-Input] { }
 [bs-Input~="darker"] {
     background: $green-dk;
     color: $white;