moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into fix-anchor-used-as-button

This commit is contained in:
danidfra 2024-11-11 11:44:03 -03:00
parent 4e1c6fc5b3 8a4e85010d
commit a554156994
5 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/assets/cryptocurrency/doge.svg Normal file
View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><g fill="none" fill-rule="evenodd"><circle cx="16" cy="16" r="16" fill="#C3A634"/><path fill="#FFF" d="M13.248 14.61h4.314v2.286h-4.314v4.818h2.721c1.077 0 1.958-.145 2.644-.437.686-.291 1.224-.694 1.615-1.21a4.4 4.4 0 00.796-1.815 11.4 11.4 0 00.21-2.252 11.4 11.4 0 00-.21-2.252 4.396 4.396 0 00-.796-1.815c-.391-.516-.93-.919-1.615-1.21-.686-.292-1.567-.437-2.644-.437h-2.721v4.325zm-2.766 2.286H9v-2.285h1.482V8h6.549c1.21 0 2.257.21 3.142.627.885.419 1.607.99 2.168 1.715.56.724.977 1.572 1.25 2.543.273.971.409 2.01.409 3.115a11.47 11.47 0 01-.41 3.115c-.272.97-.689 1.819-1.25 2.543-.56.725-1.282 1.296-2.167 1.715-.885.418-1.933.627-3.142.627h-6.549v-7.104z"/></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 738 B

9
src/features/crypto-donate/components/crypto-icon.tsx
View File

@ -1,12 +1,11 @@
import genericIcon from 'soapbox/assets/cryptocurrency/generic.svg';
const icons: Record<string, { default: string }> = import.meta.glob('../../../assets/cryptocurrency/*.svg', { eager: true });
/** Get crypto icon URL by ticker symbol, or fall back to generic icon */
function getIcon(ticker: string): string {
try {
return new URL(`../../../assets/cryptocurrency/${ticker}.svg`, import.meta.url).href;
} catch {
return genericIcon;
}
const iconPath = `../../../assets/cryptocurrency/${ticker}.svg`;
return icons[iconPath]?.default || genericIcon;
}
interface ICryptoIcon {

56
src/styles/application.scss
View File

@ -1,30 +1,30 @@
@import 'variables';
@import 'fonts';
@import 'basics';
@import 'loading';
@import 'ui';
@import 'emoji-picker';
@import 'rtl';
@import 'accessibility';
@import 'navigation';
@import 'autosuggest';
@use 'variables';
@use 'fonts';
@use 'basics';
@use 'loading';
@use 'ui';
@use 'emoji-picker';
@use 'rtl';
@use 'accessibility';
@use 'navigation';
@use 'autosuggest';
// COMPONENTS
@import 'components/buttons';
@import 'components/modal';
@import 'components/compose-form';
@import 'components/status';
@import 'components/reply-mentions';
@import 'components/detailed-status';
@import 'components/media-gallery';
@import 'components/notification';
@import 'components/display-name';
@import 'components/columns';
@import 'components/search';
@import 'components/video-player';
@import 'components/audio-player';
@import 'components/crypto-donate';
@import 'components/aliases';
@import 'components/icon';
@import 'forms';
@import 'utilities';
@use 'components/buttons';
@use 'components/modal';
@use 'components/compose-form';
@use 'components/status';
@use 'components/reply-mentions';
@use 'components/detailed-status';
@use 'components/media-gallery';
@use 'components/notification';
@use 'components/display-name';
@use 'components/columns';
@use 'components/search';
@use 'components/video-player';
@use 'components/audio-player';
@use 'components/crypto-donate';
@use 'components/aliases';
@use 'components/icon';
@use 'forms';
@use 'utilities';

6
src/styles/components/compose-form.scss
View File

@ -1,3 +1,5 @@
@use "../variables";
.compose-form {
&__warning {
@apply text-xs mb-2.5 px-2.5 py-2 shadow-md rounded bg-accent-300 text-white;
@ -5,7 +7,7 @@
strong {
@apply font-medium;
@each $lang in $cjk-langs {
@each $lang in variables.$cjk-langs {
&:lang(#{$lang}) {
@apply font-bold;
}
@ -168,7 +170,7 @@
strong {
@apply block font-medium text-black dark:text-white;
@each $lang in $cjk-langs {
@each $lang in variables.$cjk-langs {
&:lang(#{$lang}) {
@apply font-bold;
}

4
src/styles/components/search.scss
View File

@ -1,3 +1,5 @@
@use "../fonts";
.search {
position: relative;
}
@ -14,7 +16,7 @@
.svg-icon {
@apply right-4 rtl:left-4 rtl:right-auto text-gray-400;
@include font-size(16);
@include fonts.font-size(16);
cursor: default;
display: inline-block;
position: absolute;