diff --git a/src/actions/settings.ts b/src/actions/settings.ts index e5412d0ae..792ed0aaa 100644 --- a/src/actions/settings.ts +++ b/src/actions/settings.ts @@ -61,10 +61,6 @@ const defaultSettings = ImmutableMap({ reply: true, direct: false, }), - - regex: ImmutableMap({ - body: '', - }), }), notifications: ImmutableMap({ @@ -117,9 +113,6 @@ const defaultSettings = ImmutableMap({ other: ImmutableMap({ onlyMedia: false, }), - regex: ImmutableMap({ - body: '', - }), }), public: ImmutableMap({ @@ -131,15 +124,9 @@ const defaultSettings = ImmutableMap({ other: ImmutableMap({ onlyMedia: false, }), - regex: ImmutableMap({ - body: '', - }), }), direct: ImmutableMap({ - regex: ImmutableMap({ - body: '', - }), }), account_timeline: ImmutableMap({ diff --git a/src/components/thumb-navigation.tsx b/src/components/thumb-navigation.tsx index f8e20d80c..14873b8e2 100644 --- a/src/components/thumb-navigation.tsx +++ b/src/components/thumb-navigation.tsx @@ -45,7 +45,7 @@ const ThumbNavigation: React.FC = (): JSX.Element => { }; return ( -
+
= React.forwardRef((props, ref: React.ForwardedR backHref={backHref} className={clsx({ 'rounded-t-3xl': !isScrolled && !transparent, - 'sticky top-12 z-10 bg-white/90 dark:bg-primary-900/90 black:bg-black/90 backdrop-blur lg:top-16': !transparent, + 'sticky top-12 z-10 bg-white/90 dark:bg-primary-900/90 black:bg-black/80 backdrop-blur lg:top-16': !transparent, 'p-4 sm:p-0 sm:pb-4 black:p-4': transparent, '-mt-4 -mx-4 p-4': size !== 'lg' && !transparent, '-mt-4 -mx-4 p-4 sm:-mt-6 sm:-mx-6 sm:p-6': size === 'lg' && !transparent, diff --git a/src/styles/basics.scss b/src/styles/basics.scss index 8e7cb882d..446cc185f 100644 --- a/src/styles/basics.scss +++ b/src/styles/basics.scss @@ -24,7 +24,7 @@ noscript { // Virtuoso empty placeholder fix. // https://gitlab.com/petyosi/soapbox-fe/-/commit/1e22c39934b60e5e186de804060ecfdf1955b506 div[data-viewport-type='window'] { - @apply static; + @apply static #{!important}; } body.system-font, diff --git a/src/styles/ui.scss b/src/styles/ui.scss index bc3b62b5b..4ae5e1263 100644 --- a/src/styles/ui.scss +++ b/src/styles/ui.scss @@ -14,12 +14,12 @@ &::-moz-focus-inner, &:focus, &:active { - outline: 0!important; + @apply outline-0 #{!important}; } } .react-datepicker-popper { - z-index: 9999 !important; + @apply z-[9999] #{!important}; } .ellipsis::after { diff --git a/src/styles/utilities.scss b/src/styles/utilities.scss index c546720f7..7807b5b24 100644 --- a/src/styles/utilities.scss +++ b/src/styles/utilities.scss @@ -8,6 +8,5 @@ } .emoji-lg img.emojione { - width: 36px !important; - height: 36px !important; + @apply h-9 w-9 #{!important}; }