Skip to content

Commit 1768433

Browse files
authored
Merge pull request #602 from awcodes/fix/mentions-loader-styling
Fix: styling for mentions loader
2 parents 5712bcd + a4305ea commit 1768433

File tree

6 files changed

+21
-8
lines changed

6 files changed

+21
-8
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.DS_Store
22
.idea
33
.phpunit.result.cache
4+
.phpunit.cache/
45
.vscode
56
build
67
composer.lock

.phpunit.cache/test-results

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"pest_2.35.1","defects":[],"times":{"P\\Tests\\src\\ArchTest::__pest_evaluable_it_will_not_use_debugging_functions":0.223,"P\\Tests\\src\\FormsTest::__pest_evaluable_it_has_editor_field":0.099,"P\\Tests\\src\\FormsTest::__pest_evaluable_it_creates_record":0.436,"P\\Tests\\src\\FormsTest::__pest_evaluable_it_updates_record":0.418,"P\\Tests\\src\\FormsTest::__pest_evaluable_it_can_create_null_record":0.303}}
1+
{"version":"pest_2.36.0","defects":[],"times":{"P\\Tests\\src\\ArchTest::__pest_evaluable_it_will_not_use_debugging_functions":0.135,"P\\Tests\\src\\FormsTest::__pest_evaluable_it_has_editor_field":0.034,"P\\Tests\\src\\FormsTest::__pest_evaluable_it_creates_record":0.329,"P\\Tests\\src\\FormsTest::__pest_evaluable_it_updates_record":0.307,"P\\Tests\\src\\FormsTest::__pest_evaluable_it_can_create_null_record":0.277}}

resources/css/plugin.css

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -702,3 +702,15 @@ span[data-type="mergeTag"] {
702702
.tiptap-editor .mention {
703703
@apply bg-primary-600 bg-opacity-10 text-primary-600 px-1 py-0.5 rounded-md box-decoration-clone;
704704
}
705+
706+
.mention-dropdown .loader {
707+
@apply animate-spin size-4 text-white;
708+
709+
.circle {
710+
@apply opacity-25;
711+
}
712+
713+
.path {
714+
@apply opacity-75;
715+
}
716+
}

resources/dist/filament-tiptap-editor.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

resources/dist/filament-tiptap-editor.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

resources/js/extensions/Mention/get-content.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ export default (props, emptyMentionItemsMessage, mentionItemsPlaceholder, mentio
6060
<template x-if="isLoading && ! (mentionItemsPlaceholder && !query.length)">
6161
<div>
6262
<div class="px-2 py-1" x-show="!mentionItemsLoading">
63-
<svg class="animate-spin size-4 text-white" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
64-
<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
65-
<path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
63+
<svg class="loader" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
64+
<circle class="circle" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
65+
<path class="path" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
6666
</svg>
6767
</div>
6868
<p x-text="mentionItemsLoading"></p>

0 commit comments

Comments
 (0)