Skip to content

Commit e158f7c

Browse files
committed
chore(depends) Move to up to date Bootstrap 3
1 parent eaaa1f9 commit e158f7c

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
"angular": "1.4.7",
2222
"angular-sanitize": "1.4.7",
2323
"angular-messages": "1.4.7",
24-
"angular-ui-bootstrap-bower": "^0.8 || ^0.13",
24+
"angular-ui-bootstrap-bower": "^0.8 || ^0.14",
2525
"underscore": "1.8.3",
2626
"ngInfiniteScroll": "1.2.1",
2727
"angular-elastic": "2.5.1"
2828
},
2929
"devDependencies": {
3030
"angular-mocks": "1.4.7",
31-
"bootstrap-3-1-1": "git://github.com/twbs/bootstrap.git#v3.1.1",
31+
"bootstrap-3-3-5": "git://github.com/twbs/bootstrap.git#v3.3.5",
3232
"bootstrap-2-3-2": "git://github.com/twbs/bootstrap.git#v2.3.2"
3333
},
3434
"ignore": [

dist/forms-angular-with-bs3.css

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/forms-angular.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1294,7 +1294,7 @@ var fng;
12941294
function cssFrameworkService() {
12951295
// Supported options for framework are:
12961296
// bs2 = Twitter Bootstrap 2.3.2 (default)
1297-
// bs3 = Bootstrap 3.1.1
1297+
// bs3 = Bootstrap 3.3.5
12981298
var config = {
12991299
framework: 'bs2' // Unit tests depend on this being bs2
13001300
};

js/services/css-framework.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module fng.services {
66
export function cssFrameworkService() {
77
// Supported options for framework are:
88
// bs2 = Twitter Bootstrap 2.3.2 (default)
9-
// bs3 = Bootstrap 3.1.1
9+
// bs3 = Bootstrap 3.3.5
1010
var config = {
1111
framework: 'bs2' // Unit tests depend on this being bs2
1212
};

less/forms-angular-with-bs3.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
@import "../bower_components/bootstrap-3-1-1/less/bootstrap.less";
1+
@import "../bower_components/bootstrap-3-3-5/less/bootstrap.less";
22
@import "forms-angular-bs-common.less";
33
@import "forms-angular-bs3-specific";

0 commit comments

Comments
 (0)