Merge pull request #3 from martintietz/gh-pages

Fixes "Blocked loading mixed active content" issue in Firefox
This commit is contained in:
Ido 2015-01-04 17:02:14 +02:00
commit 465cfa93cd
2 changed files with 7 additions and 7 deletions

View File

@ -8,7 +8,7 @@
<meta name="description" content="Light weight templates for React.">
<link rel="shortcut icon" href="https://facebook.github.io/react/favicon.ico">
<link href='http://fonts.googleapis.com/css?family=Lato:100,300,700' rel='stylesheet' type='text/css'>
<link href='//fonts.googleapis.com/css?family=Lato:100,300,700' rel='stylesheet' type='text/css'>
<!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css">
@ -83,7 +83,7 @@
</footer>
</div>
<script src="http://code.jquery.com/jquery-1.11.0.min.js"></script>
<script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
<script src="playground/dist/rt-main.browser.min.js"></script>
<!--<script data-main="playground/home-main.js" src="//cdnjs.cloudflare.com/ajax/libs/require.js/2.1.15/require.min.js"></script>-->
<script src="//cdnjs.cloudflare.com/ajax/libs/require.js/2.1.15/require.min.js"></script>

View File

@ -4,10 +4,10 @@
out: 'playground/dist/fiddle.min.js',
include: ['fiddle-main.js'],
paths: {
lodash: 'http://cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash',
jquery: 'http://code.jquery.com/jquery-1.11.0.min',
firebase: 'https://cdn.firebase.com/js/client/2.0.5/firebase',
react: 'http://fb.me/react-with-addons-0.12.1',
lodash: '//cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash',
jquery: '//code.jquery.com/jquery-1.11.0.min',
firebase: '//cdn.firebase.com/js/client/2.0.5/firebase',
react: '//fb.me/react-with-addons-0.12.1',
//ace: '../ace-builds-1.1.8/src-min/ace',
fiddle: './fiddle',
text: 'libs/requirejs-plugins/text',
@ -25,4 +25,4 @@
'react/addons': 'react'
}
}
})
})