Browse Source

Merge pull request #43 from prasannavijayan/pv_https_mixed_content_fix

Load Google fonts over https #32
JeongHoon Byun (aka Outsider) 9 years ago
parent
commit
f8e38fbb1f
4 changed files with 4 additions and 5 deletions
  1. 1 2
      public/css/style.css
  2. 1 1
      views/error.jade
  3. 1 1
      views/index.jade
  4. 1 1
      views/result.jade

+ 1 - 2
public/css/style.css

@@ -3,11 +3,10 @@
 body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,dfn,th,var{font-style:normal;font-weight:normal;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}
 
 
-
 html,body{
 margin:0;
 padding:0;
-font-family: 'Lato', sans-serif;
+font-family: 'Open Sans', sans-serif;
 background: #fff url(../images/bg.jpg) center top no-repeat;
 background-size: cover;
 height: 100%;

+ 1 - 1
views/error.jade

@@ -5,7 +5,7 @@ html
     meta(name="viewport", content="width=device-width, initial-scale=1")
     title #{__('TITLE', community)}
     link(href="css/style.css", rel="stylesheet", type="text/css")
-    link(href="http://fonts.googleapis.com/css?family=Lato:300,400,700,900,700italic|Open+Sans:700italic,400,600,300,700,800", rel="stylesheet", type="text/css")
+    link(href="//fonts.googleapis.com/css?family=Lato:300,400,700,900,700italic|Open+Sans:700italic,400,600,300,700,800", rel="stylesheet", type="text/css")
   body
     #wrapper
       .main

+ 1 - 1
views/index.jade

@@ -5,7 +5,7 @@ html
     meta(name="viewport", content="width=device-width, initial-scale=1")
     title #{__('TITLE', community)}
     link(href="css/style.css", rel="stylesheet", type="text/css")
-    link(href="http://fonts.googleapis.com/css?family=Lato:300,400,700,900,700italic|Open+Sans:700italic,400,600,300,700,800", rel="stylesheet", type="text/css")
+    link(href="//fonts.googleapis.com/css?family=Lato:300,400,700,900,700italic|Open+Sans:700italic,400,600,300,700,800", rel="stylesheet", type="text/css")
   body
     #wrapper
       .main

+ 1 - 1
views/result.jade

@@ -5,7 +5,7 @@ html
     meta(name="viewport", content="width=device-width, initial-scale=1")
     title #{__('TITLE', community)}
     link(href="css/style.css", rel="stylesheet", type="text/css")
-    link(href="http://fonts.googleapis.com/css?family=Lato:300,400,700,900,700italic|Open+Sans:700italic,400,600,300,700,800", rel="stylesheet", type="text/css")
+    link(href="//fonts.googleapis.com/css?family=Lato:300,400,700,900,700italic|Open+Sans:700italic,400,600,300,700,800", rel="stylesheet", type="text/css")
   body
     #wrapper
       .main