Leatherface/mastodon
0
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 03:00:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove column header button (#38362)

Browse Source 
Co-authored-by: diondiondion <mail@diondiondion.com>
This commit is contained in:
Echo
2026-03-24 14:28:09 +01:00
committed by GitHub
parent aef70991f8
commit c7e90ee67a
2 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/javascript/mastodon/components/column_header.tsx
View File

@@ -267,6 +267,15 @@ export const ColumnHeader: React.FC<Props> = ({
const hasTitle = (hasIcon || backButton) && title; const hasTitle = (hasIcon || backButton) && title;
const columnIndex = useColumnIndexContext(); const columnIndex = useColumnIndexContext();
const titleContents = (
<>
{!backButton && hasIcon && (
<Icon id={icon} icon={iconComponent} className='column-header__icon' />
)}
{title}
</>
);
const component = ( const component = (
<div className={wrapperClassName}> <div className={wrapperClassName}>
<h1 className={buttonClassName}> <h1 className={buttonClassName}>
@@ -274,21 +283,25 @@ export const ColumnHeader: React.FC<Props> = ({
<> <>
{backButton} {backButton}
<button {onClick && (
onClick={handleTitleClick} <button
className='column-header__title' onClick={handleTitleClick}
type='button' className='column-header__title'
id={getColumnSkipLinkId(columnIndex)} type='button'
> id={getColumnSkipLinkId(columnIndex)}
{!backButton && hasIcon && ( >
<Icon {titleContents}
id={icon} </button>
icon={iconComponent} )}
className='column-header__icon' {!onClick && (
/> <span
)} className='column-header__title'
{title} tabIndex={-1}
</button> id={getColumnSkipLinkId(columnIndex)}
>
{titleContents}
</span>
)}
</> </>
)} )}

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

@@ -4608,7 +4608,6 @@ a.status-card {
border: 1px solid var(--color-border-primary); border: 1px solid var(--color-border-primary);
border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0;
flex: 0 0 auto; flex: 0 0 auto;
cursor: pointer;
position: relative; position: relative;
z-index: 2; z-index: 2;
outline: 0; outline: 0;