Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ export function InstanceEmailForm(props: IInstanceEmailForm) {
{isSubmitting ? "Saving..." : "Save changes"}
</Button>
<Button
variant="outline-primary"
variant="secondary"
onClick={() => setIsSendTestEmailModalOpen(true)}
loading={isSubmitting}
disabled={!isValid}
Expand Down
4 changes: 2 additions & 2 deletions apps/admin/app/(all)/(dashboard)/email/test-email-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,11 @@ export function SendTestEmailModal(props: Props) {
)}
{sendEmailStep === ESendEmailSteps.FAILED && <div className="text-13">{error}</div>}
<div className="flex items-center gap-2 justify-end mt-5">
<Button variant="neutral-primary" size="sm" onClick={handleClose} tabIndex={2}>
<Button variant="secondary" onClick={handleClose} tabIndex={2}>
{sendEmailStep === ESendEmailSteps.SEND_EMAIL ? "Cancel" : "Close"}
</Button>
{sendEmailStep === ESendEmailSteps.SEND_EMAIL && (
<Button variant="primary" size="sm" loading={isLoading} onClick={handleSubmit} tabIndex={3}>
<Button variant="primary" loading={isLoading} onClick={handleSubmit} tabIndex={3}>
{isLoading ? "Sending email..." : "Send email"}
</Button>
)}
Expand Down
2 changes: 1 addition & 1 deletion apps/admin/app/(all)/(dashboard)/workspace/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ const WorkspaceManagementPage = observer(function WorkspaceManagementPage(_props
{hasNextPage && (
<div className="flex justify-center">
<Button
variant="link-primary"
variant="link"
onClick={() => fetchNextWorkspaces()}
disabled={workspaceLoader === "pagination"}
>
Expand Down
2 changes: 1 addition & 1 deletion apps/admin/app/components/404.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function PageNotFound() {
</div>
<Link to="/general/">
<span className="flex justify-center py-4">
<Button variant="neutral-primary" size="md">
<Button variant="secondary" size="md">
Go to general settings
</Button>
</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export function ConfirmDiscardModal(props: Props) {
</div>
</div>
<div className="flex justify-end items-center p-4 sm:px-6 gap-2">
<Button variant="neutral-primary" size="sm" onClick={handleClose}>
<Button variant="secondary" onClick={handleClose}>
Keep editing
</Button>
<Link href={onDiscardHref} className={getButtonStyling("primary", "sm")}>
Expand Down
2 changes: 1 addition & 1 deletion apps/admin/core/components/common/copy-field.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export function CopyField(props: Props) {
<div className="flex flex-col gap-1">
<h4 className="text-13 text-secondary">{label}</h4>
<Button
variant="neutral-primary"
variant="secondary"
className="flex items-center justify-between py-2"
onClick={() => {
navigator.clipboard.writeText(url);
Expand Down
2 changes: 1 addition & 1 deletion apps/admin/core/components/new-user-popup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export const NewUserPopup = observer(function NewUserPopup() {
<Link href="/workspace/create" className={getButtonStyling("primary", "sm")}>
Create workspace
</Link>
<Button variant="neutral-primary" size="sm" onClick={toggleNewUserPopup}>
<Button variant="secondary" onClick={toggleNewUserPopup}>
Close
</Button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion apps/space/app/error.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function ErrorPage() {
<Button variant="primary" size="md" onClick={handleRetry}>
Refresh
</Button>
{/* <Button variant="neutral-primary" size="md" onClick={() => {}}>
{/* <Button variant="secondary" size="md" onClick={() => {}}>
Sign out
</Button> */}
</div>
Expand Down
2 changes: 1 addition & 1 deletion apps/space/core/components/account/auth-forms/password.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ export const AuthPasswordForm = observer(function AuthPasswordForm(props: Props)
<Button
type="button"
onClick={redirectToUniqueCodeSignIn}
variant="outline-primary"
variant="secondary"
className="w-full"
size="lg"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export function FiltersDropdown(props: Props) {
return (
<>
<Popover.Button as={React.Fragment}>
<Button ref={setReferenceElement} variant="neutral-primary" size="sm">
<Button ref={setReferenceElement} variant="secondary">
<div className={`${open ? "text-primary" : "text-secondary"}`}>
<span>{title}</span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion apps/space/core/components/issues/navbar/user-avatar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export const UserAvatar = observer(function UserAvatar() {
) : (
<div className="flex-shrink-0">
<Link href={`/?next_path=${pathName}?${queryParam}`}>
<Button variant="outline-primary">Sign in</Button>
<Button variant="secondary">Sign in</Button>
</Link>
</div>
)}
Expand Down
7 changes: 1 addition & 6 deletions apps/web/app/(all)/[workspaceSlug]/(projects)/header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,7 @@ export const WorkspaceDashboardHeader = observer(function WorkspaceDashboardHead
</div>
</Header.LeftItem>
<Header.RightItem>
<Button
variant="neutral-primary"
size="sm"
onClick={() => toggleWidgetSettings(true)}
className="my-auto mb-0"
>
<Button variant="secondary" onClick={() => toggleWidgetSettings(true)} className="my-auto mb-0">
<Shapes size={16} />
<div className="hidden text-11 font-medium sm:hidden md:block">{t("home.manage_widgets")}</div>
</Button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function ProfileActivityPage() {
{activityPages}
{pageCount < totalPages && resultsCount !== 0 && (
<div className="flex w-full items-center justify-center text-11">
<Button variant="accent-primary" size="sm" onClick={handleLoadMore}>
<Button variant="secondary" onClick={handleLoadMore}>
{t("common.load_more")}
</Button>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function ArchivedIssueDetailsPage({ params }: Route.ComponentProps) {
icon={<ArchiveIcon className="size-4" />}
action={
<Button
variant="neutral-primary"
variant="secondary"
size="sm"
onClick={() => router.push(`/${workspaceSlug}/projects/${projectId}/archives/issues/`)}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ export const CycleIssuesHeader = observer(function CycleIssuesHeader() {

{canUserCreateIssue && (
<>
<Button onClick={() => setAnalyticsModal(true)} variant="neutral-primary" size="sm">
<Button onClick={() => setAnalyticsModal(true)} variant="secondary">
<div className="hidden @4xl:flex">Analytics</div>
<div className="flex @4xl:hidden">
<ChartNoAxesColumn className="size-3.5" />
Expand All @@ -243,7 +243,6 @@ export const CycleIssuesHeader = observer(function CycleIssuesHeader() {
toggleCreateIssueModal(true, EIssuesStoreType.CYCLE);
}}
data-ph-element={WORK_ITEM_TRACKER_ELEMENTS.HEADER_ADD_BUTTON.CYCLE}
size="sm"
>
{t("issue.add.label")}
</Button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,7 @@ export const ModuleIssuesHeader = observer(function ModuleIssuesHeader() {

{canUserCreateIssue ? (
<>
<Button
className="hidden md:block"
onClick={() => setAnalyticsModal(true)}
variant="neutral-primary"
size="sm"
>
<Button className="hidden md:block" onClick={() => setAnalyticsModal(true)} variant="secondary">
<div className="hidden @4xl:flex">Analytics</div>
<div className="flex @4xl:hidden">
<ChartNoAxesColumn className="size-3.5" />
Expand All @@ -238,7 +233,6 @@ export const ModuleIssuesHeader = observer(function ModuleIssuesHeader() {
toggleCreateIssueModal(true, EIssuesStoreType.MODULE);
}}
data-ph-element={WORK_ITEM_TRACKER_ELEMENTS.HEADER_ADD_BUTTON.MODULE}
size="sm"
>
Add work item
</Button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { DetailedEmptyState } from "@/components/empty-state/detailed-empty-stat
import { ProfileActivityListPage } from "@/components/profile/activity/profile-activity-list";
// hooks
import { SettingsHeading } from "@/components/settings/heading";
import { ChevronDown } from "lucide-react";

const PER_PAGE = 100;

Expand Down Expand Up @@ -79,8 +80,8 @@ function ProfileActivityPage() {
/>
<div className="w-full">{activityPages}</div>
{isLoadMoreVisible && (
<div className="flex w-full items-center justify-center text-11">
<Button variant="accent-primary" size="sm" onClick={handleLoadMore}>
<div className="flex w-full items-center justify-center mt-4">
<Button variant="ghost" onClick={handleLoadMore} appendIcon={<ChevronDown />}>
{t("load_more")}
</Button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion apps/web/app/(all)/invitations/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ function UserInvitationsPage() {
</Button>
<Link href={`/${redirectWorkspaceSlug}`}>
<span>
<Button variant="neutral-primary" size="md">
<Button variant="secondary" size="md">
{t("go_home")}
</Button>
</span>
Expand Down
2 changes: 1 addition & 1 deletion apps/web/app/(all)/profile/activity/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ function ProfileActivityPage() {
{activityPages}
{isLoadMoreVisible && (
<div className="flex w-full items-center justify-center text-11">
<Button variant="accent-primary" size="sm" onClick={handleLoadMore}>
<Button variant="secondary" onClick={handleLoadMore}>
{t("load_more")}
</Button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion apps/web/app/error/dev.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ function ErrorActions({ onGoHome, onReload }: ErrorActionsProps) {
Go to home
</Button>
{onReload && (
<Button variant="outline-primary" size="md" onClick={onReload}>
<Button variant="secondary" size="md" onClick={onReload}>
Reload page
</Button>
)}
Expand Down
2 changes: 1 addition & 1 deletion apps/web/app/not-found.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function PageNotFound() {
</div>
<Link href="/">
<span className="flex justify-center">
<Button variant="neutral-primary" size="md">
<Button variant="secondary" size="md">
Go to Home
</Button>
</span>
Expand Down
2 changes: 1 addition & 1 deletion apps/web/ce/components/onboarding/tour/root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ export const TourRoot = observer(function TourRoot(props: TOnboardingTourProps)
<div className="mt-3 flex h-full items-end justify-between gap-4">
<div className="flex items-center gap-4">
{currentStep?.prevStep && (
<Button variant="neutral-primary" onClick={() => setStep(currentStep.prevStep ?? "welcome")}>
<Button variant="secondary" onClick={() => setStep(currentStep.prevStep ?? "welcome")}>
Back
</Button>
)}
Expand Down
2 changes: 1 addition & 1 deletion apps/web/ce/components/projects/settings/intake/header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export const ProjectInboxHeader = observer(function ProjectInboxHeader() {
handleModalClose={() => setCreateIssueModal(false)}
/>

<Button variant="primary" size="sm" onClick={() => setCreateIssueModal(true)}>
<Button variant="primary" onClick={() => setCreateIssueModal(true)}>
{t("add_work_item")}
</Button>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export const DeleteWorkspaceSection = observer(function DeleteWorkspaceSection(p
</span>
<div>
<Button
variant="danger"
variant="error-fill"
onClick={() => setDeleteWorkspaceModal(true)}
data-ph-element={WORKSPACE_TRACKER_ELEMENTS.DELETE_WORKSPACE_BUTTON}
>
Expand Down
2 changes: 1 addition & 1 deletion apps/web/ce/components/workspace/edition-badge.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const WorkspaceEditionBadge = observer(function WorkspaceEditionBadge() {
<Tooltip tooltipContent={`Version: v${packageJson.version}`} isMobile={isMobile}>
<Button
tabIndex={-1}
variant="accent-primary"
variant="secondary"
className="w-fit min-w-24 cursor-pointer rounded-2xl px-2 py-1 text-center text-13 font-medium outline-none"
onClick={() => setIsPaidPlanPurchaseModalOpen(true)}
aria-haspopup="dialog"
Expand Down
2 changes: 1 addition & 1 deletion apps/web/core/components/account/auth-forms/password.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ export const AuthPasswordForm = observer(function AuthPasswordForm(props: Props)
type="button"
data-ph-element={AUTH_TRACKER_ELEMENTS.SIGN_IN_WITH_UNIQUE_CODE}
onClick={redirectToUniqueCodeSignIn}
variant="outline-primary"
variant="secondary"
className="w-full"
size="lg"
>
Expand Down
4 changes: 2 additions & 2 deletions apps/web/core/components/account/deactivate-account-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@ export function DeactivateAccountModal(props: Props) {
</div>
</div>
<div className="mb-2 flex items-center justify-end gap-2 p-4 sm:px-6">
<Button variant="neutral-primary" onClick={onClose}>
<Button variant="secondary" onClick={onClose}>
{t("cancel")}
</Button>
<Button variant="danger" onClick={handleDeleteAccount}>
<Button variant="error-fill" onClick={handleDeleteAccount}>
{isDeactivating ? t("deactivating") : t("confirm")}
</Button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion apps/web/core/components/analytics/insight-table/root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export function InsightTable<T extends Exclude<TAnalyticsTabsBase, "overview">>(
searchPlaceholder={`${data?.length || 0} ${headerText}`}
actions={(table: Table<AnalyticsTableDataMap[T]>) => (
<Button
variant="accent-primary"
variant="secondary"
prependIcon={<Download className="h-3.5 w-3.5" />}
onClick={() => onExport?.(table.getFilteredRowModel().rows)}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ const PriorityChart = observer(function PriorityChart(props: Props) {
searchPlaceholder={`${parsedData.data.length} ${xAxisLabel}`}
actions={(table: Table<TChartDatum>) => (
<Button
variant="accent-primary"
variant="secondary"
prependIcon={<Download className="h-3.5 w-3.5" />}
onClick={() => exportCSV(table.getRowModel().rows, [...defaultColumns, ...columns], workspaceSlug)}
>
Expand Down
4 changes: 2 additions & 2 deletions apps/web/core/components/api-token/modal/form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -239,10 +239,10 @@ export function CreateApiTokenForm(props: Props) {
<span className="text-11">{t("workspace_settings.settings.api_tokens.never_expires")}</span>
</div>
<div className="flex items-center gap-2">
<Button variant="neutral-primary" size="sm" onClick={handleClose}>
<Button variant="secondary" onClick={handleClose}>
{t("cancel")}
</Button>
<Button variant="primary" size="sm" type="submit" loading={isSubmitting}>
<Button variant="primary" type="submit" loading={isSubmitting}>
{isSubmitting
? t("workspace_settings.settings.api_tokens.generating")
: t("workspace_settings.settings.api_tokens.generate_token")}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export function GeneratedTokenDetails(props: Props) {
? `Expires ${renderFormattedDate(tokenDetails.expired_at!)} at ${renderFormattedTime(tokenDetails.expired_at!)}`
: "Never expires"}
</p>
<Button variant="neutral-primary" size="sm" onClick={handleClose}>
<Button variant="secondary" onClick={handleClose}>
{t("close")}
</Button>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export function NotAWorkspaceMember() {
<div className="flex items-center justify-center gap-2">
<Link href="/invitations">
<span>
<Button variant="neutral-primary">Check pending invites</Button>
<Button variant="secondary">Check pending invites</Button>
</span>
</Link>
<Link href="/create-workspace">
Expand Down
4 changes: 2 additions & 2 deletions apps/web/core/components/automation/select-month-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,10 @@ export function SelectMonthModal({ type, initialValues, isOpen, handleClose, han
</div>
</div>
<div className="mt-5 flex justify-end gap-2">
<Button variant="neutral-primary" size="sm" onClick={onClose}>
<Button variant="secondary" onClick={onClose}>
Cancel
</Button>
<Button variant="primary" size="sm" type="submit" loading={isSubmitting}>
<Button variant="primary" type="submit" loading={isSubmitting}>
{isSubmitting ? "Submitting..." : "Submit"}
</Button>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ export const DescriptionVersionsModal = observer(function DescriptionVersionsMod
</button>
</Tooltip>
<div className="flex items-center gap-2">
<Button variant="neutral-primary" size="sm" onClick={handleClose} tabIndex={1}>
<Button variant="secondary" onClick={handleClose} tabIndex={1}>
{t("common.cancel")}
</Button>
{!isRestoreDisabled && (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ export function DateFilterModal({ title, handleClose, isOpen, onSelect }: Props)
</h6>
)}
<div className="flex justify-end gap-4">
<Button variant="neutral-primary" size="sm" onClick={handleClose}>
<Button variant="secondary" onClick={handleClose}>
Cancel
</Button>
<Button
Expand Down
4 changes: 2 additions & 2 deletions apps/web/core/components/core/image-picker-popover.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ export const ImagePickerPopover = observer(function ImagePickerPopover(props: Pr
/>
)}
/>
<Button variant="primary" onClick={() => setSearchParams(formData.search)} size="sm">
<Button variant="primary" onClick={() => setSearchParams(formData.search)}>
Search
</Button>
</div>
Expand Down Expand Up @@ -346,7 +346,7 @@ export const ImagePickerPopover = observer(function ImagePickerPopover(props: Pr

<div className="flex h-12 items-start justify-end gap-2">
<Button
variant="neutral-primary"
variant="secondary"
onClick={() => {
setIsOpen(false);
setImage(null);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,10 +205,10 @@ export const BulkDeleteIssuesModal = observer(function BulkDeleteIssuesModal(pro

{issues.length > 0 && (
<div className="flex items-center justify-end gap-2 p-3">
<Button variant="neutral-primary" size="sm" onClick={handleClose}>
<Button variant="secondary" onClick={handleClose}>
Cancel
</Button>
<Button variant="danger" size="sm" onClick={handleSubmit(handleDelete)} loading={isSubmitting}>
<Button variant="error-fill" onClick={handleSubmit(handleDelete)} loading={isSubmitting}>
{isSubmitting ? "Deleting..." : "Delete selected work items"}
</Button>
</div>
Expand Down
Loading