Skip to content

Commit c595009

Browse files
committed
style tweaks
1 parent 5ea3ce9 commit c595009

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

src/components/Navigation.res

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ let make = (~fixed=true, ~isOverlayOpen: bool, ~setOverlayOpen: (bool => bool) =
110110
<>
111111
<header
112112
id="header"
113-
className={fixedNavClassName ++ " items-center z-50 w-full transition duration-300 ease-out group-[.nav-disappear]:-translate-y-16 md:group-[.nav-disappear]:-translate-y-0 min-w-[20rem]"}
113+
className={fixedNavClassName ++ " items-center z-50 w-full transition duration-300 ease-out group-[.nav-disappear]:-translate-y-16 md:group-[.nav-disappear]:translate-y-0 min-w-[20rem]"}
114114
>
115115
<nav
116116
className="px-4 flex xs:justify-center bg-gray-90 shadow h-16 text-white-80 text-14"
@@ -121,7 +121,7 @@ let make = (~fixed=true, ~isOverlayOpen: bool, ~setOverlayOpen: (bool => bool) =
121121
<Link.String
122122
prefetch={#intent}
123123
to="/"
124-
className="block hover:cursor-pointer w-full h-full flex justify-center items-center font-bold"
124+
className="hover:cursor-pointer w-full h-full flex justify-center items-center font-bold"
125125
>
126126
<img src="/brand/rescript-brandmark.svg" className="lg:hidden" />
127127
<img src="/brand/rescript-logo.svg" className="hidden lg:block" />
@@ -213,7 +213,7 @@ let make = (~fixed=true, ~isOverlayOpen: bool, ~setOverlayOpen: (bool => bool) =
213213
id="mobile-overlay"
214214
className={(
215215
isOverlayOpen ? "flex" : "hidden"
216-
) ++ " top-16 sm:hidden flex-col fixed top-0 left-0 h-full w-full z-50 sm:w-9/12 bg-gray-100 sm:h-auto sm:flex sm:relative sm:flex-row sm:justify-between"}
216+
) ++ " top-16 flex-col fixed left-0 h-full w-full z-50 sm:w-9/12 bg-gray-100 sm:h-auto sm:flex sm:relative sm:flex-row sm:justify-between"}
217217
>
218218
<MobileNav route />
219219
</div>
@@ -222,9 +222,11 @@ let make = (~fixed=true, ~isOverlayOpen: bool, ~setOverlayOpen: (bool => bool) =
222222
{isDocRoute(~route)
223223
? <nav
224224
id="doc-navbar"
225-
className="bg-white z-50 px-4 w-full h-12 shadow text-gray-60 text-12 md:text-14 transition duration-300 ease-out group-[.nav-disappear]:-translate-y-32 md:group-[.nav-disappear]:translate-y-0"
225+
className="bg-white z-50 px-4 w-full h-12 shadow text-gray-60 text-11 sm:text-12 md:text-14 transition duration-300 ease-out group-[.nav-disappear]:-translate-y-32 md:group-[.nav-disappear]:translate-y-0"
226226
>
227-
<div className="flex gap-6 lg:gap-10 items-center h-full w-full max-w-1280 m-auto">
227+
<div
228+
className="overflow-x-scroll flex gap-4 md:gap-6 lg:gap-10 items-center h-full w-full max-w-1280 m-auto"
229+
>
228230
<Link
229231
prefetch=#intent
230232
to=#"/docs/manual/introduction"

src/layouts/SidebarLayout.res

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ module Sidebar = {
7979
{Array.map(items, m => {
8080
let hidden = isHidden ? "hidden" : "block"
8181
let active = isItemActive(m)
82-
? ` bg-fire-5 text-red-500 leading-5 -ml-2 pl-2 font-medium block hover:bg-fire-70 `
82+
? ` bg-fire-5 text-red-500 leading-5 pl-2 font-medium block hover:bg-fire-70 `
8383
: ""
8484

8585
let activeToc = switch getActiveToc {
@@ -91,7 +91,7 @@ module Sidebar = {
9191
<Link.String
9292
to=m.href
9393
prefetch={#intent}
94-
className={"block py-1 md:h-auto tracking-tight text-gray-60 rounded-sm hover:bg-gray-20 hover:-ml-2 hover:py-1 hover:pl-2 " ++
94+
className={"block py-1 md:h-auto tracking-tight text-gray-60 rounded-sm hover:bg-gray-20" ++
9595
active}
9696
>
9797
{React.string(m.name)}
@@ -170,17 +170,14 @@ module Sidebar = {
170170

171171
<>
172172
<div
173-
style={{
174-
paddingTop: `${sidebarTopOffset->Int.toString}px`,
175-
}}
176173
id="sidebar"
177174
className={(
178-
isOpen ? "fixed w-full left-0 h-full z-20 min-w-320" : "hidden "
179-
) ++ " md:block md:w-48 lg:w-1/5 h-auto md:relative overflow-y-visible px-4 md:pl-0 pt-2 bg-white md:mt-0 min-w-48"}
175+
isOpen ? "fixed left-0 h-full z-20 " : "hidden"
176+
) ++ " min-w-3xs max-w-3xs lg:max-w-xs md:block h-auto md:relative overflow-y-visible px-4 md:pl-0 pt-2 bg-white md:mt-0"}
180177
>
181178
<aside
182179
id="sidebar-content"
183-
className="h-full relative top-0 w-full block md:top-28 md:sticky border-r border-gray-20 overflow-y-auto pb-24 max-h-[calc(100vh-7rem)] px-4 md:px-0"
180+
className="h-full relative top-0 block md:top-28 md:sticky border-r border-gray-20 overflow-y-auto pb-24 max-h-[calc(100vh-7rem)] px-4"
184181
>
185182
<button
186183
onClick={evt => {
@@ -372,14 +369,13 @@ let make = (
372369
theme}
373370
>
374371
sidebar
375-
// md:max-w-576 lg:max-w-740
376-
<main className="px-4 pt-4 md:pl-16 lg:mr-8 mb-32 max-w-svw">
372+
<main className="px-4 md:px-0 md:pt-4 lg:px-4 lg:pl-16 lg:mr-8 mb-32 max-w-svw">
377373
// width of the right content part
378374
<div
379375
id="mobile-navbar"
380376
className={`z-10 fixed border-b shadow ${isDocRoute(~route=pathname)
381377
? "top-28"
382-
: "top-16"} left-0 pl-4 bg-white w-full py-4 md:relative md:border-none md:shadow-none md:p-0 md:top-auto flex items-center transition duration-300 ease-out group-[.nav-disappear]:-translate-y-64 md:group-[.nav-disappear]:translate-y-0 z-25`}
378+
: "top-16"} left-0 pl-4 bg-white w-full py-4 lg:relative lg:border-none lg:shadow-none lg:p-0 lg:top-auto flex items-center transition duration-300 ease-out group-[.nav-disappear]:-translate-y-64 lg:group-[.nav-disappear]:translate-y-0 z-25`}
383379
>
384380
<MobileDrawerButton hidden=isNavOpen onClick={handleDrawerButtonClick} />
385381
<div

0 commit comments

Comments
 (0)