Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: OPTIC-1778: Unify and prettify icons #7169

Open
wants to merge 82 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
6372b9f
fix: OPTIC-1748: [Timebox] UI polish
yyassi-heartex Feb 28, 2025
d3466f0
changing Delete back to Remove
yyassi-heartex Feb 28, 2025
4d0ae2f
standardizing utils/dom
yyassi-heartex Feb 28, 2025
bd3a74e
fixing an issue that affects columns on datamanger table
yyassi-heartex Feb 28, 2025
28146cd
lint cleanup
yyassi-heartex Feb 28, 2025
0606f9b
more cleanup
yyassi-heartex Feb 28, 2025
5b2adc9
tweaking tooltip top-right positioning + view toggle switch to icons …
yyassi-heartex Feb 28, 2025
2b8e5a4
Merge remote-tracking branch 'origin/develop' into fb-optic-1748/ui-i…
yyassi-heartex Feb 28, 2025
3ba40aa
lint cleanup
yyassi-heartex Feb 28, 2025
3e81361
unifying Userpic
yyassi-heartex Feb 28, 2025
3be5308
classname fix for Userpic
yyassi-heartex Mar 1, 2025
277b4bd
Merge remote-tracking branch 'origin/develop' into fb-optic-1748/ui-i…
yyassi-heartex Mar 3, 2025
f53c76c
adding test ids and updating how we check for toggle
yyassi-heartex Mar 3, 2025
7156451
lint cleanup
yyassi-heartex Mar 3, 2025
b323995
fixing column check
yyassi-heartex Mar 3, 2025
470829e
lint cleanup
yyassi-heartex Mar 3, 2025
944fcb5
fixed unit test + reduced padding on datamanger view toggle buttons
yyassi-heartex Mar 3, 2025
f8b437f
lint + test fixes
yyassi-heartex Mar 3, 2025
1985de4
test fixes
yyassi-heartex Mar 3, 2025
3700375
addressing issues around datamanager columns checkboxes
yyassi-heartex Mar 3, 2025
ec20909
Merge remote-tracking branch 'origin/develop' into fb-optic-1748/ui-i…
yyassi-heartex Mar 3, 2025
aed0587
addressing failing checks
yyassi-heartex Mar 3, 2025
d55bd05
fixing userDisplayName
yyassi-heartex Mar 4, 2025
67f46c4
lint cleanup
yyassi-heartex Mar 4, 2025
8f0245b
Merge remote-tracking branch 'origin/develop' into fb-optic-1748/ui-i…
yyassi-heartex Mar 4, 2025
2983fb2
fixing AnnotationsCarousel tests
bmartel Mar 4, 2025
682f90d
cleaning up a situation where its possible for user to be null when w…
yyassi-heartex Mar 5, 2025
8ddd48a
Merge remote-tracking branch 'origin/develop' into fb-optic-1748/ui-i…
yyassi-heartex Mar 5, 2025
5eadf84
chore: OPTIC-1778: Unify and prettify icons
yyassi-heartex Mar 5, 2025
02e66a3
slight tweaks
yyassi-heartex Mar 5, 2025
d152e99
Merge branch 'develop' into 'fb-optic-1748/ui-improvements'
robot-ci-heartex Mar 6, 2025
a4f47f0
Sync Follow Merge dependencies
robot-ci-heartex Mar 6, 2025
d3a70e0
Sync Follow Merge dependencies
robot-ci-heartex Mar 6, 2025
eb900ec
test and lint cleanup
yyassi-heartex Mar 6, 2025
0c800a6
Merge branch 'fb-optic-1748/ui-improvements' of github.com:heartexlab…
yyassi-heartex Mar 6, 2025
1c53cd9
fixing an issue that makes it impossible for a user to update the fields
yyassi-heartex Mar 6, 2025
291f6e3
Merge remote-tracking branch 'origin/develop' into fb-optic-1748/ui-i…
yyassi-heartex Mar 6, 2025
233340c
Revert "Merge remote-tracking branch 'origin/develop' into fb-optic-1…
yyassi-heartex Mar 6, 2025
5ef00d2
Reapply "Merge remote-tracking branch 'origin/develop' into fb-optic-…
yyassi-heartex Mar 6, 2025
2bd247c
fixing merge
yyassi-heartex Mar 6, 2025
f59c735
cleaning up imports
yyassi-heartex Mar 6, 2025
38b22b8
Merge branch 'fb-optic-1748/ui-improvements' into fb-optic-1778/icons
yyassi-heartex Mar 6, 2025
981c7be
addressing a different in icon usage
yyassi-heartex Mar 6, 2025
f9ddf2b
icon cleanup
yyassi-heartex Mar 6, 2025
57ad67a
import upload uptton sizing
yyassi-heartex Mar 6, 2025
7cac18d
Sync Follow Merge dependencies
robot-ci-heartex Mar 7, 2025
66acccf
Update web/libs/core/src/pages/AccountSettings/sections/PersonalInfo.tsx
yyassi-heartex Mar 7, 2025
e538921
Update web/libs/ui/src/lib/Userpic/Userpic.tsx
yyassi-heartex Mar 7, 2025
f46cec4
Update web/libs/ui/src/lib/Userpic/Userpic.tsx
yyassi-heartex Mar 7, 2025
d252491
unfiying icons
yyassi-heartex Mar 7, 2025
a365100
fixing icon
yyassi-heartex Mar 7, 2025
b06aaa8
Merge branch 'develop' into fb-optic-1748/ui-improvements
yyassi-heartex Mar 7, 2025
93aa9f4
cleaned out unused files + fixed tooltip breakage due to quick toggle…
yyassi-heartex Mar 7, 2025
1a2c954
lint cleanup
yyassi-heartex Mar 7, 2025
6bf7829
Sync Follow Merge dependencies
robot-ci-heartex Mar 10, 2025
6e1f4d5
we dont need this icon here
yyassi-heartex Mar 10, 2025
18637da
Merge branch 'fb-optic-1748/ui-improvements' into fb-optic-1778/icons
yyassi-heartex Mar 10, 2025
9c9d4a8
Merge branch 'develop' into fb-optic-1778/icons
yyassi-heartex Mar 10, 2025
bfae5e3
Merge remote-tracking branch 'origin/develop' into fb-optic-1778/icons
yyassi-heartex Mar 10, 2025
e93beed
icon updates
yyassi-heartex Mar 10, 2025
21c234f
lint cleanup
yyassi-heartex Mar 10, 2025
22deb13
icon cleanup
yyassi-heartex Mar 10, 2025
6035a0d
react-icons no longer used + cleanup
yyassi-heartex Mar 10, 2025
1246386
Merge remote-tracking branch 'origin/develop' into fb-optic-1778/icons
yyassi-heartex Mar 10, 2025
39c87c7
fixing icon import
yyassi-heartex Mar 10, 2025
5242a3c
Merge branch 'develop' into fb-optic-1778/icons
yyassi-heartex Mar 11, 2025
8256be8
fixing e2e + integration tests
yyassi-heartex Mar 11, 2025
baa0986
Merge branch 'develop' into 'fb-optic-1778/icons'
yyassi-heartex Mar 11, 2025
72b3c27
slight tweaks
yyassi-heartex Mar 11, 2025
7690473
Merge branch 'fb-optic-1778/icons' of github.com:heartexlabs/label-st…
yyassi-heartex Mar 11, 2025
92a91d4
fixing an import
yyassi-heartex Mar 11, 2025
fb89c7e
lint cleanup
yyassi-heartex Mar 11, 2025
83ea702
unifiying LSE icons into ui library
yyassi-heartex Mar 11, 2025
4df1c10
adjusting Compare all annotations icon size
yyassi-heartex Mar 11, 2025
b4ce218
bigger button looks better
yyassi-heartex Mar 11, 2025
94f5b48
fix top bar icon sizing to match design intent
bmartel Mar 13, 2025
2c4828f
comment form icon styles
bmartel Mar 13, 2025
0a04b77
don't increase weight of icons by forcing a stroke to paths of button…
bmartel Mar 13, 2025
3cb6e56
fix eye icon sizing in relations and regions panel
bmartel Mar 13, 2025
b553782
linting
bmartel Mar 13, 2025
17e2905
Merge remote-tracking branch 'origin/develop' into fb-optic-1778/icons
bmartel Mar 14, 2025
7143241
fix slider icon import
bmartel Mar 14, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 0 additions & 3 deletions web/apps/labelstudio/src/assets/icons/check.svg

