diff --git a/src/assets/css/default.css b/src/assets/css/default.css index 2caafe14..54eecd35 100644 --- a/src/assets/css/default.css +++ b/src/assets/css/default.css @@ -278,43 +278,36 @@ figure { overflow: hidden; } -.wishlist .ui.card > .content > .description-fade { - position: absolute; - right: 0; - bottom: 0; - left: 0; - - height: 4em; - width: 100%; - background-image: linear-gradient(0deg, rgba(255, 255, 255, 1) 0.75em, rgba(255, 255, 255, 0.9) 45%, rgba(255, 255, 255, 0) 100%); - border-radius: 0.33333333rem; -} - -@media (prefers-color-scheme: dark) { - .wishlist .ui.card > .content > .description-fade { - background-image: linear-gradient(0deg, rgba(0, 0, 0, 1) 0.75em, rgba(0, 0, 0, 0.9) 45%, rgba(0, 0, 0, 0) 100%); - } -} - /** Buttons */ .wishlist .ui.card > .extra.buttons { display: flex; align-items: center; + flex-direction: column; + gap: 0.25em; background-color: inherit; z-index: 2; } +.wishlist .ui.card > .extra.buttons::before { + position: absolute; + right: 0; + left: 0; + bottom: 100%; + + height: 4em; + width: 100%; + + content: ''; + + background-image: linear-gradient(0deg, rgba(255, 255, 255, 1) 0.75em, rgba(255, 255, 255, 0.9) 45%, rgba(255, 255, 255, 0) 100%); +} +@media (prefers-color-scheme: dark) { + .wishlist .ui.card > .extra.buttons::before { + background-image: linear-gradient(0deg, rgba(17, 17, 17, 1) 0.75em, rgba(17, 17, 17, 0.9) 45%, rgba(17, 17, 17, 0) 100%); + } +} @media (hover: hover) { - @media (prefers-reduced-motion: no-preference) { - .wishlist .ui.card > .content > .description-fade { - transition: 0.2s ease bottom; - } - } - .wishlist .ui.card:hover > .content > .description-fade { - bottom: var(--buttonsHeight); - } - .wishlist .ui.card > .extra.buttons { position: absolute; top: unset; @@ -342,10 +335,8 @@ figure { .wishlist .ui.card > .extra.buttons > .button { flex: 1 1 auto; -} - -.wishlist .ui.card > .extra.buttons > :last-child { - margin-right: 0; + width: 100%; + margin: 0; } /** diff --git a/src/assets/css/default/dark.css b/src/assets/css/default/dark.css index 2e3d4431..66488c8c 100644 --- a/src/assets/css/default/dark.css +++ b/src/assets/css/default/dark.css @@ -102,6 +102,11 @@ color: rgba(255, 255, 255, .9); } + .ui.card .meta, + .ui.cards > .card .meta { + color: rgba(255, 255, 255, .7); + } + /** Description */ .ui.card > .content > .description, .ui.cards > .card > .content > .description { diff --git a/src/assets/js/parts/wishlist-filter.js b/src/assets/js/parts/wishlist-filter.js index 3737d7c5..6331cbba 100644 --- a/src/assets/js/parts/wishlist-filter.js +++ b/src/assets/js/parts/wishlist-filter.js @@ -48,6 +48,7 @@ $(function () { var html = response.results ? response.results : ''; $('.wishlist-cards').html(html); + $('.ui.dropdown.options').dropdown(); }) .finally(() => { $(this).removeClass('disabled loading'); diff --git a/src/classes/email.php b/src/classes/email.php index 79ca9469..8413fef4 100644 --- a/src/classes/email.php +++ b/src/classes/email.php @@ -47,8 +47,8 @@ class Email global $options; $renderer = new ApiRenderer( - $options->getOption('mjml_api_key'), - $options->getOption('mjml_api_secret') + $options->getOption('mjml_api_application_id'), + $options->getOption('mjml_api_secret_key') ); $html = $this->mjml; diff --git a/src/classes/wish.php b/src/classes/wish.php index bc65af2c..29dce7e1 100644 --- a/src/classes/wish.php +++ b/src/classes/wish.php @@ -225,7 +225,6 @@ class Wish = $this->url ?> -
diff --git a/src/pages/login.php b/src/pages/login.php index b608c992..de9f8bc3 100644 --- a/src/pages/login.php +++ b/src/pages/login.php @@ -224,7 +224,7 @@ $page->navigation();= __('Consider using a password manager. It will save all your passwords and allow you to access them with one master password. Never forget a password ever again.') ?>
= sprintf('%sBitwarden%s is the most trusted open source password manager.', '', '') ?>
- getOption('mjml_api_key') && $options->getOption('mjml_api_secret')) { ?> + getOption('mjml_api_application_id') && $options->getOption('mjml_api_secret_key')) { ?>