Skip to content

Commit

Permalink
Merge pull request #343 from ace-n/hotfix_chrome-CSPs
Browse files Browse the repository at this point in the history
Hotfix for chrome CSPs
  • Loading branch information
sskhandek committed Oct 22, 2015
2 parents 4f622c0 + 28b3879 commit de9a767
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion liquid/templates/base.html
Expand Up @@ -8,7 +8,7 @@
<!-- Le styles -->
<link href="/static/css/bootstrap.min.css" rel="stylesheet">
<link href="/static/css/main.css" rel="stylesheet">
<link href="http://code.ionicframework.com/ionicons/1.5.2/css/ionicons.min.css" rel="stylesheet">
<link href="//code.ionicframework.com/ionicons/1.5.2/css/ionicons.min.css" rel="stylesheet">
{% block top_styles %}
{% endblock %}

Expand Down
2 changes: 1 addition & 1 deletion liquid/templates/conf/base.html
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<!-- Le styles -->
<link href='http://fonts.googleapis.com/css?family=Dancing+Script:700' rel='stylesheet' type='text/css'>
<link href='//fonts.googleapis.com/css?family=Dancing+Script:700' rel='stylesheet' type='text/css'>
<link href="/static/css/bootstrap.min.css" rel="stylesheet">
<link href="/static/css/conference.css" rel="stylesheet">

Expand Down
4 changes: 2 additions & 2 deletions liquid/templates/conf/landing.html
@@ -1,6 +1,6 @@
{% extends "conf/base.html" %}
{% block top_styles %}
<link href='http://fonts.googleapis.com/css?family=Roboto:400,700' rel='stylesheet' type='text/css'>
<link href='//fonts.googleapis.com/css?family=Roboto:400,700' rel='stylesheet' type='text/css'>
{% endblock %}
{% block content %}
<div id="landing-card">
Expand All @@ -14,7 +14,7 @@
<h2>October 1 - 4, 2015</h2>
<hr />
<p>Reflections | Projections, the annual computing conference at the
<a href="http://illinois.edu">University of Illinois Urbana-Champaign,</a>
<a href="http://illinois.edu">University of Illinois Urbana-Champaign,</a>
will be returning this October! Come hear exciting speakers from across industry and academia! Look for a career at our CS/ECE job fair or, if you are more interested in the startup world, our Startup Fair! In a competitive mood? Participate in MechMania, a 24-hour programming competition! </p>
<br />
<p>Interested in attending? The conference is free and open to all, but please
Expand Down
2 changes: 1 addition & 1 deletion liquid/templates/conference/base.html
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<!-- Le styles -->
<link href='http://fonts.googleapis.com/css?family=Dancing+Script:700' rel='stylesheet' type='text/css'>
<link href='//fonts.googleapis.com/css?family=Dancing+Script:700' rel='stylesheet' type='text/css'>
<link href="/static/css/bootstrap.min.css" rel="stylesheet">
<link href="/static/css/conference.css" rel="stylesheet">

Expand Down
2 changes: 1 addition & 1 deletion liquid/templates/conference/landing.html
@@ -1,6 +1,6 @@
{% extends "conference/base.html" %}
{% block top_styles %}
<link href='http://fonts.googleapis.com/css?family=Roboto:400,700' rel='stylesheet' type='text/css'>
<link href='//fonts.googleapis.com/css?family=Roboto:400,700' rel='stylesheet' type='text/css'>
{% endblock %}
{% block content %}
<div id="landing-card">
Expand Down

0 comments on commit de9a767

Please sign in to comment.