Skip to content

Commit

Permalink
rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
jojo-stripe committed May 13, 2024
1 parent f4f4c29 commit 4da511d
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions app/components/Nav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,10 @@ import {
import {Button} from '@/components/ui/button';
import FureverLogo from '@/public/furever_logo.png';
import Stripe from 'stripe';
<<<<<<< HEAD
import React from 'react';
=======
import {Switch} from '@/components/ui/switch';
import {Label} from '@/components/ui/label';
import {useEmbeddedComponentBorder} from '../hooks/EmbeddedComponentBorderProvider';
import * as React from 'react';
import Container from './Container';
>>>>>>> 49cc3dd (toggle)

const navigationMenuItems = [
{
Expand Down Expand Up @@ -136,14 +131,14 @@ const Nav = () => {
))}
</ul>
</nav>
<div className=" flex flex-row rounded-lg border bg-offset p-4">
<div className=" flex flex-row rounded-lg border bg-offset p-4 text-sm font-medium">
<Switch
className="mr-3 data-[state=checked]:bg-accent data-[state=unchecked]:bg-[#EBEEF1] align-center mt-2"
className="mr-3 data-[state=checked]:bg-accent data-[state=unchecked]:bg-[#EBEEF1]"
id="outline"
checked={border}
onCheckedChange={() => handleEnableBorderChange(!border)}
/>
<Label className="text-left leading-[17.84px] text-sm font-medium align-center" htmlFor="outline">
<Label className="text-left" htmlFor="outline">
View component outlines
</Label>
</div>
Expand Down

0 comments on commit 4da511d

Please sign in to comment.