Skip to content

Commit

Permalink
Merge pull request #2103 from benjaminapetersen/bump-versions-common-…
Browse files Browse the repository at this point in the history
…catalog

Merged by openshift-bot
  • Loading branch information
OpenShift Bot authored Sep 18, 2017
2 parents b4196ee + 6e43fb3 commit d06b7c0
Show file tree
Hide file tree
Showing 8 changed files with 427 additions and 258 deletions.
14 changes: 6 additions & 8 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
"angular-touch": "1.5.11",
"angular-route": "1.5.11",
"angular-bootstrap": "0.14.3",
"angular-patternfly": "4.7.1",
"angular-patternfly": "4.9.1",
"angular-gettext": "2.3.9",
"uri.js": "1.18.12",
"moment": "2.14.2",
"moment-timezone": "0.5.3",
"patternfly": "3.27.1",
"patternfly": "3.27.4",
"hawtio-core": "2.0.37",
"hawtio-extension-service": "2.0.2",
"jquery": "3.2.1",
Expand All @@ -27,7 +27,7 @@
"microplugin": "0.0.3",
"selectize": "0.12.1",
"c3": "0.4.11",
"kubernetes-label-selector": "2.0.0",
"kubernetes-label-selector": "2.1.1",
"kubernetes-container-terminal": "2.1.0",
"registry-image-widgets": "https://github.com/cockpit-project/registry-image-widgets.git#0.0.14",
"layout.attrs": "2.1.1",
Expand All @@ -46,8 +46,8 @@
"angular-moment": "1.0.0",
"angular-utf8-base64": "0.0.5",
"file-saver": "1.3.3",
"origin-web-common": "0.0.56",
"origin-web-catalog": "0.0.45"
"origin-web-common": "0.0.57",
"origin-web-catalog": "0.0.46"
},
"devDependencies": {
"angular-mocks": "1.5.11",
Expand All @@ -58,15 +58,13 @@
"resolutions": {
"angular-bootstrap": "0.14.3",
"d3": "3.5.17",
"patternfly": "3.26.6",
"angular": "1.5.11",
"angular-sanitize": "1.5.11",
"moment": "2.14.2",
"font-awesome": "4.7.0",
"jquery": "3.2.1",
"lodash": "4.17.4",
"matchHeight": "0.7.0",
"bootstrap-select": "^1.10.0"
"matchHeight": "0.7.0"
},
"overrides": {
"angular": {
Expand Down
547 changes: 332 additions & 215 deletions dist/scripts/vendor.js

Large diffs are not rendered by default.

Binary file modified dist/styles/fonts/PatternFlyIcons-webfont.eot
Binary file not shown.
10 changes: 10 additions & 0 deletions dist/styles/fonts/PatternFlyIcons-webfont.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified dist/styles/fonts/PatternFlyIcons-webfont.ttf
Binary file not shown.
Binary file modified dist/styles/fonts/PatternFlyIcons-webfont.woff
Binary file not shown.
110 changes: 77 additions & 33 deletions dist/styles/main.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/styles/vendor.css
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ table.dataTable tbody td,table.dataTable tbody th{padding:2px 10px 3px}
.selectize-dropdown .active{background-color:#f5fafd;color:#495c68}
.selectize-dropdown .active.create{color:#495c68}
.selectize-dropdown .create{color:rgba(48,48,48,.5)}
.selectize-dropdown-content{overflow-y:auto;overflow-x:hidden;max-height:200px}
.selectize-dropdown-content{overflow-y:auto;overflow-x:hidden;max-height:200px;-webkit-overflow-scrolling:touch}
.selectize-control.single .selectize-input,.selectize-control.single .selectize-input input{cursor:pointer}
.selectize-control.single .selectize-input.input-active,.selectize-control.single .selectize-input.input-active input{cursor:text}
.selectize-control.single .selectize-input:after{content:' ';display:block;position:absolute;top:50%;right:15px;margin-top:0;width:0;height:0;border-style:solid;border-width:0;border-color:grey transparent transparent}
Expand Down Expand Up @@ -368,9 +368,9 @@ table.dataTable tbody td,table.dataTable tbody th{padding:2px 10px 3px}
.filter .navbar-filter-widget .label-filter .selectize-control .selectize-input.full:after{border:0}
.filter .navbar-filter-widget .label-filter .selectize-control .selectize-input input{font-size:12px;height:22px;margin-left:0!important;margin-right:0!important}
.filter .navbar-filter-widget .label-filter .selectize-control .selectize-input input::-webkit-input-placeholder{font-style:italic;color:#999}
.filter .navbar-filter-widget .label-filter .selectize-control .selectize-input input::-moz-placeholder{font-style:italic;color:#999;opacity:1}
.filter .navbar-filter-widget .label-filter .selectize-control .selectize-input input:-ms-input-placeholder{font-style:italic;color:#999}
.filter .navbar-filter-widget .label-filter .selectize-control .selectize-input input::placeholder{color:#999;font-style:italic}
.filter .navbar-filter-widget .label-filter .selectize-control .selectize-input input::-moz-placeholder{color:#999;opacity:1}
.filter .navbar-filter-widget .label-filter-add.btn{border-left:0;border-radius:1px;display:table-cell}
.selectize-dropdown{border:1px solid #bbb;box-shadow:0 6px 12px rgba(0,0,0,.175);font-size:12px;margin:1px 0 0 -1px;min-width:40%;padding:5px 0;z-index:9999}
@media (min-width:768px){.selectize-dropdown{min-width:0;width:auto!important;white-space:nowrap}
Expand Down

0 comments on commit d06b7c0

Please sign in to comment.