Skip to content

Commit

Permalink
Merge branch 'main' into feat/carousel-hoverpause
Browse files Browse the repository at this point in the history
  • Loading branch information
@Pewaukee
Pewaukee authored Aug 18, 2023
2 parents c128155 + d694bfc commit a4d8e41
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 54 deletions.
78 changes: 41 additions & 37 deletions app/docs.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -437,133 +437,137 @@ code.language-html .token.comment {

/* Search */

.DocSearch-Button {
@apply m-0 ml-0 flex h-[40px] w-[40px] items-center !justify-center rounded-lg border p-2 shadow-none hover:bg-gray-100 hover:shadow-none focus:shadow-none focus:outline-none focus:ring-4 focus:ring-gray-200 dark:border-gray-600 dark:!bg-gray-700 dark:hover:bg-gray-600 dark:focus:bg-gray-600 dark:focus:ring-gray-700 md:mr-0 md:w-52 md:justify-between md:border-solid md:border-gray-300 md:!bg-gray-50 xl:w-64 xl:pl-4;
.DocSearch .DocSearch-Modal {
@apply mx-auto mt-[1rem] max-h-[calc(100vh-2rem)] w-full max-w-[calc(100vw-2rem)] overflow-hidden rounded-lg lg:mt-[4rem] lg:max-h-none lg:max-w-xl;
}

.DocSearch-Button-Placeholder {
.DocSearch.DocSearch-Button {
@apply m-0 ml-0 flex h-[40px] w-[40px] items-center justify-center rounded-lg border bg-white p-2 shadow-none hover:bg-gray-100 hover:shadow-none focus:shadow-none focus:outline-none focus:ring-4 focus:ring-gray-200 dark:border-gray-600 dark:bg-gray-800 dark:hover:bg-gray-600 dark:focus:bg-gray-600 dark:focus:ring-gray-700 md:mr-0 md:w-52 md:justify-between md:border-solid md:border-gray-300 md:bg-gray-50 dark:md:bg-gray-700 xl:w-64 xl:pl-4;
}

.DocSearch .DocSearch-Button-Placeholder {
@apply text-sm font-normal text-gray-500 dark:text-gray-400;
}

.DocSearch-Search-Icon {
.DocSearch .DocSearch-Search-Icon {
@apply h-4 w-4 text-transparent md:mr-1 md:h-3 md:w-3 !important;
background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20"><path stroke="%236A7280" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m19 19-4-4m0-7A7 7 0 1 1 1 8a7 7 0 0 1 14 0Z"/></svg>');
}

.dark .DocSearch-Search-Icon {
.dark .DocSearch .DocSearch-Search-Icon {
background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20"><path stroke="%239BA3AF" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m19 19-4-4m0-7A7 7 0 1 1 1 8a7 7 0 0 1 14 0Z"/></svg>');
}

.DocSearch-Button-Keys {
.DocSearch .DocSearch-Button-Keys {
@apply min-w-0 items-center;
}

.DocSearch-Button-Key:first-child {
.DocSearch .DocSearch-Button-Key:first-child {
@apply mr-px text-base;
}

.DocSearch-Button-Key {
.DocSearch .DocSearch-Button-Key {
@apply m-0 w-auto bg-none pb-0 pt-1 text-xs font-normal text-gray-500 shadow-none dark:text-gray-400;
}

.DocSearch-Button .DocSearch-Search-Icon {
.DocSearch.DocSearch-Button .DocSearch-Search-Icon {
@apply text-gray-500;
}

.DocSearch-Hit-icon {
.DocSearch .DocSearch-Hit-icon {
@apply hidden;
}

.DocSearch-Hits mark {
.DocSearch .DocSearch-Hits mark {
@apply text-cyan-600 decoration-cyan-600 decoration-2 underline-offset-2 dark:text-white dark:decoration-white;
}

.DocSearch-Hit[aria-selected='true'] a {
.DocSearch .DocSearch-Hit[aria-selected='true'] a {
@apply bg-cyan-700 dark:bg-cyan-600;
}

.DocSearch-Hit-source {
.DocSearch .DocSearch-Hit-source {
@apply bg-white pb-1 text-gray-700 dark:bg-gray-700 dark:text-gray-400;
}

.DocSearch-Container {
.DocSearch .DocSearch-Container {
@apply bg-gray-900 bg-opacity-50 dark:bg-opacity-80;
}

.DocSearch-Modal {
.DocSearch .DocSearch-Modal {
@apply shadow-none dark:bg-gray-700;
}

.DocSearch-SearchBar {
.DocSearch .DocSearch-SearchBar {
@apply border-b border-gray-100 p-0 dark:border-gray-600;
}

.DocSearch-Form {
.DocSearch .DocSearch-Form {
@apply shadow-none dark:bg-gray-700;
}

.DocSearch-Input {
@apply text-sm text-gray-500 shadow-none focus:shadow-none focus:!outline-none focus:!ring-0 dark:bg-gray-700 dark:text-white;
.DocSearch .DocSearch-Input {
@apply text-sm text-gray-500 shadow-none focus:shadow-none focus:outline-none focus:ring-0 dark:bg-gray-700 dark:text-white;
}

.DocSearch-LoadingIndicator svg,
.DocSearch-MagnifierLabel svg {
.DocSearch .DocSearch-LoadingIndicator svg,
.DocSearch .DocSearch-MagnifierLabel svg {
@apply h-4 w-4;
}

.DocSearch-Commands {
.DocSearch .DocSearch-Commands {
@apply hidden;
}

.DocSearch-Footer {
.DocSearch .DocSearch-Footer {
@apply h-12 border-t border-gray-100 shadow-none dark:border-gray-600 dark:bg-gray-700;
}

.DocSearch-Dropdown {
.DocSearch .DocSearch-Dropdown {
@apply bg-white dark:bg-gray-700;
}

.DocSearch-Hit {
.DocSearch .DocSearch-Hit {
@apply pb-2 shadow-none;
}

.DocSearch-Hit a {
.DocSearch .DocSearch-Hit a {
@apply rounded-lg bg-gray-50 shadow-none dark:bg-gray-600 dark:hover:bg-cyan-600;
}

.DocSearch-Hit[aria-selected='true'] .DocSearch-Hit-Select-Icon,
.DocSearch-Hit-action-button {
.DocSearch .DocSearch-Hit[aria-selected='true'] .DocSearch-Hit-Select-Icon,
.DocSearch .DocSearch-Hit-action-button {
@apply hidden;
}

.DocSearch-Hit .DocSearch-Hit-action:last-child {
.DocSearch .DocSearch-Hit .DocSearch-Hit-action:last-child {
@apply h-5 w-5;
background-image: url("data:image/svg+xml,%3Csvg width='24' height='24' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='m11 9 3 3-3 3' stroke='%23475569' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E");
}

.DocSearch-Hit[aria-selected='true'] .DocSearch-Hit-action:last-child {
.DocSearch .DocSearch-Hit[aria-selected='true'] .DocSearch-Hit-action:last-child {
background-image: url("data:image/svg+xml,%3Csvg width='24' height='24' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='m11 9 3 3-3 3' stroke='%23fff' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E");
}

.DocSearch-Screen-Icon,
.DocSearch-NoResults-Prefill-List,
.DocSearch-Cancel {
.DocSearch .DocSearch-Screen-Icon,
.DocSearch .DocSearch-NoResults-Prefill-List,
.DocSearch .DocSearch-Cancel {
@apply hidden;
}

.DocSearch-Title {
.DocSearch .DocSearch-Title {
@apply mb-1 text-lg font-normal text-gray-700 dark:text-gray-200;
}

.DocSearch-Hit-Container {
.DocSearch .DocSearch-Hit-Container {
@apply dark:text-gray-300;
}

.DocSearch-Logo svg {
.DocSearch .DocSearch-Logo svg {
@apply dark:text-gray-400;
}

.DocSearch-Reset {
.DocSearch .DocSearch-Reset {
@apply hover:text-black dark:text-gray-300 dark:hover:text-white;
}

Expand Down
30 changes: 15 additions & 15 deletions app/docs/layout.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,23 +97,23 @@ const DocsNavbar: FC<DocsLayoutState> = ({ isCollapsed, setCollapsed }) => {
},
}}
>
<div className="flex items-center gap-3">
<div className="flex items-center">
{isCollapsed ? (
<span className="p-2 lg:hidden">
<HiMenuAlt1
aria-label="Open sidebar"
className="h-6 w-6 cursor-pointer text-gray-600 dark:text-gray-300"
onClick={() => setCollapsed(!isCollapsed)}
/>
</span>
<button
type="button"
className="-ml-3 mr-1 p-2 lg:ml-0 lg:mr-0 lg:hidden"
onClick={() => setCollapsed(!isCollapsed)}
>
<HiMenuAlt1 aria-label="Open sidebar" className="h-6 w-6 cursor-pointer text-gray-600 dark:text-gray-300" />
</button>
) : (
<span className="rounded p-2 dark:bg-gray-700 lg:hidden">
<HiX
aria-label="Close sidebar"
className="h-6 w-6 cursor-pointer text-gray-600 dark:text-gray-300"
onClick={() => setCollapsed(!isCollapsed)}
/>
</span>
<button
type="button"
className="-ml-3 mr-1 rounded p-2 dark:bg-gray-700 lg:ml-0 lg:mr-0 lg:hidden"
onClick={() => setCollapsed(!isCollapsed)}
>
<HiX aria-label="Close sidebar" className="h-6 w-6 cursor-pointer text-gray-600 dark:text-gray-300" />
</button>
)}
<Link href="/" className="sr-only">
Flowbite React
Expand Down
4 changes: 2 additions & 2 deletions app/page.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ const HomeNavbar: FC = () => {
return (
<Navbar
theme={{
base: 'sticky top-0 z-40 bg-white dark:bg-gray-800 text-gray-500 dark:text-gray-400 border-b border-gray-200 dark:border-gray-700 flex items-center justify-between w-full mx-auto py-4',
base: 'sticky top-0 z-40 bg-white dark:bg-gray-800 text-gray-500 dark:text-gray-400 border-b border-gray-200 dark:border-gray-700 flex items-center justify-between w-full mx-auto py-0',
inner: {
base: 'mx-auto flex flex-wrap justify-between items-center w-full xl:max-w-8xl px-4 xl:px-20 max-w-none',
base: 'mx-auto flex flex-wrap justify-between items-center w-full xl:max-w-8xl px-4 py-2.5 xl:px-20 max-w-none',
},
}}
>
Expand Down

0 comments on commit a4d8e41

Please sign in to comment.