Merge pull request #21002 from overleaf/rd-icon-updates

[web] Material icon changes in toolbars

GitOrigin-RevId: f0a36b2f0c2bc56a7fccfe6491ea4538a997c486
This commit is contained in:
Rebeka Dekany 2024-10-11 11:23:54 +02:00 committed by Copybot
parent 5b6bbcb73c
commit 0131178491
4 changed files with 6 additions and 16 deletions

View file

@ -12,7 +12,7 @@ function ShareProjectButton({ onClick }) {
<button type="button" className="btn btn-full-height" onClick={onClick}> <button type="button" className="btn btn-full-height" onClick={onClick}>
<BootstrapVersionSwitcher <BootstrapVersionSwitcher
bs3={<Icon type="group" fw />} bs3={<Icon type="group" fw />}
bs5={<MaterialIcon type="groups" className="align-middle" />} bs5={<MaterialIcon type="group_add" className="align-middle" />}
/> />
<p className="toolbar-label">{t('share')}</p> <p className="toolbar-label">{t('share')}</p>
</button> </button>

View file

@ -8,7 +8,6 @@ import Icon from '../../../shared/components/icon'
import * as eventTracking from '../../../infrastructure/event-tracking' import * as eventTracking from '../../../infrastructure/event-tracking'
import BootstrapVersionSwitcher from '@/features/ui/components/bootstrap-5/bootstrap-version-switcher' import BootstrapVersionSwitcher from '@/features/ui/components/bootstrap-5/bootstrap-version-switcher'
import OLTooltip from '@/features/ui/components/ol/ol-tooltip' import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
import { Spinner } from 'react-bootstrap-5'
import { import {
Dropdown, Dropdown,
DropdownDivider, DropdownDivider,
@ -213,20 +212,11 @@ function PdfCompileButton() {
variant="primary" variant="primary"
size="sm" size="sm"
disabled={compiling} disabled={compiling}
isLoading={compiling}
onClick={() => startCompile()} onClick={() => startCompile()}
leadingIcon={
compiling ? (
<Spinner
animation="border"
aria-hidden="true"
size="sm"
role="status"
/>
) : null
}
className={buttonClassName} className={buttonClassName}
> >
{compileButtonLabel} {t('recompile')}
</OLButton> </OLButton>
</OLTooltip> </OLTooltip>

View file

@ -37,7 +37,7 @@ export const InsertFigureDropdown = memo(function InsertFigureDropdown() {
icon={ icon={
<BootstrapVersionSwitcher <BootstrapVersionSwitcher
bs3={<Icon fw type="picture-o" />} bs3={<Icon fw type="picture-o" />}
bs5={<MaterialIcon type="imagesmode" />} bs5={<MaterialIcon type="add_photo_alternate" />}
/> />
} }
altCommand={insertFigure} altCommand={insertFigure}

View file

@ -122,7 +122,7 @@ export const ToolbarItems: FC<{
id="toolbar-href" id="toolbar-href"
label={t('toolbar_insert_link')} label={t('toolbar_insert_link')}
command={commands.wrapInHref} command={commands.wrapInHref}
icon={bsVersion({ bs5: 'link', bs3: 'link' })} icon={bsVersion({ bs5: 'add_link', bs3: 'link' })}
/> />
<ToolbarButton <ToolbarButton
id="toolbar-ref" id="toolbar-ref"
@ -134,7 +134,7 @@ export const ToolbarItems: FC<{
id="toolbar-cite" id="toolbar-cite"
label={t('toolbar_insert_citation')} label={t('toolbar_insert_citation')}
command={commands.insertCite} command={commands.insertCite}
icon={bsVersion({ bs5: 'menu_book', bs3: 'book' })} icon={bsVersion({ bs5: 'book_5', bs3: 'book' })}
/> />
<InsertFigureDropdown /> <InsertFigureDropdown />
<TableInserterDropdown /> <TableInserterDropdown />