Download as
Browse Code »

Commit a7e57dfdd3bc249f0c571fa48f3d18c2bfbf274b

Authored by Leonardo Merlin
2 parents aa29eefb 50a61345
Exists in master and in 2 other branches production, staging

Merge branch 'fix-font'

Showing 2 changed files with 15 additions and 2 deletions   Show diff stats
index.html
  Diff comments   View file @a7e57df
... ... @@ -51,6 +51,17 @@
51 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 66 function makeJSURL(filename){
56 67 var url = Url.addBaseUrl(filename);
... ... @@ -102,6 +113,8 @@
102 113 if(!document.addEventListener){
103 114 loadOldBrowserWarn();
104 115 }
  116 +
  117 + loadCSSFiles();
105 118 </script>
106 119  
107 120 </head>
... ...
sass/style.sass
  Diff comments   View file @a7e57df
... ... @@ -55,8 +55,8 @@
55 55 @import ../css/hover.custom
56 56 @import ../css/footable.core.min
57 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 62 // 1 - Variaveis
... ...