From dd251b55a0cfeb4bef4ce03ab81c7d7ee86ccfcc Mon Sep 17 00:00:00 2001 From: Joxit Date: Tue, 6 Dec 2022 23:08:23 +0100 Subject: [PATCH] fix(riot-ui): upgrade and fix dialog confirm popup --- .../dialogs/confirm-delete-image.riot | 10 ++++----- src/components/tag-list/remove-image.riot | 4 ++-- src/components/tag-list/tag-table.riot | 4 ++-- src/style.scss | 22 +++++-------------- 4 files changed, 15 insertions(+), 25 deletions(-) diff --git a/src/components/dialogs/confirm-delete-image.riot b/src/components/dialogs/confirm-delete-image.riot index 8fdbc7b..fb5728d 100644 --- a/src/components/dialogs/confirm-delete-image.riot +++ b/src/components/dialogs/confirm-delete-image.riot @@ -16,17 +16,17 @@ --> -
These images will be deleted
-
+
These images will be deleted
+
  • { image.name }:{ image.tag }
-
- +
+ Delete - + Cancel
diff --git a/src/components/tag-list/remove-image.riot b/src/components/tag-list/remove-image.riot index 8eefc65..b7a4f5c 100644 --- a/src/components/tag-list/remove-image.riot +++ b/src/components/tag-list/remove-image.riot @@ -58,8 +58,8 @@ along with this program. If not, see . deleteImage() { this.props.handleCheckboxChange(ACTION_DELETE_IMAGE, this.props.image); }, - handleCheckboxChange(checked) { - const action = checked ? ACTION_CHECK_TO_DELETE : ACTION_UNCHECK_TO_DELETE; + handleCheckboxChange(event) { + const action = event.target.checked ? ACTION_CHECK_TO_DELETE : ACTION_UNCHECK_TO_DELETE; this.props.handleCheckboxChange(action, this.props.image); }, }; diff --git a/src/components/tag-list/tag-table.riot b/src/components/tag-list/tag-table.riot index 3fa6e22..7c60194 100644 --- a/src/components/tag-list/tag-table.riot +++ b/src/components/tag-list/tag-table.riot @@ -174,7 +174,7 @@ along with this program. If not, see . confirmDeleteImage: false, }); }, - onRemoveImageHeaderChange(checked, event) { + onRemoveImageHeaderChange(event) { if (event.altKey === true) { const tags = getPage(this.props.tags, this.props.page); tags @@ -186,7 +186,7 @@ along with this program. If not, see . }); } else { this.update({ - multiDelete: checked, + multiDelete: event.target.checked, }); } }, diff --git a/src/style.scss b/src/style.scss index 0bed72a..2bfa9f9 100644 --- a/src/style.scss +++ b/src/style.scss @@ -89,8 +89,6 @@ material-tabs { material-tabs material-button, material-tabs material-button .content .text { - background-color: #fff; - color: #aaa; text-transform: none; } @@ -246,17 +244,14 @@ material-card table th { text-align: left; } -material-card .material-card-title-action material-button:hover a, +material-button:hover > :first-child[inverted='true'], material-card .material-card-title-action material-button:hover button, -material-card table tbody tr:hover, -pagination material-button:hover > :first-child { +material-card table tbody tr:hover { background-color: #eee !important; } -material-card material-button a, -material-card material-button button, -material-card table tbody tr, -pagination material-button > :first-child { +material-button > :first-child[inverted='true'], +material-card table tbody tr { transition-duration: .28s; transition-timing-function: cubic-bezier(.4, 0, .2, 1); transition-property: background-color; @@ -317,18 +312,13 @@ material-snackbar .toast { height: auto; } -material-popup material-button { - background-color: #fff; - color: #000; -} - material-popup material-button:hover material-waves { background-color: hsla(0, 0%, 75%, .2); } -material-popup .popup { +material-popup .popup > .content { + padding: 1em; max-width: 450px; - top: 2em; } footer {