diff --git a/assets/tailwind-theme.css b/assets/tailwind-theme.css index ffd79ebb7..2b31897ab 100644 --- a/assets/tailwind-theme.css +++ b/assets/tailwind-theme.css @@ -1691,11 +1691,11 @@ font-weight: 400; line-height: normal; letter-spacing: -0.00406rem; - color: var(--c-violet-9); - background-color: var(--c-violet-3); + color: var(--c-slate-11); + background-color: var(--c-slate-3); border-radius: 0.25rem; border-width: 1px; - border-color: var(--c-violet-4); + border-color: var(--c-slate-4); /* padding: 0rem 0.125rem 0rem 0.125rem; */ } diff --git a/pcweb/templates/docpage/blocks/typography.py b/pcweb/templates/docpage/blocks/typography.py index 652f0c7a3..ab4c3ded8 100644 --- a/pcweb/templates/docpage/blocks/typography.py +++ b/pcweb/templates/docpage/blocks/typography.py @@ -82,7 +82,11 @@ def doclink(text: str, href: str, **props) -> rx.Component: The styled link. """ return rx.link( - text, underline="always", href=href, **props, class_name="text-violet-10" + text, + underline="always", + href=href, + **props, + class_name="!text-m-slate-12 dark:!text-m-slate-3 !decoration-m-slate-12 dark:!decoration-m-slate-3", ) @@ -97,4 +101,10 @@ def doclink2(text: str, **props) -> rx.Component: Returns: The styled link. """ - return rx.link(text, underline="always", **props, style=fonts.base) + return rx.link( + text, + underline="always", + **props, + style=fonts.base, + class_name="!text-m-slate-12 dark:!text-m-slate-3 !decoration-m-slate-12 dark:!decoration-m-slate-3", + ) diff --git a/pcweb/templates/docpage/docpage.py b/pcweb/templates/docpage/docpage.py index 1ead85215..4ea36f373 100644 --- a/pcweb/templates/docpage/docpage.py +++ b/pcweb/templates/docpage/docpage.py @@ -269,7 +269,7 @@ def feedback_button_toc() -> rx.Component: size="sm", type="button", on_click=FeedbackState.set_score(1), - class_name="justify-start text-m-slate-7 dark:text-m-slate-6", + class_name="justify-start pl-0 text-m-slate-7 dark:text-m-slate-6", ), content=feedback_content(), ) @@ -290,7 +290,7 @@ def copy_to_markdown(text: str) -> rx.Component: type="button", size="sm", variant="ghost", - class_name="justify-start text-m-slate-7 dark:text-m-slate-6", + class_name="justify-start pl-0 text-m-slate-7 dark:text-m-slate-6", on_click=[ rx.call_function(copied.set_value(True)), rx.set_clipboard(text), @@ -308,7 +308,7 @@ def ask_ai_chat() -> rx.Component: "Ask AI about this page", size="sm", variant="ghost", - class_name="justify-start text-m-slate-7 dark:text-m-slate-6", + class_name="justify-start pl-0 text-m-slate-7 dark:text-m-slate-6", native_button=False, ), to=ai_builder_pages.integrations.mcp_overview.path, @@ -334,7 +334,7 @@ def docpage_footer(path: str): from pcweb.pages.faq import faq from pcweb.pages.framework.views.footer_index import dark_mode_toggle from pcweb.pages.gallery import gallery - from pcweb.views.footer import menu_socials, newsletter_form, ph_1 + from pcweb.views.footer import menu_socials return rx.el.footer( rx.box( @@ -359,7 +359,6 @@ def docpage_footer(path: str): ), class_name="flex flex-row justify-center lg:justify-between items-center border-slate-4 border-y-0 lg:border-y pt-0 lg:pt-8 pb-6 lg:pb-8 w-full", ), - rx.box(newsletter_form(), class_name="pt-8 pb-10"), rx.box( rx.box( footer_link_flex( @@ -395,21 +394,17 @@ def docpage_footer(path: str): class_name="flex flex-wrap justify-between gap-12 w-full", ), rx.box( - rx.box( - ph_1(), - rx.text( - f"Copyright © {datetime.now().year} Pynecone, Inc.", - class_name="font-small text-slate-9", - ), - dark_mode_toggle(), - class_name="flex flex-col gap-6", - ), + rx.box(dark_mode_toggle(), class_name="[&>div]:!ml-0"), menu_socials(), class_name="flex flex-row gap-6 justify-between items-end w-full", ), + rx.text( + f"Copyright © {datetime.now().year} Pynecone, Inc.", + class_name="font-small text-slate-9", + ), class_name="flex flex-col justify-between gap-10 py-6 lg:py-8 w-full", ), - class_name="flex flex-col max-w-full lg:max-w-auto", + class_name="flex flex-col w-full max-w-full lg:max-w-auto", ) @@ -723,8 +718,13 @@ def wrapper(*args, **kwargs) -> rx.Component: rx.el.nav( rx.box( rx.el.p( + rx.icon( + "align-left", + size=14, + class_name="dark:text-m-slate-3 text-m-slate-12", + ), "On This Page", - class_name="text-sm h-8 flex items-center justify-start font-[525] dark:text-m-slate-3 text-m-slate-12", + class_name="text-sm h-8 flex items-center gap-1.5 justify-start font-[525] dark:text-m-slate-3 text-m-slate-12", ), rx.el.ul( *[ diff --git a/pcweb/views/docs_navbar.py b/pcweb/views/docs_navbar.py index 9c82d5de4..7b14c18e4 100644 --- a/pcweb/views/docs_navbar.py +++ b/pcweb/views/docs_navbar.py @@ -6,7 +6,7 @@ from pcweb.components.docpage.navbar.search import search_bar from pcweb.components.marketing_button import button from pcweb.constants import REFLEX_ASSETS_CDN -from pcweb.pages.docs import ai_builder, enterprise, getting_started, hosting +from pcweb.pages.docs import ai_builder, getting_started, hosting def logo() -> rx.Component: @@ -53,10 +53,9 @@ def menu_item(text: str, href: str, active_str: str = "") -> rx.Component: # Framework is active when in /docs but not in other specific sections is_docs = router_path.contains("/docs") is_ai_builder = router_path.contains("ai-builder") - is_enterprise = router_path.contains("enterprise") is_hosting = router_path.contains("hosting") is_start = router_path == "/docs" - active = is_docs & ~is_ai_builder & ~is_enterprise & ~is_hosting & ~is_start + active = is_docs & ~is_ai_builder & ~is_hosting & ~is_start else: active = router_path.contains(active_str) @@ -81,12 +80,11 @@ def menu_item(text: str, href: str, active_str: str = "") -> rx.Component: def navigation_menu() -> rx.Component: return ui.navigation_menu.root( ui.navigation_menu.list( - menu_item("Start", "/docs", "/docs"), + menu_item("Overview", "/docs", "/docs"), menu_item( - "AI Builder", ai_builder.overview.best_practices.path, "ai-builder" + "Build with AI", ai_builder.overview.best_practices.path, "ai-builder" ), menu_item("Framework", getting_started.introduction.path, "framework"), - menu_item("Enterprise Package", enterprise.overview.path, "enterprise"), menu_item("Cloud", hosting.deploy_quick_start.path, "hosting"), class_name="flex flex-row items-center gap-2 m-0 h-full list-none", custom_attrs={"role": "menubar"}, diff --git a/pcweb/views/secondary_navbar.py b/pcweb/views/secondary_navbar.py index 185f68888..1984904e3 100644 --- a/pcweb/views/secondary_navbar.py +++ b/pcweb/views/secondary_navbar.py @@ -29,10 +29,9 @@ def menu_item(text: str, href: str, active_str: str = "") -> rx.Component: # Framework is active when in /docs but not in other specific sections is_docs = router_path.contains("/docs") is_ai_builder = router_path.contains("ai-builder") - is_enterprise = router_path.contains("enterprise") is_hosting = router_path.contains("hosting") is_start = router_path == "/docs" - active = is_docs & ~is_ai_builder & ~is_enterprise & ~is_hosting & ~is_start + active = is_docs & ~is_ai_builder & ~is_hosting & ~is_start else: active = router_path.contains(active_str)