Skip to content

Commit

Permalink
session with ciaran (#7366)
Browse files Browse the repository at this point in the history
  • Loading branch information
PeerRich authored Feb 24, 2023
1 parent fc9360d commit 76a8c89
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 14 deletions.
4 changes: 2 additions & 2 deletions packages/app-store/_components/AppCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ export default function AppCard({

return (
<div className={`mb-4 mt-2 rounded-md border border-gray-200 ${!app.enabled && "grayscale"}`}>
<div className="p-4 text-sm sm:p-8">
<div className="p-4 text-sm sm:p-6">
<div className="flex w-full flex-col gap-2 sm:flex-row sm:gap-0">
{/* Don't know why but w-[42px] isn't working, started happening when I started using next/dynamic */}
<Link href={"/apps/" + app.slug} className="mr-3 h-auto w-10 rounded-sm">
<img className="w-full" src={app?.logo} alt={app?.name} />
</Link>
<div className="flex flex-col">
<span className="text-base font-semibold leading-4 text-black">{app?.name}</span>
<p className="pt-2 text-sm font-normal leading-4 text-gray-600">
<p className="mb-2 pt-2 text-sm font-normal text-gray-600 ltr:pr-2 rtl:pl-2">
{description || app?.description}
</p>
</div>
Expand Down
8 changes: 8 additions & 0 deletions packages/app-store/ee/routing-forms/DESCRIPTION.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
items:
- /api/app-store/ee/routing-forms/1.jpg
- /api/app-store/ee/routing-forms/2.jpg
- /api/app-store/ee/routing-forms/3.jpg
---

It would allow a booker to connect with the right person or choose the right event, faster. It would work by taking inputs from the booker and using that data to route to the correct booker/event as configured by Cal user
Binary file added packages/app-store/ee/routing-forms/static/1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/app-store/ee/routing-forms/static/2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/app-store/ee/routing-forms/static/3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 8 additions & 8 deletions packages/features/schedules/components/ScheduleListItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Fragment } from "react";

import { availabilityAsString } from "@calcom/lib/availability";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { RouterOutputs } from "@calcom/trpc/react";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
import {
Badge,
Expand Down Expand Up @@ -50,13 +50,7 @@ export function ScheduleListItem({
</Badge>
)}
</div>
<p className="mt-1 text-xs text-gray-500">
{(schedule.timeZone || displayOptions?.timeZone) && (
<p className="my-1 flex items-center first-letter:text-xs">
<FiGlobe />
&nbsp;{schedule.timeZone ?? displayOptions?.timeZone}
</p>
)}
<p className="mt-1 text-gray-500">
{schedule.availability
.filter((availability) => !!availability.days.length)
.map((availability) => (
Expand All @@ -68,6 +62,12 @@ export function ScheduleListItem({
<br />
</Fragment>
))}
{(schedule.timeZone || displayOptions?.timeZone) && (
<p className="my-1 flex items-center first-letter:text-xs">
<FiGlobe />
&nbsp;{schedule.timeZone ?? displayOptions?.timeZone}
</p>
)}
</p>
</Link>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/features/shell/Shell.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,7 @@ export function ShellMain(props: LayoutProps) {
<>
<div
className={classNames(
"my-4 flex items-center md:mt-0 md:mb-6",
"flex items-center md:mt-0 md:mb-6",
props.smallHeading ? "lg:mb-7" : "lg:mb-8"
)}>
{!!props.backPath && (
Expand Down
6 changes: 3 additions & 3 deletions packages/ui/components/button/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -206,14 +206,14 @@ export const Button = forwardRef<HTMLAnchorElement | HTMLButtonElement, ButtonPr
<>
{variant === "fab" ? (
<>
<StartIcon className="hidden h-4 w-4 stroke-[1.5px] ltr:mr-2 rtl:ml-2 md:inline-flex" />
<StartIcon className="hidden h-4 w-4 stroke-[1.5px] ltr:mr-2 ltr:-ml-1 rtl:-mr-1 rtl:ml-2 md:inline-flex" />
<FiPlus className="inline h-6 w-6 md:hidden" />
</>
) : (
<StartIcon
className={classNames(
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-1 ltr:mr-2 rtl:-mr-1 rtl:ml-2"
)}
/>
)}
Expand Down Expand Up @@ -251,7 +251,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:ml-2 rtl:mr-2"
variant === "button" && "h-4 w-4 stroke-[1.5px] ltr:ml-2 ltr:-mr-1 rtl:mr-2 rtl:-ml-1"
)}
/>
)}
Expand Down

1 comment on commit 76a8c89

@vercel
Copy link

@vercel vercel bot commented on 76a8c89 Feb 24, 2023

Choose a reason for hiding this comment

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

Please sign in to comment.