This file was deleted.

3 changes: 0 additions & 3 deletions web/apps/labelstudio/src/assets/icons/chevron-left.svg

This file was deleted.

3 changes: 0 additions & 3 deletions web/apps/labelstudio/src/assets/icons/chevron-right.svg

This file was deleted.

3 changes: 0 additions & 3 deletions web/apps/labelstudio/src/assets/icons/ellipsis.svg

This file was deleted.

11 changes: 0 additions & 11 deletions web/apps/labelstudio/src/assets/icons/empty-predictions.svg

This file was deleted.

4 changes: 0 additions & 4 deletions web/apps/labelstudio/src/assets/icons/folder.svg

This file was deleted.

15 changes: 0 additions & 15 deletions web/apps/labelstudio/src/assets/icons/gear.svg

This file was deleted.

33 changes: 0 additions & 33 deletions web/apps/labelstudio/src/assets/icons/index.js

This file was deleted.

4 changes: 0 additions & 4 deletions web/apps/labelstudio/src/assets/icons/info.svg

This file was deleted.

3 changes: 0 additions & 3 deletions web/apps/labelstudio/src/assets/icons/minus.svg

This file was deleted.

1 change: 0 additions & 1 deletion web/apps/labelstudio/src/assets/icons/person-circle.svg

This file was deleted.

