Skip to content

Commit 6052b33

Browse files
dtaylor113jwforres
authored andcommitted
[WIP] Update to angular 1.5.11 and patternfly 3.18.1
1 parent 8d3d3c6 commit 6052b33

14 files changed

+7357
-4563
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ node_modules
22
.tmp
33
.sass-cache
44
.bundle
5+
.idea
56
bower_components
67
phantomjsdriver.log
78
openshift-jvm

Gruntfile.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ module.exports = function (grunt) {
263263
'.tmp/styles/main.css': '<%= yeoman.app %>/styles/main.less'
264264
},
265265
options: {
266-
paths: ['<%= yeoman.app %>/styles'],
266+
paths: ['<%= yeoman.app %>/styles', 'bower_components/'],
267267
sourceMap: true,
268268
sourceMapFilename: '.tmp/styles/main.css.map',
269269
sourceMapURL: 'main.css.map',
@@ -276,7 +276,7 @@ module.exports = function (grunt) {
276276
},
277277
options: {
278278
cleancss: true,
279-
paths: ['<%= yeoman.app %>/styles']
279+
paths: ['<%= yeoman.app %>/styles', 'bower_components/']
280280
}
281281
}
282282
},

app/index.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<meta name="msapplication-TileImage" content="images/mstile-144x144.png">
1616
<!-- build:css(.) styles/vendor.css -->
1717
<!-- bower:css -->
18+
<link rel="stylesheet" href="bower_components/patternfly-bootstrap-combobox/css/bootstrap-combobox.css" />
1819
<link rel="stylesheet" href="bower_components/angular-patternfly/dist/styles/angular-patternfly.css" />
1920
<link rel="stylesheet" href="bower_components/messenger/build/css/messenger-theme-flat.css" />
2021
<link rel="stylesheet" href="bower_components/kubernetes-label-selector/labelFilter.css" />
@@ -97,7 +98,6 @@ <h1>JavaScript Required</h1>
9798
<script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
9899
<script src="bower_components/lodash/lodash.js"></script>
99100
<script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
100-
<script src="bower_components/bootstrap-combobox/js/bootstrap-combobox.js"></script>
101101
<script src="bower_components/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js"></script>
102102
<script src="bower_components/bootstrap-select/dist/js/bootstrap-select.js"></script>
103103
<script src="bower_components/bootstrap-switch/dist/js/bootstrap-switch.js"></script>
@@ -109,6 +109,7 @@ <h1>JavaScript Required</h1>
109109
<script src="bower_components/datatables-colvis/js/dataTables.colVis.js"></script>
110110
<script src="bower_components/matchHeight/dist/jquery.matchHeight.js"></script>
111111
<script src="bower_components/moment/moment.js"></script>
112+
<script src="bower_components/patternfly-bootstrap-combobox/js/bootstrap-combobox.js"></script>
112113
<script src="bower_components/patternfly-bootstrap-treeview/dist/bootstrap-treeview.min.js"></script>
113114
<script src="bower_components/patternfly/dist/js/patternfly.js"></script>
114115
<script src="bower_components/angular-patternfly/dist/angular-patternfly.js"></script>

app/styles/main.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@bower-components-path: "../../bower_components";
2-
@pf-less-path: "@{bower-components-path}/patternfly/less";
2+
@pf-less-path: "@{bower-components-path}/patternfly/dist/less";
33

44
// PatternFly
55
@import "@{pf-less-path}/patternfly.less";

bower.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
"name": "origin-web-console",
33
"version": "1.3.0-alpha",
44
"dependencies": {
5-
"angular": "1.3.20",
5+
"angular": "1.5.11",
66
"json3": "3.3.2",
77
"es5-shim": "3.1.1",
8-
"angular-resource": "1.3.20",
9-
"angular-cookies": "1.3.20",
10-
"angular-sanitize": "1.3.20",
11-
"angular-animate": "1.3.20",
12-
"angular-touch": "1.3.20",
13-
"angular-route": "1.3.20",
8+
"angular-resource": "1.5.11",
9+
"angular-cookies": "1.5.11",
10+
"angular-sanitize": "1.5.11",
11+
"angular-animate": "1.5.11",
12+
"angular-touch": "1.5.11",
13+
"angular-route": "1.5.11",
1414
"angular-bootstrap": "0.14.3",
15-
"angular-patternfly": "3.10.0",
15+
"angular-patternfly": "3.18.1",
1616
"uri.js": "1.18.0",
1717
"moment": "2.14.2",
1818
"moment-timezone": "0.5.3",
19-
"patternfly": "3.10.0",
19+
"patternfly": "3.18.1",
2020
"hawtio-core": "2.0.11",
2121
"hawtio-extension-service": "2.0.2",
2222
"jquery": "2.1.4",
@@ -27,7 +27,7 @@
2727
"messenger": "1.4.1",
2828
"kubernetes-label-selector": "1.4.1",
2929
"kubernetes-topology-graph": "0.0.23",
30-
"kubernetes-container-terminal": "1.0.1",
30+
"kubernetes-container-terminal": "1.0.2",
3131
"registry-image-widgets": "0.0.2",
3232
"openshift-object-describer": "1.1.2",
3333
"layout.attrs": "2.1.1",
@@ -48,8 +48,8 @@
4848
"file-saver": "1.3.3"
4949
},
5050
"devDependencies": {
51-
"angular-mocks": "1.3.20",
52-
"angular-scenario": "1.3.20"
51+
"angular-mocks": "1.5.11",
52+
"angular-scenario": "1.5.11"
5353
},
5454
"appPath": "app",
5555
"resolutions": {

0 commit comments

Comments
 (0)