Skip to content

Commit be89950

Browse files
author
Shannon Anahata
committed
resolving merge conflict + udpates to banner and products section
2 parents 637da96 + cc99db0 commit be89950

File tree

3 files changed

+114
-39
lines changed

3 files changed

+114
-39
lines changed

‎src/components/home.tsx‎

Lines changed: 99 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,25 @@ export default async function Home() {
6666
marginBottom: 0,
6767
}}
6868
>
69-
<h1 className="text-4xl font-bold mb-2 text-center" style={{color: '#fff', textShadow: '0 4px 16px #000, 0 0 8px #000, 0 0 2px #000'}}>
69+
<h1
70+
className="text-4xl font-bold mb-2 text-center"
71+
style={{
72+
color: '#fff',
73+
textShadow: '0 4px 16px #000, 0 0 8px #000, 0 0 2px #000',
74+
}}
75+
>
7076
Welcome to Sentry Docs
7177
</h1>
72-
<p className="text-lg font-bold text-center max-w-2xl" style={{
73-
color: '#fff',
74-
textShadow: '0 2px 8px rgba(0,0,0,0.7), 0 0 2px #000',
75-
letterSpacing: '0.03em'
76-
}}>
77-
Sentry provides end-to-end distributed tracing, enabling developers to
78-
identify and debug performance issues and errors across their systems and
79-
services.
78+
<p
79+
className="text-lg font-bold text-center max-w-2xl"
80+
style={{
81+
color: '#fff',
82+
textShadow: '0 2px 8px rgba(0,0,0,0.7), 0 0 2px #000',
83+
letterSpacing: '0.03em',
84+
}}
85+
>
86+
Sentry provides end-to-end distributed tracing, enabling developers to identify
87+
and debug performance issues and errors across their systems and services.
8088
</p>
8189
</div>
8290
{/* Search + SDKs row, same width as Sentry Products */}
@@ -92,10 +100,10 @@ export default async function Home() {
92100
</div>
93101
</div>
94102
{/* Decorative yellow-shape-08 line between search and SDKs */}
95-
<img
96-
src={YellowShape08.src}
97-
alt="decorative line"
98-
className="hidden md:block pointer-events-none"
103+
<img
104+
src={YellowShape08.src}
105+
alt="decorative line"
106+
className="hidden md:block pointer-events-none"
99107
style={{
100108
position: 'absolute',
101109
left: 'calc(20% + 90px)',
@@ -158,20 +166,24 @@ export default async function Home() {
158166
format="lg"
159167
style={{margin: 0, display: 'block'}}
160168
/>
161-
<span style={{
162-
marginTop: 6,
163-
fontSize: '0.85rem',
164-
color: '#6b7280',
165-
textAlign: 'center',
166-
width: '100%',
167-
fontWeight: 500,
168-
letterSpacing: 0.1,
169-
lineHeight: 1.1,
170-
display: 'block',
171-
whiteSpace: 'nowrap',
172-
overflow: 'hidden',
173-
textOverflow: 'ellipsis',
174-
}}>{platform.title}</span>
169+
<span
170+
style={{
171+
marginTop: 6,
172+
fontSize: '0.85rem',
173+
color: '#6b7280',
174+
textAlign: 'center',
175+
width: '100%',
176+
fontWeight: 500,
177+
letterSpacing: 0.1,
178+
lineHeight: 1.1,
179+
display: 'block',
180+
whiteSpace: 'nowrap',
181+
overflow: 'hidden',
182+
textOverflow: 'ellipsis',
183+
}}
184+
>
185+
{platform.title}
186+
</span>
175187
</a>
176188
</Tooltip>
177189
))}
@@ -194,24 +206,76 @@ export default async function Home() {
194206
<div>
195207
<div className="flex items-center mb-4 gap-2 min-h-[32px]">
196208
<PlatformIcon platform="sentry" size={24} format="lg" />
197-
<a href="/product/sentry/" className="text-xl font-medium text-accent-purple hover:underline align-middle"><h2 className="inline font-medium align-middle">Sentry Error Monitoring</h2></a>
209+
<a
210+
href="/product/sentry/"
211+
className="text-xl font-medium text-accent-purple hover:underline align-middle"
212+
>
213+
<h2 className="inline font-medium align-middle">
214+
Sentry Error Monitoring
215+
</h2>
216+
</a>
198217
</div>
199218
<p className="text-base text-left text-[var(--gray-500)] pl-2 pr-4">
200-
Monitor, identify, and resolve errors and performance issues across your applications using
201-
<a href="/product/sentry/issues/" className="text-accent-purple hover:underline"> error monitoring</a>,
202-
<a href="/product/sentry/explore/trace-explorer/" className="text-accent-purple hover:underline"> tracing</a>,
203-
<a href="/product/sentry/explore/session-replay/" className="text-accent-purple hover:underline"> session replay</a>, and
204-
<a href="/product/" className="text-accent-purple hover:underline"> more</a>.
219+
Monitor, identify, and resolve errors and performance issues across your
220+
applications using
221+
<a
222+
href="/product/sentry/issues/"
223+
className="text-accent-purple hover:underline"
224+
>
225+
{' '}
226+
error monitoring
227+
</a>
228+
,
229+
<a
230+
href="/product/sentry/explore/trace-explorer/"
231+
className="text-accent-purple hover:underline"
232+
>
233+
{' '}
234+
tracing
235+
</a>
236+
,
237+
<a
238+
href="/product/sentry/explore/session-replay/"
239+
className="text-accent-purple hover:underline"
240+
>
241+
{' '}
242+
session replay
243+
</a>
244+
, and
245+
<a href="/product/" className="text-accent-purple hover:underline">
246+
{' '}
247+
more
248+
</a>
249+
.
205250
</p>
206251
</div>
207252
{/* Column 2: AI in Sentry */}
208253
<div>
209254
<div className="flex items-center mb-4 gap-2 min-h-[32px]">
210255
<PlatformIcon platform="sentry" size={24} format="lg" />
211-
<a href="/product/ai-in-sentry/" className="text-xl font-medium text-accent-purple hover:underline align-middle"><h2 className="inline font-medium align-middle">AI in Sentry</h2></a>
256+
<a
257+
href="/product/ai-in-sentry/"
258+
className="text-xl font-medium text-accent-purple hover:underline align-middle"
259+
>
260+
<h2 className="inline font-medium align-middle">AI in Sentry</h2>
261+
</a>
212262
</div>
213263
<p className="text-base text-left text-[var(--gray-500)] pl-2 pr-4">
214-
Fix code faster by having <a href="/product/ai-in-sentry/seer/" className="text-accent-purple hover:underline">Seer</a> automatically find and remedy the root cause of your issues. Ask <a href="/product/ai-in-sentry/sentry-prevent-ai/" className="text-accent-purple hover:underline">Sentry Prevent AI</a> to review your PRs, suggest improvements, and build tests.
264+
Fix code faster by having{' '}
265+
<a
266+
href="/product/ai-in-sentry/seer/"
267+
className="text-accent-purple hover:underline"
268+
>
269+
Seer
270+
</a>{' '}
271+
automatically find and remedy the root cause of your issues. Ask{' '}
272+
<a
273+
href="/product/ai-in-sentry/sentry-prevent-ai/"
274+
className="text-accent-purple hover:underline"
275+
>
276+
Sentry Prevent AI
277+
</a>{' '}
278+
to review your PRs, suggest improvements, and build tests.
215279
</p>
216280
</div>
217281
</div>

‎src/components/sidebar/index.tsx‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,10 @@ export async function Sidebar({path, versions}: SidebarProps) {
105105
<SidebarNavigation path={path} />
106106
</div>
107107
<SidebarSeparator />
108-
<div className={`${styles['sidebar-external-links']} px-3`} style={{flex: '0 0 auto', paddingBottom: 0}}>
108+
<div
109+
className={`${styles['sidebar-external-links']} px-3`}
110+
style={{flex: '0 0 auto', paddingBottom: 0}}
111+
>
109112
<ul data-sidebar-tree>
110113
<li className="mb-3" data-sidebar-branch>
111114
<ul data-sidebar-tree>
@@ -151,12 +154,18 @@ export async function Sidebar({path, versions}: SidebarProps) {
151154
className="md:flex flex-col items-stretch h-full"
152155
style={{display: 'flex', flexDirection: 'column', height: '100%'}}
153156
>
154-
<div className={`${styles['sidebar-main']} px-3 flex-1`} style={{overflow: 'auto'}}>
157+
<div
158+
className={`${styles['sidebar-main']} px-3 flex-1`}
159+
style={{overflow: 'auto'}}
160+
>
155161
<ScrollActiveLink activeLinkSelector={activeLinkSelector} />
156162
<SidebarNavigation path={path} />
157163
</div>
158164
<SidebarSeparator />
159-
<div className={`${styles['sidebar-external-links']} px-3`} style={{flex: '0 0 auto', paddingBottom: 0}}>
165+
<div
166+
className={`${styles['sidebar-external-links']} px-3`}
167+
style={{flex: '0 0 auto', paddingBottom: 0}}
168+
>
160169
<ul data-sidebar-tree>
161170
<li className="mb-3" data-sidebar-branch>
162171
<ul data-sidebar-tree>

‎src/components/sidebar/sidebarNavigation.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ export async function SidebarNavigation({path}: {path: string[]}) {
1414

1515
// Product section: just show the sidebar for /product/ and its children
1616
if (path[0] === 'product') {
17-
return <ProductSidebar rootNode={rootNode} items={[{title: 'Product', root: 'product'}]} />;
17+
return (
18+
<ProductSidebar rootNode={rootNode} items={[{title: 'Product', root: 'product'}]} />
19+
);
1820
}
1921

2022
// SDKs/Platforms

0 commit comments

Comments
 (0)