Merge pull request #656 from Alex-D/integration

Amélioration des polices et des perfs
zestedesavoir · Jun 1, 2014 · 859d77a · 859d77a
2 parents 06bc0d3 + c6e2763
commit 859d77a
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 33 deletions.
diff --git a/assets/css/main.css b/assets/css/main.css
diff --git a/assets/css/scss/_all-supports.scss b/assets/css/scss/_all-supports.scss
@@ -447,8 +447,6 @@
 
 .sub-header {
     background: #EEE;
-    font-size: 13px;
-    font-size: 1.3rem;
 }
 .breadcrumb {
     display: none;
@@ -586,8 +584,10 @@
         height: 40px;
         padding-left: 11.5%;
         text-decoration: none;
-        line-height: 40px;
         text-indent: 25px;
+        line-height: 40px;
+        font-size: 16px;
+        font-size: 1.6rem;
         position: relative;
         color: lighten($blue, 20%);
         @include transition;
@@ -1207,8 +1207,7 @@
     .topic {
         position: relative;
         height: 80px;
-        font-size: 14px;
-        font-size: 1.4rem;
+        line-height: 25px;
         border-top: 1px solid #FFF;
         border-bottom: 1px solid #CCC;
         background: lighten($blue, 76%);
@@ -1770,8 +1769,6 @@ table {
             top: 0;
             right: 0;
             text-transform: uppercase;
-            font-size: 13px;
-            font-size: 1.3rem;
 
             li {
                 float: left;

diff --git a/assets/css/scss/main.scss b/assets/css/scss/main.scss
@@ -40,11 +40,10 @@ $modal-margin: 25px;
 // Font Famillies
 $font-sans-serif: "Segoe UI", "Trebuchet MS", Helvetica, "Helvetica Neue", Arial, sans-serif;
 $font-serif: "Liberation Serif", "Times New Roman", Times, Georgia, FreeSerif, serif;
-$font-sans-serif-active: "Roboto", sans-serif;
+$font-sans-serif-active: "Source Sans Pro", "Segoe UI", sans-serif;
 $font-serif-active: "Droid Serif", serif;
 
 
-
 /**
  * Custom mixins
  */

diff --git a/assets/js/custom/webfont.js b/assets/js/custom/webfont.js
diff --git a/templates/base.html b/templates/base.html
@@ -25,6 +25,25 @@
 
     {% compressed_css "main-css" %}
 
+    {# Webfont async loading #}
+    <script>
+        WebFontConfig = {
+            google: {
+              families: ['Source Sans Pro', 'Droid Serif']
+            }
+        };
+
+        (function() {
+            var wf = document.createElement('script');
+            wf.src = ('https:' == document.location.protocol ? 'https' : 'http') +
+                      '://ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js';
+            wf.type = 'text/javascript';
+            wf.async = 'true';
+            var s = document.getElementsByTagName('script')[0];
+            s.parentNode.insertBefore(wf, s);
+        })();
+    </script>
+
     {# for additionnal css in some pages #}
     {% block extracss %}{% endblock %}
 

diff --git a/zds/settings.py b/zds/settings.py
@@ -129,7 +129,6 @@
             'js/custom/keyboard-navigation.js',
             'js/custom/message-hidden.js',
             'js/custom/spoiler.js',
-            'js/custom/webfont.js',
         ),
         'output_filename': 'js/main.js'
     }