Merge pull request #17 from zacharyrs/master

Changed font links to HTTPS, increased .ep-tracker width.
foradian · Nov 16, 2016 · e63e710 · e63e710
2 parents 23529e6 + a9f3a07
commit e63e710
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/app/assets/stylesheets/global.css.scss b/app/assets/stylesheets/global.css.scss
@@ -52,7 +52,7 @@ body{
   font-family: 'Source Sans Pro', sans-serif;
   a{font-family: 'Source Sans Pro', sans-serif;}
 }
-.ep-tracker.row{max-width: 100rem;}
+.ep-tracker.row{max-width: 200rem;}
 
 .row{height: 100%;}
 .pane1, .pane2, .pane3{height: 100%;}

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -4,8 +4,8 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
   <title><%= content_for?(:title) ? yield(:title) : "Fluxday" %></title>
-  <!--<link href='http://fonts.googleapis.com/css?family=Raleway:300,600,400italic' rel='stylesheet' type='text/css'>-->
-  <link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:300,600' rel='stylesheet' type='text/css'>
+  <!--<link href='https://fonts.googleapis.com/css?family=Raleway:300,600,400italic' rel='stylesheet' type='text/css'>-->
+  <link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,600' rel='stylesheet' type='text/css'>
 
   <%= stylesheet_link_tag    "application" %>
   <%= javascript_include_tag "vendor/modernizr" %>

diff --git a/app/views/layouts/doorkeeper.html.erb b/app/views/layouts/doorkeeper.html.erb
@@ -4,8 +4,8 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
   <title><%= content_for?(:title) ? yield(:title) : "Fluxday" %></title>
-  <!--<link href='http://fonts.googleapis.com/css?family=Raleway:300,600,400italic' rel='stylesheet' type='text/css'>-->
-  <link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:300,600' rel='stylesheet' type='text/css'>
+  <!--<link href='https://fonts.googleapis.com/css?family=Raleway:300,600,400italic' rel='stylesheet' type='text/css'>-->
+  <link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,600' rel='stylesheet' type='text/css'>
 
   <%= stylesheet_link_tag    "application" %>
   <%= javascript_include_tag "vendor/modernizr" %>

diff --git a/app/views/layouts/less_pane.html.erb b/app/views/layouts/less_pane.html.erb
@@ -4,8 +4,8 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 
   <title><%= content_for?(:title) ? yield(:title) : "Fluxday" %></title>
-  <!--<link href='http://fonts.googleapis.com/css?family=Raleway:300,600,400italic' rel='stylesheet' type='text/css'>-->
-  <link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:300,600' rel='stylesheet' type='text/css'>
+  <!--<link href='https://fonts.googleapis.com/css?family=Raleway:300,600,400italic' rel='stylesheet' type='text/css'>-->
+  <link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,600' rel='stylesheet' type='text/css'>
 
   <%= stylesheet_link_tag "application" %>
   <%= javascript_include_tag "vendor/modernizr" %>

diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb
@@ -4,8 +4,8 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
   <title><%= content_for?(:title) ? yield(:title) : "Fluxday" %></title>
-  <!--<link href='http://fonts.googleapis.com/css?family=Raleway:300,600,400italic' rel='stylesheet' type='text/css'>-->
-  <link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:300,600' rel='stylesheet' type='text/css'>
+  <!--<link href='https://fonts.googleapis.com/css?family=Raleway:300,600,400italic' rel='stylesheet' type='text/css'>-->
+  <link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,600' rel='stylesheet' type='text/css'>
 
   <%= stylesheet_link_tag    "application" %>
   <%= javascript_include_tag "vendor/modernizr",:async=>true  %>