mythic-insight/calcom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

more consistency for dropdown (#2173)

Browse source 
Co-authored-by: zomars <zomars@me.com>
This commit is contained in:
Peer Richelsen 2022-03-17 01:09:17 +00:00 committed by GitHub
parent 558897fe53
commit faa74dae39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/api

@ -1 +1 @@
Subproject commit 63e0ca33e95583a5e2aae69195af052fd0d9aef8 Subproject commit 378cbf8f3a67ea7877296f1da02edb2b6e3efbce

27
apps/web/components/team/TeamListItem.tsx
View file

@ -1,5 +1,11 @@
import { ExternalLinkIcon, TrashIcon, LogoutIcon, PencilIcon } from "@heroicons/react/outline"; import { LogoutIcon } from "@heroicons/react/outline";
import { LinkIcon, DotsHorizontalIcon } from "@heroicons/react/solid"; import {
ExternalLinkIcon,
TrashIcon,
LinkIcon,
DotsHorizontalIcon,
PencilIcon,
} from "@heroicons/react/solid";
import Link from "next/link"; import Link from "next/link";
import { useLocale } from "@calcom/lib/hooks/useLocale"; import { useLocale } from "@calcom/lib/hooks/useLocale";
@ -126,10 +132,9 @@ export default function TeamListItem(props: Props) {
<Link href={"/settings/teams/" + team.id}> <Link href={"/settings/teams/" + team.id}>
<a> <a>
<Button <Button
type="button"
size="lg"
color="minimal" color="minimal"
className="w-full rounded-none font-normal" size="sm"
className="w-full rounded-none font-medium"
StartIcon={PencilIcon}> StartIcon={PencilIcon}>
{t("edit_team")} {t("edit_team")}
</Button> </Button>
@ -141,12 +146,10 @@ export default function TeamListItem(props: Props) {
<Link href={`${process.env.NEXT_PUBLIC_APP_URL}/team/${team.slug}`} passHref={true}> <Link href={`${process.env.NEXT_PUBLIC_APP_URL}/team/${team.slug}`} passHref={true}>
<a target="_blank"> <a target="_blank">
<Button <Button
type="button"
size="lg"
color="minimal" color="minimal"
className="w-full rounded-none font-normal" size="sm"
className="w-full rounded-none font-medium"
StartIcon={ExternalLinkIcon}> StartIcon={ExternalLinkIcon}>
{" "}
{t("preview_team")} {t("preview_team")}
</Button> </Button>
</a> </a>
@ -162,9 +165,9 @@ export default function TeamListItem(props: Props) {
e.stopPropagation(); e.stopPropagation();
}} }}
color="warn" color="warn"
size="lg" size="sm"
StartIcon={TrashIcon} className="w-full rounded-none font-medium"
className="w-full rounded-none font-normal"> StartIcon={TrashIcon}>
{t("disband_team")} {t("disband_team")}
</Button> </Button>
</DialogTrigger> </DialogTrigger>

36
apps/web/pages/event-types/index.tsx
View file

