Skip to content
This repository has been archived by the owner on Apr 14, 2023. It is now read-only.

Commit

Permalink
update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
willdurand committed Jul 31, 2014
1 parent fc90960 commit 6f6d173
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
components/
bower_components/
node_modules/
dist/
.sass-cache/
Expand Down
6 changes: 3 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<!(endif)-->
<!--(if target dummy)><!-->
<link href="css/bootstrap.min.css" rel="stylesheet">
<link href="components/font-awesome/build/assets/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="components/font-awesome/build/assets/font-awesome/css/font-awesome-ie7.min.css" rel="stylesheet">
<link href="bower_components/font-awesome/build/assets/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="bower_components/font-awesome/build/assets/font-awesome/css/font-awesome-ie7.min.css" rel="stylesheet">
<link href="css/application.css" rel="stylesheet">
<!--<!(endif)-->
</head>
Expand All @@ -24,7 +24,7 @@
<script data-main="compiled" src="js/require.js"></script>
<!(endif)-->
<!--(if target dummy)><!-->
<script data-main="js/main" src="components/requirejs/require.js"></script>
<script data-main="js/main" src="bower_components/requirejs/require.js"></script>
<!--<!(endif)-->
</body>
</html>
16 changes: 8 additions & 8 deletions js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ require({
],

paths: {
'backbone': '../components/backbone/backbone-min',
'jquery': '../components/jquery/jquery',
'underscore': '../components/lodash/lodash.min',
'text': '../components/requirejs-text/text',
'moment': '../components/moment/moment',
'backbone': '../bower_components/backbone/backbone-min',
'jquery': '../bower_components/jquery/jquery',
'underscore': '../bower_components/lodash/lodash.min',
'text': '../bower_components/requirejs-text/text',
'moment': '../bower_components/moment/moment',
'bootstrap': 'libs/bootstrap.min',
'key': '../components/keymaster/keymaster.min',
'screenfull': '../components/screenfull/dist/screenfull.min',
'tinycon': '../components/tinycon/tinycon.min'
'key': '../bower_components/keymaster/keymaster',
'screenfull': '../bower_components/screenfull/dist/screenfull.min',
'tinycon': '../bower_components/tinycon/tinycon.min'
},

shim: {
Expand Down

0 comments on commit 6f6d173

Please sign in to comment.