Skip to content

Commit fa86608

Browse files
authored
Merge branch 'main' into carlos/autodesk-show
2 parents ff96fe6 + 439556f commit fa86608

File tree

3 files changed

+21
-39
lines changed

3 files changed

+21
-39
lines changed

pcweb/components/docpage/navbar/navbar.py

Lines changed: 15 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,25 @@
11
"""UI and logic for the navbar component."""
22

33
import reflex as rx
4-
from reflex.experimental import ClientStateVar
54

6-
from pcweb.pages.customers.views.bento_cards import _card
5+
from pcweb.components.button import button
6+
from pcweb.components.docpage.navbar.navmenu.navmenu import nav_menu
7+
from pcweb.components.hosting_banner import hosting_banner
8+
from pcweb.constants import (
9+
REFLEX_CLOUD_URL,
10+
)
11+
from pcweb.pages.blog import blogs
12+
from pcweb.pages.blog.paths import blog_data
13+
from pcweb.pages.changelog import changelog
714
from pcweb.pages.docs import (
8-
wrapping_react,
9-
styling,
10-
custom_components as custom_c,
1115
getting_started,
1216
)
13-
from pcweb.components.button import button
14-
from pcweb.pages.docs.library import library
15-
from pcweb.pages.docs.custom_components import custom_components
16-
from pcweb.pages.gallery import gallery
17-
from .buttons.github import github
18-
from .buttons.discord import discord
17+
from pcweb.pages.faq import faq
1918
from .buttons.color import color
19+
from .buttons.discord import discord
20+
from .buttons.github import github
2021
from .buttons.sidebar import navbar_sidebar_button
2122
from .search import search_bar
22-
23-
from pcweb.pages.faq import faq
24-
from pcweb.pages.errors import errors
25-
from pcweb.pages.blog import blogs
26-
from pcweb.pages.changelog import changelog
27-
from pcweb.components.hosting_banner import hosting_banner
28-
from pcweb.pages.blog.paths import blog_data
29-
30-
from pcweb.components.docpage.navbar.navmenu.navmenu import nav_menu
31-
from pcweb.constants import (
32-
CONTRIBUTING_URL,
33-
FORUM_URL,
34-
ROADMAP_URL,
35-
REFLEX_CLOUD_URL,
36-
REFLEX_AI_BUILDER,
37-
)
3823
from ..sidebar import SidebarState
3924
from ...link_button import resources_button
4025

@@ -367,13 +352,14 @@ def new_menu_trigger(title: str, url: str = None, active_str: str = "") -> rx.Co
367352
rx.box(
368353
rx.text(
369354
title,
370-
class_name="p-[1.406rem_0px] font-small text-slate-9 hover:text-slate-11 transition-colors desktop-only",
355+
class_name="p-[1.406rem_0px] font-small text-slate-9 group-hover:text-slate-11 transition-colors desktop-only",
371356
),
372357
rx.icon(
373358
"chevron-down",
374-
class_name="chevron size-5 !text-slate-9 py-1 mr-0 transition-transform duration-200 ease-in-out desktop-only",
359+
class_name="chevron size-5 !text-slate-9 group-hover:!text-slate-11 py-1 mr-0 transition-colors desktop-only",
375360
),
376361
class_name="flex flex-row items-center gap-x-1 group user-select-none",
362+
on_click=rx.stop_propagation,
377363
),
378364
style={
379365
"&[data-state='open'] .chevron": {
@@ -399,8 +385,6 @@ def logo() -> rx.Component:
399385

400386

401387
def doc_section():
402-
from pcweb.pages.docs.ai_builder import pages as ai_pages
403-
from pcweb.pages.docs.cloud import pages as cloud_pages
404388
from pcweb.pages.docs import hosting as hosting_page
405389

406390
return nav_menu.content(
@@ -418,8 +402,6 @@ def doc_section():
418402

419403

420404
def new_component_section() -> rx.Component:
421-
from pcweb.pages.docs.ai_builder import pages as ai_pages
422-
from pcweb.pages.docs.cloud import pages as cloud_pages
423405
from pcweb.pages.docs import hosting as hosting_page
424406

425407
return nav_menu.root(

pcweb/components/hosting_banner.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,14 @@ def hosting_banner() -> rx.Component:
3535
class_name="hidden md:inline-block text-slate-12 font-medium text-sm",
3636
),
3737
# ... keep this for mobile view if/when needed
38-
# rx.el.span(
39-
# "Build internal apps with AI.",
40-
# # class_name="text-slate-12 font-medium text-sm",
41-
# class_name="inline-block md:hidden text-slate-12 font-medium text-sm",
42-
# ),
38+
rx.el.span(
39+
"Try for Free!",
40+
# class_name="text-slate-12 font-medium text-sm",
41+
class_name="inline-block md:hidden text-slate-12 font-medium text-sm",
42+
),
4343
class_name="text-slate-12 font-semibold text-sm z-[1]",
4444
),
45+
# ... keep this for mobile view if/when needed
4546
rx.el.button(
4647
"Try for Free!",
4748
class_name="hidden md:inline-block text-green-11 h-[1.5rem] rounded-md bg-green-4 px-1.5 text-sm font-semibold z-[1] items-center justify-center shrink-0",

pcweb/templates/docpage/blocks/headings.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ def h4_comp(text: str) -> rx.Component:
105105
return h_comp_common(
106106
text=text,
107107
heading="h4",
108-
scroll_margin="6em",
109108
mt="2",
110109
class_name="font-md-smbold",
111110
)

0 commit comments

Comments
 (0)