Repository: ignite Updated Branches: refs/heads/master 17ed189d7 -> a050436d5
IGNITE-8298 Web Console: Fixed tables UI issues. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a050436d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a050436d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a050436d Branch: refs/heads/master Commit: a050436d5b5c814ef386766811e54d9f711afa8d Parents: 17ed189 Author: Dmitriy Shabalin <[email protected]> Authored: Wed Apr 18 18:43:13 2018 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Wed Apr 18 18:43:13 2018 +0700 ---------------------------------------------------------------------- .../app/primitives/ui-grid-header/index.scss | 33 +++++++- .../frontend/app/primitives/ui-grid/index.scss | 11 ++- modules/web-console/frontend/package-lock.json | 80 ++++++++++---------- 3 files changed, 80 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a050436d/modules/web-console/frontend/app/primitives/ui-grid-header/index.scss ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/primitives/ui-grid-header/index.scss b/modules/web-console/frontend/app/primitives/ui-grid-header/index.scss index ac58707..1ff27b2 100644 --- a/modules/web-console/frontend/app/primitives/ui-grid-header/index.scss +++ b/modules/web-console/frontend/app/primitives/ui-grid-header/index.scss @@ -33,6 +33,9 @@ } .ui-grid-header-cell { + // Workaround: Fixed cell header offset in IE11. + vertical-align: top; + .ui-grid-cell-contents > span:not(.ui-grid-header-cell-label) { right: 3px; } @@ -44,7 +47,7 @@ .ui-grid-header-cell [role="columnheader"] { display: flex; - + flex-wrap: wrap; align-items: center; justify-content: center; @@ -77,15 +80,29 @@ .ui-grid-column-resizer.right { top: -100px; } + .ng-hide + .ui-grid-header-cell-row .ui-grid-column-resizer.right { bottom: 0; } + &.ui-grid-header-cell:not(:first-child) { + left: 0; + box-shadow: -1px 0px 0 0 #d4d4d4; + } + &.ui-grid-header-cell .ui-grid-header-cell .ui-grid-column-resizer.right { border-right-width: 0; } + &.ui-grid-header-cell .ui-grid-header-cell:last-child .ui-grid-column-resizer.right { - border-right-width: 1px; + // Hide all right borders, and fix cell offset. + right: -1px; + border: none; + } + + &.ui-grid-header-cell [ng-show] .ui-grid-cell-contents { + text-indent: -20px; + margin-right: -20px; } & > div > .ui-grid-cell-contents { @@ -97,3 +114,15 @@ line-height: 21px; } } + +.ui-grid[ui-grid-selection][ui-grid-grouping] { + .ui-grid-pinned-container-left { + .ui-grid-header--subcategories { + .ui-grid-header-span { + &.ui-grid-header-cell { + box-shadow: none; + } + } + } + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/a050436d/modules/web-console/frontend/app/primitives/ui-grid/index.scss ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/primitives/ui-grid/index.scss b/modules/web-console/frontend/app/primitives/ui-grid/index.scss index b19d5f7..2a5c587 100644 --- a/modules/web-console/frontend/app/primitives/ui-grid/index.scss +++ b/modules/web-console/frontend/app/primitives/ui-grid/index.scss @@ -148,12 +148,12 @@ .ui-grid-header--subcategories { .ui-grid-header-span.ui-grid-header-cell { + background: initial; + .ui-grid-cell-contents { padding: 8px 20px; } - background: initial; - [ng-show] .ui-grid-cell-contents { text-align: center; } @@ -464,6 +464,7 @@ color: #393939; text-align: left; font-size: 14px; + font-weight: normal; line-height: 1.42857; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); @@ -538,3 +539,9 @@ font-style: italic; line-height: 16px; } + +.ui-grid { + input[type="text"].ui-grid-filter-input { + font-weight: normal; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/a050436d/modules/web-console/frontend/package-lock.json ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/package-lock.json b/modules/web-console/frontend/package-lock.json index e28ef4d..1fec909 100644 --- a/modules/web-console/frontend/package-lock.json +++ b/modules/web-console/frontend/package-lock.json @@ -401,9 +401,9 @@ "integrity": "sha512-/2xvG6vDC+Us8h0baSa1siDKwPj5R2A7LldxxhK2339HInc09bq9shMVCUy9zqnuvwnDUJ/DSgkSaBoSHSZrqg==" }, "angular-mocks": { - "version": "1.6.9", - "resolved": "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.6.9.tgz";, - "integrity": "sha512-5aEwXmfd5DQvb64pOgP2W2D3ozAQSARkB6q+6NQfUJvJs9bD2YcExrUc1P4EbiIuyWag2OQM+pIKUNojVi3SBg==", + "version": "1.6.10", + "resolved": "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.6.10.tgz";, + "integrity": "sha512-1865/NmqHNogibNoglY1MGBjx882iu2hI46BBhYDWyz0C4TDM5ER8H8SnYwQKUUG4RXMDsJizszEQ2BEoYKV9w==", "dev": true }, "angular-motion": { @@ -1859,9 +1859,9 @@ "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=" }, "base64-js": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.3.tgz";, - "integrity": "sha512-MsAhsUW1GxCdgYSO6tAfZrNapmUKk7mWx/k5mFY/A1gBtkaCaNapTg+FExCw1r9yeaZhqx/xPg43xgTFH6KL5w==" + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz";, + "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==" }, "base64id": { "version": "1.0.0", @@ -2120,7 +2120,7 @@ "integrity": "sha512-YkIRgwsZwJWTnyQrsBTWefizHh+8GYj3kbL1BTiAQ/9pwpino0G7B2gp5tx/FUBqUlvtxV85KNR3mwfAtv15Yw==", "dev": true, "requires": { - "base64-js": "1.2.3", + "base64-js": "1.3.0", "ieee754": "1.1.11" } }, @@ -2278,7 +2278,7 @@ "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz";, "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", "requires": { - "base64-js": "1.2.3", + "base64-js": "1.3.0", "ieee754": "1.1.11", "isarray": "1.0.0" } @@ -3006,9 +3006,9 @@ } }, "commander": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz";, - "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==" + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz";, + "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==" }, "commondir": { "version": "1.0.1", @@ -3192,7 +3192,7 @@ "loader-utils": "1.1.0", "minimatch": "3.0.4", "p-limit": "1.2.0", - "serialize-javascript": "1.4.0" + "serialize-javascript": "1.5.0" }, "dependencies": { "globby": { @@ -3517,9 +3517,9 @@ "integrity": "sha1-vEZ0gAQ3iyGjYMn8fPUjF5B2L7g=" }, "d3-color": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.0.3.tgz";, - "integrity": "sha1-vHZD/KjlOoNH4vva/6I2eWtYUJs=" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.1.0.tgz";, + "integrity": "sha512-IZVcqX5yYFvR2NUBbSfIfbgNcSgAtZ7JbgQWqDXf4CywtN7agvI7Kw6+Q1ETvlHOHWJT55Kyuzt0C3I0GVtRHQ==" }, "d3-hierarchy": { "version": "1.1.6", @@ -3531,7 +3531,7 @@ "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.1.6.tgz";, "integrity": "sha512-mOnv5a+pZzkNIHtw/V6I+w9Lqm9L5bG3OTXPM5A+QO0yyVMQ4W1uZhR+VOJmazaOZXri2ppbiZ5BUNWT0pFM9A==", "requires": { - "d3-color": "1.0.3" + "d3-color": "1.1.0" } }, "dargs": { @@ -5568,7 +5568,7 @@ "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=", "requires": { "chalk": "1.1.3", - "commander": "2.15.1", + "commander": "2.13.0", "is-my-json-valid": "2.17.2", "pinkie-promise": "2.0.1" }, @@ -5825,7 +5825,7 @@ "integrity": "sha512-KcuaIRWTU0kFjOJCs32a3JsGNCWkeOak0/F/uvJNp3x/N4McXdqHpcK64cYTozK7QLPKKtUqb9h7wR9K9rYRkg==", "requires": { "@posthtml/esm": "1.0.0", - "htmlnano": "0.1.7", + "htmlnano": "0.1.8", "loader-utils": "1.1.0", "posthtml": "0.11.3", "schema-utils": "0.4.5" @@ -5845,6 +5845,11 @@ "uglify-js": "3.3.21" }, "dependencies": { + "commander": { + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz";, + "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==" + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz";, @@ -5895,16 +5900,16 @@ "dev": true }, "htmlnano": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/htmlnano/-/htmlnano-0.1.7.tgz";, - "integrity": "sha512-t8Gy+r/loFP2VXAJl6ClaNIomGI609oyQcT7O3IoJE6VcDCLR6PYWXaSh+hfd/dnoZ6KPbpgPek/Crm3havqig==", + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/htmlnano/-/htmlnano-0.1.8.tgz";, + "integrity": "sha512-wwmDRJn5OQ9BqFYy5vWaufUQTKj7Ct6xTv+od7QNNJzJM7K3yqR4lJ8SHSOTcBahlXMO5EzddUdsS+fmdGvXpw==", "requires": { "cssnano": "3.10.0", "object-assign": "4.1.1", "posthtml": "0.11.3", "posthtml-render": "1.1.3", "svgo": "1.0.5", - "uglify-js": "3.3.21" + "uglify-es": "3.3.9" }, "dependencies": { "coa": { @@ -5969,12 +5974,12 @@ "util.promisify": "1.0.0" } }, - "uglify-js": { - "version": "3.3.21", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.21.tgz";, - "integrity": "sha512-uy82472lH8tshK3jS3c5IFb5MmNKd/5qyBd0ih8sM42L3jWvxnE339U9gZU1zufnLVs98Stib9twq8dLm2XYCA==", + "uglify-es": { + "version": "3.3.9", + "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz";, + "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==", "requires": { - "commander": "2.15.1", + "commander": "2.13.0", "source-map": "0.6.1" }, "dependencies": { @@ -8538,7 +8543,7 @@ "stream-browserify": "2.0.1", "stream-http": "2.8.1", "string_decoder": "1.1.1", - "timers-browserify": "2.0.7", + "timers-browserify": "2.0.9", "tty-browserify": "0.0.0", "url": "0.11.0", "util": "0.10.3", @@ -11273,9 +11278,9 @@ } }, "serialize-javascript": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.4.0.tgz";, - "integrity": "sha1-fJWFFNtqwkQ6irwGLcn3iGp/YAU=" + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.5.0.tgz";, + "integrity": "sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==" }, "serve-index": { "version": "1.9.1", @@ -12528,9 +12533,9 @@ "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=" }, "timers-browserify": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.7.tgz";, - "integrity": "sha512-U7DtjfsHeYjNAyEz4MdCLGZMY3ySyHIgZZp6ba9uxZlMRMiK5yTHUYc2XfGQHKFgxGcmvBF2jafoNtQYvlDpOw==", + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.9.tgz";, + "integrity": "sha512-2DhyvVpCWwY7gk8UmKhYvgHQl9XTlO0Dg0/2UZcLgPnpulhdm2aGIlFy5rU5igmOCA51w6jPHqLRA4UH1YmhcA==", "requires": { "setimmediate": "1.0.5" } @@ -12790,18 +12795,13 @@ "cacache": "10.0.4", "find-cache-dir": "1.0.0", "schema-utils": "0.4.5", - "serialize-javascript": "1.4.0", + "serialize-javascript": "1.5.0", "source-map": "0.6.1", "uglify-es": "3.3.9", "webpack-sources": "1.1.0", "worker-farm": "1.6.0" }, "dependencies": { - "commander": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz";, - "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==" - }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz";,