@ -258,9 +258,9 @@ export const EventTypeList = ({ group, readOnly, types }: EventTypeListProps): J
<Link href={"/event-types/" + type.id} passHref={true}> <Link href={"/event-types/" + type.id} passHref={true}>
<Button <Button
type="button" type="button"
size="lg" size="sm"
color="minimal" color="minimal"
className="w-full rounded-none font-normal" className="w-full rounded-none"
StartIcon={PencilIcon}> StartIcon={PencilIcon}>
{" "} {" "}
{t("edit")} {t("edit")}
@ -271,8 +271,8 @@ export const EventTypeList = ({ group, readOnly, types }: EventTypeListProps): J
<Button <Button
type="button" type="button"
color="minimal" color="minimal"
size="lg" size="sm"
className="w-full rounded-none font-normal" className="w-full rounded-none"
data-testid={"event-type-duplicate-" + type.id} data-testid={"event-type-duplicate-" + type.id}
StartIcon={DuplicateIcon} StartIcon={DuplicateIcon}
onClick={() => openModal(group, type)}> onClick={() => openModal(group, type)}>
@ -288,9 +288,9 @@ export const EventTypeList = ({ group, readOnly, types }: EventTypeListProps): J
e.stopPropagation(); e.stopPropagation();
}} }}
color="warn" color="warn"
size="lg" size="sm"
StartIcon={TrashIcon} StartIcon={TrashIcon}
className="w-full rounded-none font-normal"> className="w-full rounded-none">
{t("delete")} {t("delete")}
</Button> </Button>
</DialogTrigger> </DialogTrigger>
@ -322,9 +322,9 @@ export const EventTypeList = ({ group, readOnly, types }: EventTypeListProps): J
<a target="_blank"> <a target="_blank">
<Button <Button
color="minimal" color="minimal"
size="lg" size="sm"
StartIcon={ExternalLinkIcon} StartIcon={ExternalLinkIcon}
className="w-full rounded-none font-normal"> className="w-full rounded-none">
{t("preview")} {t("preview")}
</Button> </Button>
</a> </a>
@ -334,8 +334,8 @@ export const EventTypeList = ({ group, readOnly, types }: EventTypeListProps): J
<Button <Button
type="button" type="button"
color="minimal" color="minimal"
size="lg" size="sm"
className="w-full rounded-none text-left font-normal" className="w-full rounded-none text-left"
data-testid={"event-type-duplicate-" + type.id} data-testid={"event-type-duplicate-" + type.id}
StartIcon={ClipboardCopyIcon} StartIcon={ClipboardCopyIcon}
onClick={() => { onClick={() => {
@ -352,8 +352,8 @@ export const EventTypeList = ({ group, readOnly, types }: EventTypeListProps): J
<Button <Button
type="button" type="button"
color="minimal" color="minimal"
size="lg" size="sm"
className="w-full rounded-none font-normal" className="w-full rounded-none"
data-testid={"event-type-duplicate-" + type.id} data-testid={"event-type-duplicate-" + type.id}
StartIcon={UploadIcon} StartIcon={UploadIcon}
onClick={() => { onClick={() => {
@ -374,9 +374,9 @@ export const EventTypeList = ({ group, readOnly, types }: EventTypeListProps): J
<Link href={"/event-types/" + type.id} passHref={true}> <Link href={"/event-types/" + type.id} passHref={true}>
<Button <Button
type="button" type="button"
size="lg" size="sm"
color="minimal" color="minimal"
className="w-full rounded-none font-normal" className="w-full rounded-none"
StartIcon={PencilIcon}> StartIcon={PencilIcon}>
{" "} {" "}
{t("edit")} {t("edit")}
@ -387,8 +387,8 @@ export const EventTypeList = ({ group, readOnly, types }: EventTypeListProps): J
<Button <Button
type="button" type="button"
color="minimal" color="minimal"
size="lg" size="sm"
className="w-full rounded-none font-normal" className="w-full rounded-none"
data-testid={"event-type-duplicate-" + type.id} data-testid={"event-type-duplicate-" + type.id}
StartIcon={DuplicateIcon} StartIcon={DuplicateIcon}
onClick={() => openModal(group, type)}> onClick={() => openModal(group, type)}>
@ -404,9 +404,9 @@ export const EventTypeList = ({ group, readOnly, types }: EventTypeListProps): J
e.stopPropagation(); e.stopPropagation();
}} }}
color="warn" color="warn"
size="lg" size="sm"
StartIcon={TrashIcon} StartIcon={TrashIcon}
className="w-full rounded-none font-normal"> className="w-full rounded-none">
{t("delete")} {t("delete")}
</Button> </Button>
</DialogTrigger> </DialogTrigger>

2
apps/website

@ -1 +1 @@
Subproject commit c6c9c210a4041fedaeaf22bf34b788f83e523ef3 Subproject commit e54a7cc0ecbb36a5a6838f77d8c19ec008c8849a