Skip to content

Commit

Permalink
Bugfix/event types buggy view on tablet (#1238)
Browse files Browse the repository at this point in the history
  • Loading branch information
@alishaz-polymath
alishaz-polymath committed Dec 1, 2021
1 parent 80a2b6c commit ec2d0a8
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 4 deletions.
48 changes: 46 additions & 2 deletions components/Shell.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ export default function Shell(props: {
</div>

<div className="flex h-screen overflow-hidden bg-gray-100">
<div className="hidden md:flex md:flex-shrink-0">
<div className="flex flex-col w-56">
<div className="hidden lg:flex lg:flex-shrink-0">
<div className="flex flex-col w-14 lg:w-56">
<div className="flex flex-col flex-1 h-0 bg-white border-r border-gray-200">
<div className="flex flex-col flex-1 pt-5 pb-4 overflow-y-auto">
<Link href="/event-types">
Expand Down Expand Up @@ -236,6 +236,50 @@ export default function Shell(props: {
</div>
</div>
</div>
<div className="hidden md:flex md:flex-shrink-0 lg:hidden">
<div className="flex flex-col w-14 lg:w-56">
<div className="flex flex-col flex-1 h-0 bg-white border-r border-gray-200">
<div className="flex flex-col flex-1 pt-5 pb-4 overflow-y-auto">
<Link href="/event-types">
<a className="px-2">
{/* <Logo small /> */}
<h1 className="inline p-2">
<strong>
<img className="w-auto h-10" alt="Cal" title="Cal" src="/cal-com-icon.svg" />
</strong>
</h1>
</a>
</Link>
<nav className="flex-1 px-2 space-y-1 bg-white">
{navigation.map((item) => (
<Link key={item.name} href={item.href}>
<a
className={classNames(
item.current
? "bg-neutral-100 text-neutral-900"
: "text-neutral-500 hover:bg-gray-50 hover:text-neutral-900",
"group flex items-center px-2 py-2 text-sm font-medium rounded-sm"
)}>
<item.icon
className={classNames(
item.current
? "text-neutral-500"
: "text-neutral-400 group-hover:text-neutral-500",
"mr-3 flex-shrink-0 h-5 w-5"
)}
aria-hidden="true"
/>
</a>
</Link>
))}
</nav>
</div>
<div className="p-2 pt-2 pr-2 m-2 rounded-sm hover:bg-gray-100">
<UserDropdown small />
</div>
</div>
</div>
</div>

<div className="flex flex-col flex-1 w-0 overflow-hidden">
<main className="flex-1 relative z-0 overflow-y-auto focus:outline-none max-w-[1700px]">
Expand Down
4 changes: 2 additions & 2 deletions pages/event-types/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ const EventTypeList = ({ readOnly, types, profile }: EventTypeListProps): JSX.El
"hover:bg-neutral-50 flex justify-between items-center ",
type.$disabled && "pointer-events-none"
)}>
<div className="group flex items-center justify-between w-full px-4 py-4 sm:px-6 hover:bg-neutral-50">
<div className="flex items-center justify-between w-full px-4 py-4 group sm:px-6 hover:bg-neutral-50">
<button
className="absolute mb-8 left-1/2 -ml-4 sm:ml-0 sm:left-[19px] border hover:border-transparent text-gray-400 transition-all hover:text-black hover:shadow group-hover:scale-100 scale-0 w-7 h-7 p-1 invisible group-hover:visible bg-white rounded-full"
onClick={() => moveEventType(index, -1)}>
Expand Down Expand Up @@ -583,7 +583,7 @@ const CreateNewEventButton = ({ profiles, canAddEvents }: CreateEventTypeProps)
</RadioArea.Group>
</div>
)}
<div className="mt-8 sm:flex sm:flex-row-reverse gap-x-2">
<div className="flex flex-row-reverse mt-8 gap-x-2">
<Button type="submit" loading={createMutation.isLoading}>
{t("continue")}
</Button>
Expand Down
1 change: 1 addition & 0 deletions public/cal-com-icon.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

1 comment on commit ec2d0a8

@vercel
Copy link

@vercel vercel bot commented on ec2d0a8 Dec 1, 2021

Choose a reason for hiding this comment

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

Successfully deployed to the following URLs:

Please sign in to comment.