Add Fira Sans to Baseframe and make it the default font

baseframe/assets.py

@@ -121,6 +121,14 @@
 
 assets['marked.js'][Version('0.3.0')] = 'baseframe/js/marked.js'
 
+# Fira Sans and Fira Mono fonts
+assets['firasans-light.css'][Version('0.0.0')] = 'baseframe/css/firasans-light.css'
+assets['firasans-regular.css'][Version('0.0.0')] = 'baseframe/css/firasans-regular.css'
+assets['firasans-medium.css'][Version('0.0.0')] = 'baseframe/css/firasans-medium.css'
+assets['firasans-bold.css'][Version('0.0.0')] = 'baseframe/css/firasans-bold.css'
+assets['firamono-regular.css'][Version('0.0.0')] = 'baseframe/css/firamono-regular.css'
+assets['firamono-bold.css'][Version('0.0.0')] = 'baseframe/css/firamono-bold.css'
+
 # Asset packages
 assets['bootstrap.js'][Version('2.0.1')] = {'requires': [
     'bootstrap-alert.js==2.0.1',
@@ -199,6 +207,7 @@
 assets['baseframe-bs3.css'][Version(__version__)] = {'requires': [
     'bootstrap.css>=3.0.0',
     'select2.css',
+    'firasans-regular.css', 'firasans-bold.css',
     'jquery.timepicker.css',
     'baseframe-base-bs3.css==' + __version__,
     'baseframe-networkbar.css==' + __version__,

baseframe/static/css/bootstrap.css

@@ -114,7 +114,7 @@ textarea {
 }
 body {
   margin: 0;
-  font-family: "Source Sans Pro", "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Arial, sans-serif;
+  font-family: "Fira Sans", "Source Sans Pro", "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Arial, sans-serif;
   font-size: 14px;
   line-height: 20px;
   color: #333333;
@@ -298,7 +298,7 @@ a:hover {
 }
 p {
   margin: 0 0 10px;
-  font-family: "Source Sans Pro", "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Arial, sans-serif;
+  font-family: "Fira Sans", "Source Sans Pro", "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Arial, sans-serif;
   font-size: 14px;
   line-height: 20px;
 }
@@ -569,7 +569,7 @@ input,
 button,
 select,
 textarea {
-  font-family: "Source Sans Pro", "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Arial, sans-serif;
+  font-family: "Fira Sans", "Source Sans Pro", "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Arial, sans-serif;
 }
 label {
   display: block;
@@ -2361,7 +2361,7 @@ input[type="submit"].btn.small {
 }
 .navbar-search .search-query {
   padding: 4px 9px;
-  font-family: "Source Sans Pro", "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Arial, sans-serif;
+  font-family: "Fira Sans", "Source Sans Pro", "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Arial, sans-serif;
   font-size: 14px;
   font-weight: normal;
   line-height: 1;

baseframe/static/css/bootstrap3/bootstrap.css

@@ -295,7 +295,7 @@ html {
 }
 
 body {
-  font-family: "Source Sans Pro", "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Arial, sans-serif;
+  font-family: "Fira Sans", "Source Sans Pro", "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Arial, sans-serif;
   font-size: 16px;
   line-height: 1.5;
   color: #333333;
@@ -471,7 +471,7 @@ h6,
 .h4,
 .h5,
 .h6 {
-  font-family: "Source Sans Pro", "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Arial, sans-serif;
+  font-family: "Fira Sans", "Source Sans Pro", "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Arial, sans-serif;
   font-weight: 600;
   line-height: 1.1;
   color: inherit;

baseframe/static/css/editor.css

@@ -1,6 +1,6 @@
 @import url("//fonts.googleapis.com/css?family=Source+Sans+Pro:400,600,400italic,600italic");
 body {
-  font-family: "Source Sans Pro", "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
+  font-family: "Fira Sans", "Source Sans Pro", "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
   font-size: 14px;
   line-height: 20px;
   color: #333;

baseframe/static/css/firamono-bold.css

@@ -0,0 +1,7 @@
+@font-face {
+  font-family: 'Fira Mono';
+  src: url('../../_baseframe/fonts/FiraMono-Bold.eot');
+  src: local("Fira Mono"), url('../../_baseframe/fonts/FiraMono-Bold.eot?#iefix') format("embedded-opentype"), url('../../_baseframe/fonts/FiraMono-Bold.woff') format("woff");
+  font-style: normal;
+  font-weight: 600;
+}

baseframe/static/css/firamono-regular.css

@@ -0,0 +1,7 @@
+@font-face {
+  font-family: 'Fira Mono';
+  src: url('../../_baseframe/fonts/FiraMono-Regular.eot');
+  src: local("Fira Mono"), url('../../_baseframe/fonts/FiraMono-Regular.eot?#iefix') format("embedded-opentype"), url('../../_baseframe/fonts/FiraMono-Regular.woff') format("woff");
+  font-style: normal;
+  font-weight: 400;
+}

baseframe/static/css/firasans-bold.css

@@ -0,0 +1,15 @@
+@font-face {
+  font-family: 'Fira Sans';
+  src: url('../../_baseframe/fonts/FiraSans-Bold.eot');
+  src: local("Fira Sans"), url('../../_baseframe/fonts/FiraSans-Bold.eot?#iefix') format("embedded-opentype"), url('../../_baseframe/fonts/FiraSans-Bold.woff') format("woff");
+  font-style: normal;
+  font-weight: 600;
+}
+
+@font-face {
+  font-family: 'Fira Sans';
+  src: url('../../_baseframe/fonts/FiraSans-BoldItalic.eot');
+  src: local("Fira Sans"), url('../../_baseframe/fonts/FiraSans-BoldItalic.eot?#iefix') format("embedded-opentype"), url('../../_baseframe/fonts/FiraSans-BoldItalic.woff') format("woff");
+  font-style: italic;
+  font-weight: 600;
+}

baseframe/static/css/firasans-light.css

@@ -0,0 +1,15 @@
+@font-face {
+  font-family: 'Fira Sans';
+  src: url('../../_baseframe/fonts/FiraSans-Light.eot');
+  src: local("Fira Sans"), url('../../_baseframe/fonts/FiraSans-Light.eot?#iefix') format("embedded-opentype"), url('../../_baseframe/fonts/FiraSans-Light.woff') format("woff");
+  font-style: normal;
+  font-weight: 300;
+}
+
+@font-face {
+  font-family: 'Fira Sans';
+  src: url('../../_baseframe/fonts/FiraSans-LightItalic.eot');
+  src: local("Fira Sans"), url('../../_baseframe/fonts/FiraSans-LightItalic.eot?#iefix') format("embedded-opentype"), url('../../_baseframe/fonts/FiraSans-LightItalic.woff') format("woff");
+  font-style: italic;
+  font-weight: 300;
+}

baseframe/static/css/firasans-medium.css

@@ -0,0 +1,15 @@
+@font-face {
+  font-family: 'Fira Sans';
+  src: url('../../_baseframe/fonts/FiraSans-Medium.eot');
+  src: local("Fira Sans"), url('../../_baseframe/fonts/FiraSans-Medium.eot?#iefix') format("embedded-opentype"), url('../../_baseframe/fonts/FiraSans-Medium.woff') format("woff");
+  font-style: normal;
+  font-weight: 500;
+}
+
+@font-face {
+  font-family: 'Fira Sans';
+  src: url('../../_baseframe/fonts/FiraSans-MediumItalic.eot');
+  src: local("Fira Sans"), url('../../_baseframe/fonts/FiraSans-MediumItalic.eot?#iefix') format("embedded-opentype"), url('../../_baseframe/fonts/FiraSans-MediumItalic.woff') format("woff");
+  font-style: italic;
+  font-weight: 500;
+}

baseframe/static/css/firasans-regular.css

@@ -0,0 +1,15 @@
+@font-face {
+  font-family: 'Fira Sans';
+  src: url('../../_baseframe/fonts/FiraSans-Regular.eot');
+  src: local("Fira Sans"), url('../../_baseframe/fonts/FiraSans-Regular.eot?#iefix') format("embedded-opentype"), url('../../_baseframe/fonts/FiraSans-Regular.woff') format("woff");
+  font-style: normal;
+  font-weight: 400;
+}
+
+@font-face {
+  font-family: 'Fira Sans';
+  src: url('../../_baseframe/fonts/FiraSans-RegularItalic.eot');
+  src: local("Fira Sans"), url('../../_baseframe/fonts/FiraSans-RegularItalic.eot?#iefix') format("embedded-opentype"), url('../../_baseframe/fonts/FiraSans-RegularItalic.woff') format("woff");
+  font-style: italic;
+  font-weight: 400;
+}

baseframe/static/css/networkbar.css

@@ -21,7 +21,7 @@
   background-image: -moz-linear-gradient(#f9f9f9, #e8e8e8);
   background-image: -o-linear-gradient(#f9f9f9, #e8e8e8);
   background-image: linear-gradient(#f9f9f9, #e8e8e8);
-  font: 14px/18px "Source Sans Pro", "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Arial, sans-serif;
+  font: 14px/18px "Fira Sans", "Source Sans Pro", "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Arial, sans-serif;
   color: #444444;
   border-bottom: 1px solid #d5d5d5;
   -webkit-box-shadow: 0 2px 5px -2px rgba(0, 0, 0, 0.1);
@@ -39,7 +39,7 @@
   font-weight: 600;
 }
 #hg-bar li {
-  font: 14px/18px "Source Sans Pro", "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Arial, sans-serif;
+  font: 14px/18px "Fira Sans", "Source Sans Pro", "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Arial, sans-serif;
   font-size: 14px;
   line-height: 18px;
 }
@@ -342,7 +342,7 @@
   }
 }
 #hg-networkbar {
-  font: 14px/18px "Source Sans Pro", "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Arial, sans-serif;
+  font: 14px/18px "Fira Sans", "Source Sans Pro", "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Arial, sans-serif;
   font-size: 14px;
   background: #F3F3F3;
 }
@@ -523,7 +523,7 @@
     background-image: -moz-linear-gradient(#f9f9f9, #e8e8e8);
     background-image: -o-linear-gradient(#f9f9f9, #e8e8e8);
     background-image: linear-gradient(#f9f9f9, #e8e8e8);
-    font: 14px/18px "Source Sans Pro", "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Arial, sans-serif;
+    font: 14px/18px "Fira Sans", "Source Sans Pro", "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Arial, sans-serif;
     font-size: 14px;
     color: #444444;
     border-bottom: 1px solid #d5d5d5;
@@ -536,7 +536,7 @@
     position: relative;
   }
   #hg-networkbar .navbar-nav > li {
-    font: 14px/18px "Source Sans Pro", "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Arial, sans-serif;
+    font: 14px/18px "Fira Sans", "Source Sans Pro", "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Arial, sans-serif;
     line-height: 18px;
     border-bottom: none;
   }

baseframe/static/less/bootstrap/mixins.less

@@ -109,7 +109,7 @@
       font-family: Georgia, "Times New Roman", Times, serif;
     }
     .sans-serif() {
-      font-family: "Source Sans Pro", "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Arial, sans-serif;
+      font-family: "Fira Sans", "Source Sans Pro", "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Arial, sans-serif;
     }
     .monospace() {
       font-family: Consolas, Inconsolata, Menlo, "DejaVu Sans Mono", "Bitstream Vera Sans Mono", monospace;

baseframe/static/less/bootstrap/variables.less

@@ -32,7 +32,7 @@
 
 // Typography
 @baseFontSize:          14px;
-@baseFontFamily:        "Source Sans Pro", "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Arial, sans-serif;
+@baseFontFamily:        "Fira Sans", "Source Sans Pro", "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Arial, sans-serif;
 @baseLineHeight:        20px;
 @textColor:             @grayDark;
 

baseframe/static/sass/_settings-bs3.sass

@@ -1,6 +1,6 @@
 $body-font-size: 16px !default
 $body-line-height: 24px !default
-$body-font-family: "Source Sans Pro", "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif !default
+$body-font-family: "Fira Sans", "Source Sans Pro", "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif !default
 $monospace-font-family: Consolas, Inconsolata, Menlo, "DejaVu Sans Mono", "Bitstream Vera Sans Mono", monospace
 $footer-height: 67px !default
 

baseframe/static/sass/_settings.sass

@@ -1,5 +1,5 @@
 $lato-font-stack: Lato, "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif
-$source-font-stack: "Source Sans Pro", "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif
+$source-font-stack: "Fira Sans", "Source Sans Pro", "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif
 $opensans-font-stack: "Open Sans", "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Arial, sans-serif
 $monospace-font-family: Consolas, Inconsolata, Menlo, "DejaVu Sans Mono", "Bitstream Vera Sans Mono", monospace
 

baseframe/static/sass/firamono-bold.scss

@@ -0,0 +1,9 @@
+@font-face {
+  font-family: 'Fira Mono';
+  src: font-url('FiraMono-Bold.eot');
+  src: local('Fira Mono'),
+       font-url('FiraMono-Bold.eot?#iefix') format('embedded-opentype'),
+       font-url('FiraMono-Bold.woff') format('woff');
+  font-style: normal;
+  font-weight: 600;
+}

baseframe/static/sass/firamono-regular.scss

@@ -0,0 +1,9 @@
+@font-face {
+  font-family: 'Fira Mono';
+  src: font-url('FiraMono-Regular.eot');
+  src: local('Fira Mono'),
+       font-url('FiraMono-Regular.eot?#iefix') format('embedded-opentype'),
+       font-url('FiraMono-Regular.woff') format('woff');
+  font-style: normal;
+  font-weight: 400;
+}

baseframe/static/sass/firasans-bold.scss

@@ -0,0 +1,18 @@
+@font-face {
+  font-family: 'Fira Sans';
+  src: font-url('FiraSans-Bold.eot');
+  src: local('Fira Sans'),
+       font-url('FiraSans-Bold.eot?#iefix') format('embedded-opentype'),
+       font-url('FiraSans-Bold.woff') format('woff');
+  font-style: normal;
+  font-weight: 600;
+}
+@font-face {
+  font-family: 'Fira Sans';
+  src: font-url('FiraSans-BoldItalic.eot');
+  src: local('Fira Sans'),
+       font-url('FiraSans-BoldItalic.eot?#iefix') format('embedded-opentype'),
+       font-url('FiraSans-BoldItalic.woff') format('woff');
+  font-style: italic;
+  font-weight: 600;
+}

baseframe/static/sass/firasans-light.scss

@@ -0,0 +1,18 @@
+@font-face {
+  font-family: 'Fira Sans';
+  src: font-url('FiraSans-Light.eot');
+  src: local('Fira Sans'),
+       font-url('FiraSans-Light.eot?#iefix') format('embedded-opentype'),
+       font-url('FiraSans-Light.woff') format('woff');
+  font-style: normal;
+  font-weight: 300;
+}
+@font-face {
+  font-family: 'Fira Sans';
+  src: font-url('FiraSans-LightItalic.eot');
+  src: local('Fira Sans'),
+       font-url('FiraSans-LightItalic.eot?#iefix') format('embedded-opentype'),
+       font-url('FiraSans-LightItalic.woff') format('woff');
+  font-style: italic;
+  font-weight: 300;
+}

baseframe/static/sass/firasans-medium.scss

@@ -0,0 +1,18 @@
+@font-face {
+  font-family: 'Fira Sans';
+  src: font-url('FiraSans-Medium.eot');
+  src: local('Fira Sans'),
+       font-url('FiraSans-Medium.eot?#iefix') format('embedded-opentype'),
+       font-url('FiraSans-Medium.woff') format('woff');
+  font-style: normal;
+  font-weight: 500;
+}
+@font-face {
+  font-family: 'Fira Sans';
+  src: font-url('FiraSans-MediumItalic.eot');
+  src: local('Fira Sans'),
+       font-url('FiraSans-MediumItalic.eot?#iefix') format('embedded-opentype'),
+       font-url('FiraSans-MediumItalic.woff') format('woff');
+  font-style: italic;
+  font-weight: 500;
+}

baseframe/static/sass/firasans-regular.scss

@@ -0,0 +1,18 @@
+@font-face {
+  font-family: 'Fira Sans';
+  src: font-url('FiraSans-Regular.eot');
+  src: local('Fira Sans'),
+       font-url('FiraSans-Regular.eot?#iefix') format('embedded-opentype'),
+       font-url('FiraSans-Regular.woff') format('woff');
+  font-style: normal;
+  font-weight: 400;
+}
+@font-face {
+  font-family: 'Fira Sans';
+  src: font-url('FiraSans-RegularItalic.eot');
+  src: local('Fira Sans'),
+       font-url('FiraSans-RegularItalic.eot?#iefix') format('embedded-opentype'),
+       font-url('FiraSans-RegularItalic.woff') format('woff');
+  font-style: italic;
+  font-weight: 400;
+}

baseframe/static/sass/networkbar.scss

@@ -24,7 +24,7 @@ $color-hg-bar-selected: #000;
 $networkbar-font-size: 14px;
 $networkbar-xs-font-size: 14px;
 $networkbar-line-height: 18px;
-$networkbar-font: #{$networkbar-font-size}/#{$networkbar-line-height} "Source Sans Pro", "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Arial, sans-serif !default;
+$networkbar-font: #{$networkbar-font-size}/#{$networkbar-line-height} "Fira Sans", "Source Sans Pro", "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Arial, sans-serif !default;
 
 #hg-bar {
     @include pie-clearfix;