Skip to content

Commit

Permalink
Fixed mixed content
Browse files Browse the repository at this point in the history
  • Loading branch information
tranduyhung committed Sep 15, 2016
1 parent 6420730 commit 230493f
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
10 changes: 8 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
# v1.0.3
## 15/09/2016

1. [](#bugfix)
* Fixed mixed content

# v1.0.2
## 13/09/2016

1. [](#improved)
1. [](#bugfix)
* Fixed mobile navigation

# v1.0.1
## 31/08/2016

1. [](#improved)
1. [](#bugfix)
* Fixed form not working
* Fixed responsive issues with page title

Expand Down
2 changes: 1 addition & 1 deletion blueprints.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: X-Corporation
description: "Grav Theme based on X-Corporation HTML theme of uiCookies."
version: 1.0.2
version: 1.0.3
icon: briefcase
author:
name: Hung Tran
Expand Down
12 changes: 6 additions & 6 deletions templates/partials/head.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<meta name="viewport" content="width=device-width, initial-scale=1">

{% block stylesheets %}
<link href='https://fonts.googleapis.com/css?family=Roboto:400,700,500' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Montserrat:400,700' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
<link href='//fonts.googleapis.com/css?family=Roboto:400,700,500' rel='stylesheet' type='text/css'>
<link href='//fonts.googleapis.com/css?family=Montserrat:400,700' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7"
crossorigin="anonymous">
{% do assets.add('theme://fonts/font-awesome/css/font-awesome.min.css', 101) %}
Expand All @@ -18,8 +18,8 @@

{% block javascripts %}
{% if browser.getBrowser == 'msie' and browser.getVersion <= 9 %}
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<script src="//oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="//oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
{% endif %}

{% do assets.add('theme://js/jquery-2.1.4.min.js') %}
Expand All @@ -30,7 +30,7 @@

{{ assets.js() }}

<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"
integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS"
crossorigin="anonymous"></script>
{% endblock %}
Expand Down

0 comments on commit 230493f

Please sign in to comment.