A platform for community discussion. Free, open, simple.
UX: gifs modal style improvements (#41766)
David Battersby0a9a4d382090
diff --git a/app/assets/stylesheets/common/components/gifs.scss b/app/assets/stylesheets/common/components/gifs.scssindex 81230effde1..33fd1721ace 100644--- a/app/assets/stylesheets/common/components/gifs.scss+++ b/app/assets/stylesheets/common/components/gifs.scss@@ -4,35 +4,34 @@}&__input {- background: var(--primary-very-low);- padding: 0.5em;position: relative;- > input {+ > input[type="text"] {width: 100%;- margin-right: 1em;margin-bottom: 0;}+ }- .spinner {- position: absolute;- right: 1.2em;- top: 0.9em;- }+ &__input-spinner {+ position: absolute;+ right: 1.2em;+ inset-block: 0;+ display: flex;+ align-items: center;}&__content {- overflow-y: auto;min-width: 320px;max-height: 65vh;margin-top: 0.5em;+ flex-shrink: 0;@media screen and (width >= 768px) {min-width: 650px;}@media screen and (width >= 1200px) {- min-width: 860px;+ min-width: 850px;}}@@ -58,11 +57,11 @@font-weight: normal;}- &__loading-categories {+ &__loading {display: flex;+ flex: 1;justify-content: center;align-items: center;- min-height: 200px;}&__no-results {@@ -74,6 +73,13 @@text-align: center;}+ .d-modal__body {+ display: flex;+ flex-direction: column;+ overflow-x: hidden;+ height: 65vh;+ }+.d-modal__footer {display: flex;flex-flow: row-reverse;diff --git a/frontend/discourse/app/components/modal/gifs.gjs b/frontend/discourse/app/components/modal/gifs.gjsindex 88ac9aa8d2e..a09c2f433a5 100644--- a/frontend/discourse/app/components/modal/gifs.gjs+++ b/frontend/discourse/app/components/modal/gifs.gjs@@ -9,6 +9,7 @@ import { addUniqueValuesToArray } from "discourse/lib/array-tools";import discourseDebounce from "discourse/lib/debounce";import getURL from "discourse/lib/get-url";import { autoTrackedArray } from "discourse/lib/tracked-tools";+import { or } from "discourse/truth-helpers";import DModal from "discourse/ui-kit/d-modal";import dLoadingSpinner from "discourse/ui-kit/helpers/d-loading-spinner";import { i18n } from "discourse-i18n";@@ -20,11 +21,13 @@ const MIN_QUERY_LENGTH = 3;export default class GifsModal extends Component {@service appEvents;@service dialog;+ @service interfaceColor;@service siteSettings;@tracked categories = [];@tracked loading = false;@tracked loadingCategories = false;+ @tracked searchPending = false;@tracked offset = 0;@tracked query = "";@tracked hasMore = true;@@ -39,6 +42,16 @@ export default class GifsModal extends Component {return this.query.length < MIN_QUERY_LENGTH && this.categories.length > 0;}+ get darkMediaQuery() {+ if (this.interfaceColor.darkModeForced) {+ return "all";+ } else if (this.interfaceColor.lightModeForced) {+ return "none";+ } else {+ return "(prefers-color-scheme: dark)";+ }+ }+@actionpick(content) {const markup = `\n\n`;@@ -63,6 +76,7 @@ export default class GifsModal extends Component {@actionrefresh(event) {this.query = event.target.value;+ this.searchPending = this.query.length >= MIN_QUERY_LENGTH;discourseDebounce(this, this.search, 700);}@@ -126,6 +140,8 @@ export default class GifsModal extends Component {}async search(clearResults = true, skipLengthCheck = false) {+ this.searchPending = false;+if (clearResults) {this.currentGifs = [];this.offset = 0;@@ -265,7 +281,9 @@ export default class GifsModal extends Component {/>{{#if this.loading}}- {{dLoadingSpinner size="small"}}+ <div class="gifs-modal__input-spinner">+ {{dLoadingSpinner size="small"}}+ </div>{{/if}}</div>@@ -294,8 +312,8 @@ export default class GifsModal extends Component {/></div></div>- {{else if this.loadingCategories}}- <div class="gifs-modal__loading-categories">+ {{else if (or this.loading this.searchPending this.loadingCategories)}}+ <div class="gifs-modal__loading">{{dLoadingSpinner size="medium"}}</div>{{else}}@@ -304,11 +322,17 @@ export default class GifsModal extends Component {</:body><:footer>- <img- class="gifs-modal__branding"- src={{getURL "/images/klipy-logo.png"}}- alt={{i18n "gifs.powered_by"}}- />+ <picture>+ <source+ srcset={{getURL "/images/klipy-logo-dark.png"}}+ media={{this.darkMediaQuery}}+ />+ <img+ class="gifs-modal__branding"+ src={{getURL "/images/klipy-logo.png"}}+ alt={{i18n "gifs.powered_by"}}+ />+ </picture></:footer></DModal></template>diff --git a/public/images/klipy-logo-dark.png b/public/images/klipy-logo-dark.pngnew file mode 100644index 00000000000..b210a2f37e1Binary files /dev/null and b/public/images/klipy-logo-dark.png differ