Browse Source

Switch to DejaVu fonts (with font-face), fix CSS sizes accordingly

Gu1 11 years ago
parent
commit
fa524871b8

+ 127 - 10
ffdnispdb/static/css/style.css

@@ -1,4 +1,8 @@
 
+/*
+ * Fonts
+ */
+
 @font-face {
     font-family: 'ffdn';
     src: url('../fonts/ffdn.eot');
@@ -10,7 +14,8 @@
 }
 
 @font-face {
-    font-family: 'inconsolata';
+    font-family: 'Inconsolata';
+    src: local('Inconsolata');
     src: url('../fonts/inconsolata.eot');
     src: url('../fonts/inconsolata.eot?#iefix') format('embedded-opentype'),
          url('../fonts/inconsolata.woff') format('woff'),
@@ -19,23 +24,106 @@
     font-style: normal;
 }
 
-#main-container {
-    margin-top: 25px;
+@font-face {
+    font-family: 'DejaVu Sans';
+    src: local('DejaVu Sans');
+    src: url('../fonts/dejavusans.eot');
+    src: url('../fonts/dejavusans.eot?#iefix') format('embedded-opentype'),
+         url('../fonts/dejavusans.woff') format('woff'),
+         url('../fonts/dejavusans.ttf') format('truetype');
+    font-weight: normal;
+    font-style: normal;
 }
 
-#main-container .page-header {
-    margin-top: 0;
+@font-face {
+    font-family: 'DejaVu Sans';
+    src: local('DejaVu Sans Bold');
+    src: url('../fonts/dejavusans-bold.eot');
+    src: url('../fonts/dejavusans-bold.eot?#iefix') format('embedded-opentype'),
+         url('../fonts/dejavusans-bold.woff') format('woff'),
+         url('../fonts/dejavusans-bold.ttf') format('truetype');
+    font-weight: bold;
+    font-style: normal;
 }
 
-#main-container .page-header h2 {
-    margin: 0;
-    display: inline;
+@font-face {
+    font-family: 'DejaVu Sans';
+    src: local('DejaVu Sans Oblique');
+    src: url('../fonts/dejavusans-oblique.eot');
+    src: url('../fonts/dejavusans-oblique.eot?#iefix') format('embedded-opentype'),
+         url('../fonts/dejavusans-oblique.woff') format('woff'),
+         url('../fonts/dejavusans-oblique.ttf') format('truetype');
+    font-weight: normal;
+    font-style: oblique;
 }
 
-#main-container .span3 {
-    margin-left: 15px;
+@font-face {
+    font-family: 'DejaVu Sans';
+    src: local('DejaVu Sans Bold Oblique');
+    src: url('../fonts/dejavusans-boldoblique.eot');
+    src: url('../fonts/dejavusans-boldoblique.eot?#iefix') format('embedded-opentype'),
+         url('../fonts/dejavusans-boldoblique.woff') format('woff'),
+         url('../fonts/dejavusans-boldoblique.ttf') format('truetype');
+    font-weight: bold;
+    font-style: oblique;
+}
+
+/*
+ * Global
+ */
+
+html, body {
+    height: 100%;
+    font-family: 'DejaVu Sans';
+    font-size: 13px;
+    font-weight: normal;
+    font-style: normal;
+}
+
+h1 {
+    font-size: 34px;
+}
+
+h2 {
+    font-size: 28px;
+}
+
+h3 {
+    font-size: 22px;
+}
+
+h4 {
+    font-size: 17px;
+}
+
+h5 {
+    font-size: 14px;
+}
+
+h6 {
+    font-size: 11.9px;
+}
+
+h1 small {
+    font-size: 22px;
+}
+
+h2 small {
+    font-size: 17px;
+}
+
+h3 small {
+    font-size: 14px;
 }
 
+h4 small {
+    font-size: 14px;
+}
+
+/*
+ * Navbar
+ */
+
 input#search-input {
     position: relative;
     padding-left: 23px;
@@ -55,6 +143,12 @@ input#search-input {
     opacity: 0.5;
 }
 
+.navbar .brand {
+    font-weight: normal !important;
+    padding: 10px 20px 0 20px;
+    line-height: 22px;
+}
+
 #ffdn-header {
     font-family: ffdn;
     font-size: 24px;
@@ -82,6 +176,29 @@ input#search-input {
     }
 }
 
+
+/*
+ * Main
+ */
+
+#main-container {
+    margin-top: 25px;
+}
+
+#main-container .page-header {
+    margin-top: 0;
+    padding-bottom: 4px;
+}
+
+#main-container .page-header h3 {
+    margin: 0;
+    display: inline;
+}
+
+#main-container #homepage .span3 {
+    margin-left: 15px;
+}
+
 #map {
     height: 600px;
 }

BIN
ffdnispdb/static/fonts/dejavusans-bold.eot


BIN
ffdnispdb/static/fonts/dejavusans-bold.ttf


BIN
ffdnispdb/static/fonts/dejavusans-bold.woff


BIN
ffdnispdb/static/fonts/dejavusans-boldoblique.eot


BIN
ffdnispdb/static/fonts/dejavusans-boldoblique.ttf


BIN
ffdnispdb/static/fonts/dejavusans-boldoblique.woff


BIN
ffdnispdb/static/fonts/dejavusans-oblique.eot


BIN
ffdnispdb/static/fonts/dejavusans-oblique.ttf


BIN
ffdnispdb/static/fonts/dejavusans-oblique.woff


BIN
ffdnispdb/static/fonts/dejavusans.eot


BIN
ffdnispdb/static/fonts/dejavusans.ttf


BIN
ffdnispdb/static/fonts/dejavusans.woff


+ 1 - 1
ffdnispdb/templates/index.html

@@ -1,6 +1,6 @@
 {% extends "layout.html" %}
 {% block container %}
-  <div class="row-fluid">
+  <div id="homepage" class="row-fluid">
     <div class="span9">
       <div id="map"></div>
     </div>