bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'gavel-icon' into 'develop'

Browse source 
Use gavel icon from Tabler icons

See merge request soapbox-pub/soapbox-fe!1052
This commit is contained in:
Alex Gleason 2022-02-26 15:55:06 +00:00
commit 8b0bcb2219
6 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/icons/COPYING.md
View file

@ -2,11 +2,9 @@
- dashboard-filled.svg - Modified from Tabler icons, MIT
- fediverse.svg - Modified from Wikipedia, CC0
- gavel.svg - Created by ramsha61 for this project, MIT
- home-squared.svg - Modified from Tabler icons, MIT
- pen-plus.svg - Modified from Tabler icons, MIT
Tabler: https://tabler-icons.io/
Feather: https://feathericons.com/
Fediverse logo: https://en.wikipedia.org/wiki/Fediverse#/media/File:Fediverse_logo_proposal.svg
ramsha61: https://www.fiverr.com/ramsha61

5
app/icons/gavel.svg
View file

@ -1,5 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler" viewBox="0 0 24 24" width="24" height="24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
<path d="M10 9.07l-.1.1a.87.87 0 0 1-.59.24.82.82 0 0 1-.59-.24l-.83-.82a.86.86 0 0 1 0-1.19l4-4a.82.82 0 0 1 .59-.25.83.83 0 0 1 .59.25l.82.82a.83.83 0 0 1 .25.59.82.82 0 0 1-.25.59l-.1.11h0a14.27 14.27 0 0 0 4.6 4.61l.11-.11a.87.87 0 0 1 .59-.24.82.82 0 0 1 .59.24l.83.83a.85.85 0 0 1 0 1.18l-4 4a.85.85 0 0 1-1.18 0l-.8-.78a.81.81 0 0 1 0-1.16h0l.1-.11m-1.49-1.37l-8 8.4-.14.16a1 1 0 0 1-.48.16h-.11a.88.88 0 0 1-.63-.26l-.9-.9a.92.92 0 0 1-.1-1.17 1 1 0 0 1 .16-.2l8.39-8"/>
<path d="M13.91 5.17l-.1.11-.37.37-3.71 3.71A14.69 14.69 0 0 1 14.34 14l4.18-4.19"/>
<path d="M21.37,20.75a.31.31,0,0,1,0,.23.26.26,0,0,1-.2.1H12.74a.28.28,0,0,1-.21-.1.31.31,0,0,1,0-.23L13,19.23a.85.85,0,0,1,.81-.6h6.37a.83.83,0,0,1,.8.6l.45,1.52Z"/>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 951 B

2
app/soapbox/components/status_action_bar.js
View file

@ -440,7 +440,7 @@ class StatusActionBar extends ImmutablePureComponent {
menu.push({
text: intl.formatMessage(messages.admin_account, { name: status.getIn(['account', 'username']) }),
href: `/pleroma/admin/#/users/${status.getIn(['account', 'id'])}/`,
icon: require('icons/gavel.svg'),
icon: require('@tabler/icons/icons/gavel.svg'),
});
menu.push({
text: intl.formatMessage(messages.admin_status),

2
app/soapbox/features/account/components/header.js
View file

@ -400,7 +400,7 @@ class Header extends ImmutablePureComponent {
menu.push({
text: intl.formatMessage(messages.admin_account, { name: account.get('username') }),
href: `/pleroma/admin/#/users/${account.get('id')}/`, newTab: true,
icon: require('icons/gavel.svg'),
icon: require('@tabler/icons/icons/gavel.svg'),
});
}

2
app/soapbox/features/admin/components/admin_nav.js
View file

@ -35,7 +35,7 @@ class AdminNav extends React.PureComponent {
<FormattedMessage id='admin_nav.dashboard' defaultMessage='Dashboard' />
</NavLink>
<NavLink className='promo-panel-item' to='/admin/reports'>
<IconWithCounter src={require('icons/gavel.svg')} count={reportsCount} />
<IconWithCounter src={require('@tabler/icons/icons/gavel.svg')} count={reportsCount} />
<FormattedMessage id='admin_nav.reports' defaultMessage='Reports' />
</NavLink>
{((instance.get('registrations') && instance.get('approval_required')) || approvalCount > 0) && (

2
app/soapbox/features/status/components/action_bar.js
View file

@ -438,7 +438,7 @@ class ActionBar extends React.PureComponent {
menu.push({
text: intl.formatMessage(messages.admin_account, { name: status.getIn(['account', 'username']) }),
href: `/pleroma/admin/#/users/${status.getIn(['account', 'id'])}/`,
icon: require('icons/gavel.svg'),
icon: require('@tabler/icons/icons/gavel.svg'),
});
menu.push({
text: intl.formatMessage(messages.admin_status),