Download as
Browse Code »

Commit 50a613452013c31ad56744f43850a1719b22b5e1

Authored by Leonardo Merlin
1 parent aa29eefb
Exists in master and in 2 other branches production, staging

Fix fonts. Rollback to google webfonts

Showing 2 changed files with 15 additions and 2 deletions   Show diff stats
@@ -51,6 +51,17 @@ @@ -51,6 +51,17 @@
51 return fileref; 51 return fileref;
52 } 52 }
53 53
  54 + function loadCSSFiles(){
  55 + var css_files = [
  56 + 'http://fonts.googleapis.com/css?family=Open+Sans:400,300,700',
  57 + 'http://fonts.googleapis.com/css?family=Asap:400,700'
  58 + ];
  59 + var head = document.getElementsByTagName('head')[0]
  60 + for(i = 0; i < css_files.length; i++){
  61 + head.appendChild(makeCSSLink(css_files[i]));
  62 + }
  63 + }
  64 +
54 65
55 function makeJSURL(filename){ 66 function makeJSURL(filename){
56 var url = Url.addBaseUrl(filename); 67 var url = Url.addBaseUrl(filename);
@@ -102,6 +113,8 @@ @@ -102,6 +113,8 @@
102 if(!document.addEventListener){ 113 if(!document.addEventListener){
103 loadOldBrowserWarn(); 114 loadOldBrowserWarn();
104 } 115 }
  116 +
  117 + loadCSSFiles();
105 </script> 118 </script>
106 119
107 </head> 120 </head>
sass/style.sass
  Diff comments   View file @50a6134
@@ -55,8 +55,8 @@ @@ -55,8 +55,8 @@
55 @import ../css/hover.custom 55 @import ../css/hover.custom
56 @import ../css/footable.core.min 56 @import ../css/footable.core.min
57 @import ../css/font-awesome.min 57 @import ../css/font-awesome.min
58 -@import ../css/open-sans.min  
59 -@import ../css/font-asap.min 58 +// @import ../css/open-sans.min // get from google webfonts
  59 +// @import ../css/font-asap.min // get from google webfonts
60 60
61 // ------------------------------------ 61 // ------------------------------------
62 // 1 - Variaveis 62 // 1 - Variaveis