gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-12-11 10:32:43 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Remove button-tertiary styles & variables

Browse Source
This commit is contained in:
diondiondion 2025-10-22 14:31:16 +02:00
parent c9bd89cbcd
commit d3c50d5265
13 changed files with 13 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/features/account/components/follow_request_note.jsx
View File

@ -24,12 +24,12 @@ export default class FollowRequestNote extends ImmutablePureComponent {
</div>
<div className='follow-request-banner__action'>
<button type='button' className='button button-tertiary button--confirmation' onClick={onAuthorize}>
<button type='button' className='button button-secondary button--confirmation' onClick={onAuthorize}>
<Icon id='check' icon={CheckIcon} />
<FormattedMessage id='follow_request.authorize' defaultMessage='Authorize' />
</button>
<button type='button' className='button button-tertiary button--destructive' onClick={onReject}>
<button type='button' className='button button-secondary button--destructive' onClick={onReject}>
<Icon id='times' icon={CloseIcon} />
<FormattedMessage id='follow_request.reject' defaultMessage='Reject' />
</button>

2
app/javascript/mastodon/features/navigation_panel/components/disabled_account_banner.tsx
View File

@ -75,7 +75,7 @@ export const DisabledAccountBanner: React.FC = () => {
</a>
<button
type='button'
className='button button--block button-tertiary'
className='button button--block button-secondary'
onClick={handleLogOutClick}
>
<FormattedMessage

4
app/javascript/mastodon/features/navigation_panel/components/sign_in_banner.tsx
View File

@ -46,7 +46,7 @@ export const SignInBanner: React.FC = () => {
<a
href={sso_redirect}
data-method='post'
className='button button--block button-tertiary'
className='button button--block button-secondary'
>
<FormattedMessage
id='sign_in_banner.sso_redirect'
@ -98,7 +98,7 @@ export const SignInBanner: React.FC = () => {
/>
</p>
{signupButton}
<a href='/auth/sign_in' className='button button--block button-tertiary'>
<a href='/auth/sign_in' className='button button--block button-secondary'>
<FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Login' />
</a>
</div>

2
app/javascript/mastodon/features/ui/components/bundle_column_error.jsx
View File

@ -98,7 +98,7 @@ class BundleColumnError extends PureComponent {
<div className='error-column__message__actions'>
{errorType === 'network' && <Button onClick={this.handleRetry}><FormattedMessage id='bundle_column_error.retry' defaultMessage='Try again' /></Button>}
{errorType === 'error' && <CopyButton value={stacktrace}><FormattedMessage id='bundle_column_error.copy_stacktrace' defaultMessage='Copy error report' /></CopyButton>}
<Link to='/' className={classNames('button', { 'button-tertiary': errorType !== 'routing' })}><FormattedMessage id='bundle_column_error.return' defaultMessage='Go back home' /></Link>
<Link to='/' className={classNames('button', { 'button-secondary': errorType !== 'routing' })}><FormattedMessage id='bundle_column_error.return' defaultMessage='Go back home' /></Link>
</div>
</div>
</div>

2
app/javascript/mastodon/features/ui/components/modal_placeholder.tsx
View File

@ -46,7 +46,7 @@ export const ModalPlaceholder: React.FC<{
defaultMessage='Try again'
/>
</Button>
<Button onClick={handleClose} className='button button-tertiary'>
<Button onClick={handleClose} className='button button-secondary'>
<FormattedMessage
id='bundle_modal_error.close'
defaultMessage='Close'

4
app/javascript/mastodon/features/ui/components/navigation_bar.tsx
View File

@ -104,7 +104,7 @@ const LoginOrSignUp: React.FC = () => {
<a
href={sso_redirect}
data-method='post'
className='button button--block button-tertiary'
className='button button--block button-secondary'
>
<FormattedMessage
id='sign_in_banner.sso_redirect'
@ -143,7 +143,7 @@ const LoginOrSignUp: React.FC = () => {
return (
<div className='ui__navigation-bar__sign-up'>
{signupButton}
<a href='/auth/sign_in' className='button button-tertiary'>
<a href='/auth/sign_in' className='button button-secondary'>
<FormattedMessage
id='sign_in_banner.sign_in'
defaultMessage='Login'

2
app/javascript/styles/mastodon-light/variables.scss
View File

@ -16,8 +16,6 @@ $grey-600: hsl(240deg, 8%, 33%); // Trout
$ui-button-secondary-color: $grey-600,
$ui-button-secondary-border-color: $grey-600,
$ui-button-secondary-focus-color: $white,
$ui-button-tertiary-color: $blurple-500,
$ui-button-tertiary-border-color: $blurple-500,
$emojis-requiring-inversion: 'chains'
);

5
app/javascript/styles/mastodon/_variables.scss
View File

@ -36,11 +36,6 @@ $ui-button-secondary-border-color: $blurple-500 !default;
$ui-button-secondary-focus-border-color: $blurple-300 !default;
$ui-button-secondary-focus-color: $blurple-300 !default;
$ui-button-tertiary-color: $blurple-300 !default;
$ui-button-tertiary-border-color: $blurple-300 !default;
$ui-button-tertiary-focus-background-color: $blurple-600 !default;
$ui-button-tertiary-focus-color: $white !default;
// Keep this filter a SCSS variable rather than
// a CSS Custom Property due to this Safari bug:
// https://github.com/mdn/browser-compat-data/issues/25914#issuecomment-2676190245

49
app/javascript/styles/mastodon/components.scss
View File

@ -243,50 +243,6 @@
}
}
&.button-tertiary {
background: transparent;
padding: 6px 17px;
color: $ui-button-tertiary-color;
border: 1px solid $ui-button-tertiary-border-color;
&:active,
&:focus,
&:hover {
background-color: $ui-button-tertiary-focus-background-color;
color: $ui-button-tertiary-focus-color;
border: 0;
padding: 7px 18px;
}
&:disabled {
opacity: 0.5;
}
&.button--confirmation {
color: var(--clr-text-success);
border-color: var(--clr-text-success);
&:active,
&:focus,
&:hover {
background: var(--clr-bg-primary);
color: var(--clr-text-primary);
}
}
&.button--destructive {
color: var(--clr-text-error);
border-color: var(--clr-text-error);
&:active,
&:focus,
&:hover {
background: var(--clr-bg-success-strong);
color: var(--clr-text-on-success-strong);
}
}
}
&.button--block {
width: 100%;
}
@ -9920,11 +9876,6 @@ noscript {
flex-grow: 1;
}
}
.button-tertiary {
background: color.change($ui-base-color, $alpha: 0.15);
backdrop-filter: blur(8px);
}
}
&__action {

2
app/views/admin/domain_blocks/confirm_suspension.html.haml
View File

@ -18,5 +18,5 @@
domain: @domain_block.domain
.actions
= link_to t('.cancel'), admin_instances_path, class: 'button button-tertiary'
= link_to t('.cancel'), admin_instances_path, class: 'button button-secondary'
= f.button :submit, t('.confirm'), class: 'button button--dangerous', name: :confirm

2
app/views/admin/reports/actions/preview.html.haml
View File

@ -76,7 +76,7 @@
%hr.spacer/
.actions
= link_to t('admin.reports.cancel'), admin_report_path(@report), class: 'button button-tertiary'
= link_to t('admin.reports.cancel'), admin_report_path(@report), class: 'button button-secondary'
= form.button t('admin.reports.confirm'),
name: :confirm,
class: 'button',

2
app/views/auth/registrations/rules.html.haml
View File

@ -27,4 +27,4 @@
.stacked-actions
- accept_path = @invite_code.present? ? public_invite_url(invite_code: @invite_code, accept: @accept_token) : new_user_registration_path(accept: @accept_token)
= link_to t('auth.rules.accept'), accept_path, class: 'button'
= link_to t('auth.rules.back'), root_path, class: 'button button-tertiary'
= link_to t('auth.rules.back'), root_path, class: 'button button-secondary'

2
app/views/settings/imports/show.html.haml
View File

@ -11,5 +11,5 @@
.simple_form
.actions
= link_to t('generic.cancel'), settings_import_path(@bulk_import), method: :delete, class: 'button button-tertiary'
= link_to t('generic.cancel'), settings_import_path(@bulk_import), method: :delete, class: 'button button-secondary'
= link_to t('generic.confirm'), confirm_settings_import_path(@bulk_import), method: :post, class: 'button'