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

small frontend improvements (peer programming with ciaran) #6871

Merged
merged 1 commit into from Feb 3, 2023
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion apps/web/components/AppListCard.tsx
Expand Up @@ -65,7 +65,6 @@ export default function AppListCard(props: AppListCardProps) {
<div className={`p-4 ${highlight ? "bg-yellow-100" : ""}`}>
<div className="flex gap-x-3">
{logo ? <img className="h-10 w-10" src={logo} alt={`${title} logo`} /> : null}

<div className="flex grow flex-col gap-y-1 truncate">
<div className="flex items-center gap-x-2">
<h3 className="truncate text-sm font-semibold text-gray-900">{title}</h3>
Expand Down
3 changes: 1 addition & 2 deletions apps/web/components/eventtype/AvailabilityTab.tsx
Expand Up @@ -128,7 +128,7 @@ export const AvailabilityTab = ({ isTeamEvent }: { isTeamEvent: boolean }) => {
)}
/>
</div>
<div className="space-y-4 rounded border p-4 py-6 pt-2 md:p-8">
<div className="space-y-4 rounded border px-6 pb-4">
<ol className="table border-collapse text-sm">
{weekdayNames(i18n.language, 1, "long").map((day, index) => {
const isAvailable = !!filterDays(index).length;
Expand Down Expand Up @@ -173,7 +173,6 @@ export const AvailabilityTab = ({ isTeamEvent }: { isTeamEvent: boolean }) => {
color="minimal"
EndIcon={FiExternalLink}
target="_blank"
className="justify-center border sm:border-0"
rel="noopener noreferrer">
{t("edit_availability")}
</Button>
Expand Down
2 changes: 1 addition & 1 deletion apps/web/package.json
@@ -1,6 +1,6 @@
{
"name": "@calcom/web",
"version": "2.5.8",
"version": "2.5.9",
"private": true,
"scripts": {
"analyze": "ANALYZE=true next build",
Expand Down
2 changes: 1 addition & 1 deletion packages/features/bookings/layout/BookingLayout.tsx
Expand Up @@ -36,7 +36,7 @@ export default function BookingLayout({
return (
<Shell {...rest}>
<div className="flex max-w-6xl flex-col">
<div className="flex flex-col gap-2 lg:flex-row">
<div className="flex flex-col lg:flex-row">
<HorizontalTabs tabs={tabs} />
<div className="overflow-x-auto lg:ml-auto">
<FiltersContainer />
Expand Down
6 changes: 3 additions & 3 deletions packages/features/settings/layouts/SettingsLayout.tsx
Expand Up @@ -190,7 +190,7 @@ const SettingsSidebarContainer = ({
return tab.name !== "teams" ? (
<React.Fragment key={tab.href}>
<div className={`${!tab.children?.length ? "!mb-3" : ""}`}>
<div className="group flex h-9 w-64 flex-row items-center rounded-md px-3 text-sm font-medium leading-none text-gray-600 [&[aria-current='page']]:bg-gray-200 [&[aria-current='page']]:text-gray-900">
<div className="group flex h-9 w-64 flex-row items-center rounded-md px-2 text-sm font-medium leading-none text-gray-600 [&[aria-current='page']]:bg-gray-200 [&[aria-current='page']]:text-gray-900">
{tab && tab.icon && (
<tab.icon className="h-[16px] w-[16px] stroke-[2px] ltr:mr-3 rtl:ml-3 md:mt-0" />
)}
Expand Down Expand Up @@ -222,7 +222,7 @@ const SettingsSidebarContainer = ({
<React.Fragment key={tab.href}>
<div className={`${!tab.children?.length ? "mb-3" : ""}`}>
<Link href={tab.href}>
<div className="group flex h-9 w-64 flex-row items-center rounded-md px-3 py-[10px] text-sm font-medium leading-none text-gray-600 hover:bg-gray-100 group-hover:text-gray-700 [&[aria-current='page']]:bg-gray-200 [&[aria-current='page']]:text-gray-900">
<div className="group flex h-9 w-64 flex-row items-center rounded-md px-2 py-[10px] text-sm font-medium leading-none text-gray-600 hover:bg-gray-100 group-hover:text-gray-700 [&[aria-current='page']]:bg-gray-200 [&[aria-current='page']]:text-gray-900">
{tab && tab.icon && (
<tab.icon className="h-[16px] w-[16px] stroke-[2px] ltr:mr-3 rtl:ml-3 md:mt-0" />
)}
Expand Down Expand Up @@ -327,7 +327,7 @@ const SettingsSidebarContainer = ({
<VerticalTabItem
name={t("add_a_team")}
href={`${WEBAPP_URL}/settings/teams/new`}
textClassNames="px-3 text-gray-900 font-medium text-sm"
textClassNames="px-3 items-center mt-2 text-gray-900 font-medium text-sm"
icon={FiPlus}
disableChevron
/>
Expand Down
19 changes: 7 additions & 12 deletions packages/features/shell/Shell.tsx
Expand Up @@ -268,7 +268,7 @@ function UserDropdown({ small }: { small?: boolean }) {
<Dropdown open={menuOpen}>
<div className="ltr:sm:-ml-5 rtl:sm:-mr-5">
<DropdownMenuTrigger asChild onClick={() => setMenuOpen((menuOpen) => !menuOpen)}>
<button className="group mx-0 flex w-full cursor-pointer appearance-none items-center rounded-full p-2 text-left outline-none hover:bg-gray-200 focus:outline-none focus:ring-0 sm:mx-2.5 sm:pl-3 md:rounded-none lg:rounded lg:pl-2">
<button className="radix-state-open:bg-gray-200 group mx-0 flex w-full cursor-pointer appearance-none items-center rounded-full p-2 text-left outline-none hover:bg-gray-200 focus:outline-none focus:ring-0 sm:mx-2.5 sm:pl-3 md:rounded-none lg:rounded lg:pl-2">
<span
className={classNames(
small ? "h-6 w-6 md:ml-3" : "h-8 w-8 ltr:mr-2 rtl:ml-2",
Expand All @@ -292,10 +292,10 @@ function UserDropdown({ small }: { small?: boolean }) {
{!small && (
<span className="flex flex-grow items-center truncate">
<span className="flex-grow truncate text-sm">
<span className="block truncate font-medium text-gray-900">
<span className="mb-1 block truncate font-medium leading-none text-gray-900">
{user.name || "Nameless User"}
</span>
<span className="block truncate font-normal text-gray-900">
<span className="block truncate font-normal leading-none text-gray-600">
{user.username
? process.env.NEXT_PUBLIC_WEBSITE_URL === "https://cal.com"
? `cal.com/${user.username}`
Expand Down Expand Up @@ -396,13 +396,8 @@ function UserDropdown({ small }: { small?: boolean }) {
{t("help")}
</DropdownItem>
</DropdownMenuItem>
<DropdownMenuItem>
<DropdownItem
StartIcon={FiDownload}
target="_blank"
rel="noreferrer"
className="desktop-hidden hidden lg:flex"
href={DESKTOP_APP_LINK}>
<DropdownMenuItem className="desktop-hidden hidden lg:flex">
<DropdownItem StartIcon={FiDownload} target="_blank" rel="noreferrer" href={DESKTOP_APP_LINK}>
{t("download_desktop_app")}
</DropdownItem>
</DropdownMenuItem>
Expand Down Expand Up @@ -783,7 +778,7 @@ export function ShellMain(props: LayoutProps) {

return (
<>
<div className={classNames("mb-6 flex sm:mt-0", props.smallHeading ? "lg:mb-7" : "lg:mb-8")}>
<div className={classNames("flex sm:mt-0 md:mb-6", props.smallHeading ? "lg:mb-7" : "lg:mb-8")}>
{!!props.backPath && (
<Button
variant="icon"
Expand All @@ -804,7 +799,7 @@ export function ShellMain(props: LayoutProps) {
{props.heading && (
<h1
className={classNames(
"font-cal max-w-28 sm:max-w-72 md:max-w-80 mt-1 hidden truncate text-xl font-semibold tracking-wide text-black md:block xl:max-w-full",
"font-cal max-w-28 sm:max-w-72 md:max-w-80 hidden truncate text-xl font-semibold tracking-wide text-black md:block xl:max-w-full",
props.smallHeading ? "text-base" : "text-xl"
)}>
{!isLocaleReady ? <SkeletonText invisible /> : props.heading}
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/components/button/Button.tsx
Expand Up @@ -246,7 +246,7 @@ export const Button = forwardRef<HTMLAnchorElement | HTMLButtonElement, ButtonPr
className={classNames(
"inline-flex",
variant === "icon" && "h-4 w-4",
variant === "button" && "h-4 w-4 stroke-[1.5px] ltr:mr-2 rtl:ml-2"
variant === "button" && "h-4 w-4 stroke-[1.5px] ltr:ml-2 rtl:mr-2"
)}
/>
)}
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/components/card/Card.tsx
Expand Up @@ -35,7 +35,7 @@ const cardTypeByVariant = {
basic: {
image: "w-10 h-auto",
card: "p-5",
title: "text-base",
title: "text-base mt-4",
description: "text-sm leading-[18px] text-gray-500 font-normal",
},
ProfileCard: {
Expand Down Expand Up @@ -88,7 +88,7 @@ export function Card({
title={title}
className={classNames(
cardTypeByVariant[variant].title,
"line-clamp-1 mt-4 font-bold leading-5 text-gray-900"
"line-clamp-1 font-bold leading-5 text-gray-900"
)}>
{title}
</h5>
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/components/form/dropdown/Dropdown.tsx
Expand Up @@ -38,7 +38,7 @@ export const DropdownMenuContent = forwardRef<HTMLDivElement, DropdownMenuConten
{...props}
sideOffset={sideOffset}
className={classNames(
"shadow-dropdown w-50 relative z-10 origin-top-right rounded-md border border-gray-200 bg-white text-sm",
"shadow-dropdown w-50 relative z-10 ml-1.5 origin-top-right rounded-md border border-gray-200 bg-white text-sm",
"[&>*:first-child]:mt-1 [&>*:last-child]:mb-1"
)}
ref={forwardedRef}>
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/components/navigation/tabs/HorizontalTabs.tsx
Expand Up @@ -8,7 +8,7 @@ export interface NavTabProps {

const HorizontalTabs = function ({ tabs, linkProps, actions, ...props }: NavTabProps) {
return (
<div className="mb-2 h-9 max-w-[calc(100%+40px)] lg:mb-5">
<div className="mb-4 h-9 max-w-[calc(100%+40px)] lg:mb-5">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Expected this to cause issues but it didnt :D

<nav
className="no-scrollbar flex max-h-9 space-x-1 overflow-scroll rounded-md"
aria-label="Tabs"
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/components/navigation/tabs/VerticalTabItem.tsx
Expand Up @@ -50,7 +50,7 @@ const VerticalTabItem = function ({
target={props.isExternalLink ? "_blank" : "_self"}
className={classNames(
props.textClassNames || "text-sm font-medium leading-none text-gray-600",
"min-h-9 group flex w-64 flex-row items-center rounded-md px-2 py-[10px] hover:bg-gray-100 group-hover:text-gray-700 [&[aria-current='page']]:bg-gray-200 [&[aria-current='page']]:text-gray-900",
"min-h-8 group flex w-64 flex-row items-center rounded-md px-2 py-[10px] hover:bg-gray-100 group-hover:text-gray-700 [&[aria-current='page']]:bg-gray-200 [&[aria-current='page']]:text-gray-900",
props.disabled && "pointer-events-none !opacity-30",
(isChild || !props.icon) && "ml-7 w-auto ltr:mr-5 rtl:ml-5",
!info ? "h-6" : "h-14",
Expand All @@ -63,7 +63,7 @@ const VerticalTabItem = function ({
)}
<div className="h-fit">
<span className="flex items-center space-x-2 rtl:space-x-reverse">
<Skeleton title={t(name)} as="p" className="max-w-36 min-h-4 truncate">
<Skeleton title={t(name)} as="p" className="max-w-36 min-h-4 mt-px truncate">
{t(name)}
</Skeleton>
{props.isExternalLink ? <FiExternalLink /> : null}
Expand Down