Skip to content

Commit 60dd976

Browse files
committed
Issue #35. [Ionic 1.2] - Update Ionic to v1.2
1 parent 29d6f1b commit 60dd976

File tree

3 files changed

+6
-18
lines changed

3 files changed

+6
-18
lines changed

Gruntfile.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ module.exports = function(grunt) {
210210
app: {
211211
src: ['<%= yeoman.app %>/index.html'],
212212
ignorePath: /\.\.\//,
213-
exclude: ['app/bower_components/ionic/css/ionic.css', /jquery/, /bower_components\/bootstrap/]
213+
exclude: ['app/bower_components/ionic/release/css/ionic.css', /jquery/, /bower_components\/bootstrap/]
214214
}
215215
},
216216
sass: { // Task

app/index.html

+2-10
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<!-- bower:css -->
1010
<link rel="stylesheet" href="bower_components/angular-bootstrap-calendar/dist/css/angular-bootstrap-calendar.css" />
1111
<link rel="stylesheet" href="bower_components/components-font-awesome/css/font-awesome.css" />
12-
<link rel="stylesheet" href="bower_components/ionic-ion-tinder-cards/ionic.tdcards.css" />
1312
<!-- endbower -->
1413
<!-- endbuild -->
1514
<link href="styles/main.css" rel="stylesheet">
@@ -25,8 +24,8 @@
2524
<script src="bower_components/angular-animate/angular-animate.js"></script>
2625
<script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
2726
<script src="bower_components/angular-ui-router/release/angular-ui-router.js"></script>
28-
<script src="bower_components/ionic/js/ionic.js"></script>
29-
<script src="bower_components/ionic/js/ionic-angular.js"></script>
27+
<script src="bower_components/ionic/release/js/ionic.js"></script>
28+
<script src="bower_components/ionic/release/js/ionic-angular.js"></script>
3029
<script src="bower_components/angular-websocket/angular-websocket.min.js"></script>
3130
<script src="bower_components/ngCordova/dist/ng-cordova.js"></script>
3231
<script src="bower_components/lodash/lodash.js"></script>
@@ -35,17 +34,10 @@
3534
<script src="bower_components/ionic-service-push/ionic-push.js"></script>
3635
<script src="bower_components/moment/moment.js"></script>
3736
<script src="bower_components/angular-moment/angular-moment.js"></script>
38-
<script src="bower_components/angular-local-storage/dist/angular-local-storage.js"></script>
39-
<script src="bower_components/angular-google-chart/ng-google-chart.js"></script>
4037
<script src="bower_components/firebase/firebase.js"></script>
4138
<script src="bower_components/angularfire/dist/angularfire.js"></script>
4239
<script src="bower_components/angular-bootstrap-calendar/dist/js/angular-bootstrap-calendar-tpls.js"></script>
4340
<script src="bower_components/ng-cordova-oauth/dist/ng-cordova-oauth.js"></script>
44-
<script src="bower_components/jsSHA/src/sha.js"></script>
45-
<script src="bower_components/ng-twitter-api/dist/ng-twitter-api.js"></script>
46-
<script src="bower_components/ionic-ion-swipe-cards/ionic.swipecards.js"></script>
47-
<script src="bower_components/collide/collide.js"></script>
48-
<script src="bower_components/ionic-ion-tinder-cards/ionic.tdcards.js"></script>
4941
<!-- endbower -->
5042
<!-- endbuild -->
5143

bower.json

+3-7
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "Supermodular",
33
"version": "1.1.0",
44
"dependencies": {
5-
"ionic": "~1.1.1",
5+
"ionic": "~1.2.1",
66
"angular-websocket": "~1.0.9",
77
"ngCordova": "~0.1.18-alpha",
88
"lodash": "~3.8.0",
@@ -17,13 +17,9 @@
1717
},
1818
"devDependencies": {
1919
"angular-mocks": "~1.3.6",
20-
"angular-scenario": "~1.3.6",
21-
"ngCordova": "~0.1.23-alpha",
22-
"ionic-service-core": "~0.1.10",
23-
"ionic-service-push": "~0.1.4",
24-
"ionic": "driftyco/ionic-bower#1.1.1"
20+
"angular-scenario": "~1.3.6"
2521
},
2622
"resolutions": {
27-
"angular": ">= 1.4.8"
23+
"angular": ">= 1.4.3"
2824
}
2925
}

0 commit comments

Comments
 (0)