3 changes: 0 additions & 3 deletions web/apps/labelstudio/src/assets/icons/plus.svg

This file was deleted.

4 changes: 0 additions & 4 deletions web/apps/labelstudio/src/assets/icons/predictions.svg

This file was deleted.

3 changes: 0 additions & 3 deletions web/apps/labelstudio/src/assets/icons/settings.svg

This file was deleted.

3 changes: 0 additions & 3 deletions web/apps/labelstudio/src/assets/icons/upload.svg

This file was deleted.

4 changes: 0 additions & 4 deletions web/apps/labelstudio/src/components/Button/Button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,6 @@

& svg {
color: var(--sand_500) !important;

& path {
stroke: var(--sand_500);
}
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { cn } from "../../utils/bem";
import "./DescriptionList.scss";
import { IconInfoOutline } from "../../assets/icons";
import { IconInfoOutline } from "@humansignal/icons";
import { Tooltip } from "@humansignal/ui";

export const DescriptionList = ({ style, className, children }) => {
Expand Down
4 changes: 2 additions & 2 deletions web/apps/labelstudio/src/components/Error/Error.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Fragment, useCallback, useMemo, useState } from "react";
import sanitizeHtml from "sanitize-html";
import { LsSlack } from "../../assets/icons";
import { IconSlack } from "@humansignal/icons";
import { Block, Elem } from "../../utils/bem";
import { absoluteURL, copyText } from "../../utils/helpers";
import { Button } from "../Button/Button";
Expand Down Expand Up @@ -87,7 +87,7 @@ export const ErrorWrapper = ({

<Elem name="actions">
<Space spread>
<Elem tag={Button} name="action-slack" target="_blank" icon={<LsSlack />} href={SLACK_INVITE_URL}>
<Elem tag={Button} name="action-slack" target="_blank" icon={<IconSlack />} href={SLACK_INVITE_URL}>
Ask on Slack
</Elem>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React from "react";
import { FaMinus, FaPlus } from "react-icons/fa";
import { Block, Elem } from "../../../../utils/bem";
import { Oneof } from "../../../Oneof/Oneof";
import { FormField } from "../../FormField";
import { default as Label } from "../Label/Label";
import "./Counter.scss";
import { IconMinus, IconPlus } from "@humansignal/icons";

const allowedKeys = ["ArrowUp", "ArrowDown", "Backspace", "Delete", /[0-9]/];

Expand Down Expand Up @@ -158,8 +158,8 @@ const CounterButton = ({ type }) => {
onMouseDownCapture={(e) => e.preventDefault()}
>
<Oneof value={type}>
<FaMinus case="decrease" />
<FaPlus case="increase" />
<IconMinus case="decrease" />
<IconPlus case="increase" />
</Oneof>
</Elem>
);
Expand Down
2 changes: 1 addition & 1 deletion web/apps/labelstudio/src/components/HeidiTips/HeidiTip.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { type FC, type MouseEvent, useCallback, useMemo } from "react";
import { Block, Elem } from "../../utils/bem";
import { IconCross } from "@humansignal/ui";
import { IconCross } from "@humansignal/icons";
import "./HeidiTip.scss";
import { Button } from "../Button/Button";
import { HeidiSpeaking } from "../../assets/images";
Expand Down
24 changes: 14 additions & 10 deletions web/apps/labelstudio/src/components/Menubar/Menubar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ import {
IconPersonInCircle,
IconPin,
IconTerminal,
LsDoor,
LsGitHub,
LsSettings,
LsSlack,
} from "../../assets/icons";
IconDoor,
IconGitHub,
IconSettings,
IconSlack,
} from "@humansignal/icons";
import { Userpic } from "@humansignal/ui";
import { useConfig } from "../../providers/ConfigProvider";
import { useContextComponent, useFixedLocation } from "../../providers/RoutesProvider";
import { useCurrentUser } from "../../providers/CurrentUser";
Expand All @@ -20,7 +21,6 @@ import { Breadcrumbs } from "../Breadcrumbs/Breadcrumbs";
import { Dropdown } from "../Dropdown/Dropdown";
import { Hamburger } from "../Hamburger/Hamburger";
import { Menu } from "../Menu/Menu";
import { Userpic } from "@humansignal/ui";
import { VersionNotifier, VersionProvider } from "../VersionNotifier/VersionNotifier";
import "./Menubar.scss";
import "./MenuContent.scss";
Expand Down Expand Up @@ -151,9 +151,13 @@ export const Menubar = ({ enabled, defaultOpened, defaultPinned, children, onSid
align="right"
content={
<Menu>
<Menu.Item icon={<LsSettings />} label="Account &amp; Settings" href={pages.AccountSettingsPage.path} />
<Menu.Item
icon={<IconSettings />}
label="Account &amp; Settings"
href={pages.AccountSettingsPage.path}
/>
{/* <Menu.Item label="Dark Mode"/> */}
<Menu.Item icon={<LsDoor />} label="Log Out" href={absoluteURL("/logout")} data-external />
<Menu.Item icon={<IconDoor />} label="Log Out" href={absoluteURL("/logout")} data-external />
{showNewsletterDot && (
<>
<Menu.Divider />
Expand Down Expand Up @@ -204,14 +208,14 @@ export const Menubar = ({ enabled, defaultOpened, defaultPinned, children, onSid
<Menu.Item
label="GitHub"
href="https://github.com/HumanSignal/label-studio"
icon={<LsGitHub />}
icon={<IconGitHub />}
target="_blank"
rel="noreferrer"
/>
<Menu.Item
label="Slack Community"
href="https://slack.labelstud.io/?source=product-menu"
icon={<LsSlack />}
icon={<IconSlack />}
target="_blank"
rel="noreferrer"
/>
Expand Down
2 changes: 1 addition & 1 deletion web/apps/labelstudio/src/components/Modal/ModalPopup.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { createContext, useContext } from "react";
import { createPortal } from "react-dom";
import { IconCross } from "@humansignal/ui";
import { IconCross } from "@humansignal/icons";
import { BemWithSpecifiContext, cn } from "../../utils/bem";
import { aroundTransition } from "@humansignal/core/lib/utils/transition";
import { Button } from "../Button/Button";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Link } from "react-router-dom";
import { useAPI } from "../../providers/ApiProvider";
import { Block, Elem } from "../../utils/bem";
import "./VersionNotifier.scss";
import { IconBell } from "../../assets/icons";
import { IconBell } from "@humansignal/icons";

const VersionContext = createContext();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Spinner } from "../../../components";
import { useAPI } from "../../../providers/ApiProvider";
import { cn } from "../../../utils/bem";
import "./Config.scss";
import { IconInfo } from "../../../assets/icons";
import { IconInfo } from "@humansignal/icons";

const listClass = cn("templates-list");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { cn } from "../../../utils/bem";
import { cn as scn } from "@humansignal/shad/utils";
import { unique } from "../../../utils/helpers";
import "./Import.scss";
import { IconError, IconInfo, IconUpload } from "../../../assets/icons";
import { IconError, IconInfo, IconUpload } from "@humansignal/icons";
import { useAPI } from "../../../providers/ApiProvider";
import Input from "libs/datamanager/src/components/Common/Input/Input";
import { Button } from "apps/labelstudio/src/components";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@
}

&__upload-icon {
height: 16px;
margin-right: 8px;
height: 20px;
width: 20px;
}

&__info-icon {
Expand Down
6 changes: 3 additions & 3 deletions web/apps/labelstudio/src/pages/Home/HomePage.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { Page } from "../types/Page";
import { Button } from "@humansignal/shad/components/ui/button";
import { IconFolder, SimpleCard, Spinner } from "@humansignal/ui";
import { IconExternal, IconFolderAdd, IconHumanSignal, IconUserAdd } from "@humansignal/icons";
import { SimpleCard, Spinner } from "@humansignal/ui";
import { IconExternal, IconFolderAdd, IconHumanSignal, IconUserAdd, IconFolderOpen } from "@humansignal/icons";
import { HeidiTips } from "../../components/HeidiTips/HeidiTips";
import { useQuery } from "@tanstack/react-query";
import { useAPI } from "../../providers/ApiProvider";
Expand Down Expand Up @@ -125,7 +125,7 @@ export const HomePage: Page = () => {
"rounded-full w-12 h-12 flex justify-center items-center bg-lsAccentGrapeSubtle text-lsPrimaryIcon"
}
>
<IconFolder />
<IconFolderOpen />
</div>
<Heading size={2}>Create your first project</Heading>
<Sub>Import your data and set up the labeling interface to start annotating</Sub>
Expand Down
Loading
Loading