Skip to content

Commit 6a358d7

Browse files
nancy-verma780nancy-verma780
authored
Merge branch 'main' into main
2 parents 3ee7198 + 39b7f79 commit 6a358d7

9 files changed

Lines changed: 172 additions & 143 deletions

File tree

‎.nvmrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
22

‎.vscode/settings.json‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,4 @@
1010
"javascriptreact",
1111
"typescriptreact"
1212
],
13-
"workbench.colorCustomizations": {
14-
"editor.lineHighlightBorder": "#FF2D9A25",
15-
"editorCursor.foreground": "#FF2D9A",
16-
"tab.activeBorder": "#FF2D9A35",
17-
"tab.activeBorderTop": "#FF2D9A35",
18-
"tab.activeBackground": "#1A0028",
19-
"tab.activeForeground": "#FF6EC7",
20-
"statusBar.background": "#120020",
21-
"statusBar.foreground": "#FF6EC7",
22-
"editorIndentGuide.activeBackground1": "#FF2D9A35",
23-
"editor.selectionBackground": "#FF2D9A28",
24-
"editorBracketHighlight.foreground1": "#FF2D9A",
25-
"editorBracketHighlight.foreground2": "#FF6EC7"
26-
}
2713
}

‎package-lock.json‎

Lines changed: 92 additions & 92 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,13 @@
8080
"@types/canvas-confetti": "^1.9.0",
8181
"@types/react": "^19.1.9",
8282
"@types/react-dom": "^19.1.7",
83-
"@typescript-eslint/eslint-plugin": "^8.59.4",
84-
"@typescript-eslint/parser": "^8.60.0",
83+
"@typescript-eslint/eslint-plugin": "^8.60.1",
84+
"@typescript-eslint/parser": "^8.60.1",
8585
"autoprefixer": "^10.5.0",
8686
"eslint": "^10.4.1",
8787
"eslint-plugin-react": "^7.37.5",
8888
"husky": "^9.1.7",
89-
"lint-staged": "^17.0.5",
89+
"lint-staged": "^17.0.7",
9090
"postcss": "^8.5.15",
9191
"prettier": "^3.8.3",
9292
"prettier-plugin-tailwindcss": "^0.6.14",

‎src/components/topmate/TopMateCard.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ const TopMateCard: React.FC<TopMateCardProps> = ({
4848
initial={{ opacity: 0, y: 30, scale: 0.97 }}
4949
animate={{ opacity: 1, y: 0, scale: 1 }}
5050
transition={{ duration: 0.6, ease: [0.25, 0.46, 0.45, 0.94] }}
51-
className="group relative flex h-90 w-full flex-col overflow-hidden rounded-2xl transition-all duration-500 hover:scale-[1.008]"
51+
className="group relative flex min-h-[360px] w-full flex-col overflow-hidden rounded-2xl transition-all duration-500 hover:scale-[1.008]"
5252
style={{
5353
background: isDark ? "#0a0a0a" : "#ffffff",
5454
border: `1px solid ${borderClr}`,

‎src/components/topmate/TopMateSection.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const TopMateSection = ({ setShowTopmate }) => {
3030
};
3131

3232
return (
33-
<div className="relative flex flex-col w-full h-90">
33+
<div className="relative flex flex-col w-full">
3434
<div className="relative flex w-full flex-col justify-between">
3535
{/* Section header — unified height & centered alignment */}
3636
<motion.div

‎src/css/custom.css‎

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2629,9 +2629,38 @@ html[data-theme="dark"] .blog-post-page .markdown h4 {
26292629
font-size: inherit !important;
26302630
}
26312631

2632-
html[data-theme="dark"] .blog-post-page .markdown .admonition,
2633-
html[data-theme="dark"] .blog-post-page .markdown .alert {
2634-
background: rgba(59, 130, 246, 0.1) !important;
2632+
html[data-theme="dark"].blog-post-page .markdown .theme-admonition-info,
2633+
html[data-theme="dark"].blog-post-page .markdown .alert--info {
2634+
--ifm-alert-foreground-color: #ffffff !important;
2635+
--ifm-alert-background-color: #0f172a !important;
2636+
--ifm-alert-background-color-highlight: rgba(148, 163, 184, 0.14) !important;
2637+
--ifm-alert-border-color: #2563eb !important;
2638+
--ifm-link-color: #93c5fd !important;
2639+
--ifm-link-hover-color: #bfdbfe !important;
2640+
background-color: var(--ifm-alert-background-color) !important;
2641+
background: var(--ifm-alert-background-color) !important;
2642+
border-left-color: var(--ifm-alert-border-color) !important;
2643+
color: #ffffff !important;
2644+
}
2645+
2646+
html[data-theme="dark"].blog-post-page .markdown .theme-admonition-info [class*="admonitionContent_"],
2647+
html[data-theme="dark"].blog-post-page .markdown .alert--info [class*="admonitionContent_"],
2648+
html[data-theme="dark"].blog-post-page .markdown .theme-admonition-info [class*="admonitionContent_"] p,
2649+
html[data-theme="dark"].blog-post-page .markdown .theme-admonition-info [class*="admonitionContent_"] li,
2650+
html[data-theme="dark"].blog-post-page .markdown .theme-admonition-info [class*="admonitionContent_"] span,
2651+
html[data-theme="dark"].blog-post-page .markdown .theme-admonition-info [class*="admonitionContent_"] strong,
2652+
html[data-theme="dark"].blog-post-page .markdown .theme-admonition-info [class*="admonitionContent_"] em,
2653+
html[data-theme="dark"].blog-post-page .markdown .theme-admonition-info [class*="admonitionContent_"] code,
2654+
html[data-theme="dark"].blog-post-page .markdown .theme-admonition-info [class*="admonitionContent_"] a,
2655+
html[data-theme="dark"].blog-post-page .markdown .alert--info [class*="admonitionContent_"] p,
2656+
html[data-theme="dark"].blog-post-page .markdown .alert--info [class*="admonitionContent_"] li,
2657+
html[data-theme="dark"].blog-post-page .markdown .alert--info [class*="admonitionContent_"] span,
2658+
html[data-theme="dark"].blog-post-page .markdown .alert--info [class*="admonitionContent_"] strong,
2659+
html[data-theme="dark"].blog-post-page .markdown .alert--info [class*="admonitionContent_"] em,
2660+
html[data-theme="dark"].blog-post-page .markdown .alert--info [class*="admonitionContent_"] code,
2661+
html[data-theme="dark"].blog-post-page .markdown .alert--info [class*="admonitionContent_"] a {
2662+
color: #ffffff !important;
2663+
-webkit-text-fill-color: #ffffff !important;
26352664
}
26362665

26372666
/* Blog post page title (H1 rendered by Docusaurus header, outside .markdown) */

‎src/pages/blogs/blogs-new.css‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1161,9 +1161,16 @@
11611161
}
11621162

11631163
.active-page {
1164-
background: #475569 !important;
1165-
color: white;
1166-
border-color: #475569 !important;
1164+
background: #000000 !important;
1165+
color: #ffffff !important;
1166+
border-color: #000000 !important;
1167+
box-shadow: 0 6px 18px rgba(15, 23, 42, 0.16);
1168+
transform: translateY(-1px);
1169+
}
1170+
1171+
.active-page:hover {
1172+
background: #111111 !important;
1173+
box-shadow: 0 8px 20px rgba(15, 23, 42, 0.22);
11671174
}
11681175

11691176
.pagination-btn:disabled {

‎src/theme/Footer/Layout/index.tsx‎

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -232,13 +232,6 @@ export default function FooterLayout(): ReactNode {
232232
<span className="link-badge popular">Popular</span>
233233
</Link>
234234
</li>
235-
<li>
236-
<Link to="/courses" className="footer-link">
237-
<FooterIcon icon={Video} className="link-icon" />
238-
Video Courses
239-
<span className="link-badge new">New</span>
240-
</Link>
241-
</li>
242235
<li>
243236
<Link to="/get-started" className="footer-link">
244237
<FooterIcon icon={Rocket} className="link-icon" />
@@ -251,6 +244,19 @@ export default function FooterLayout(): ReactNode {
251244
GitHub Badges
252245
</Link>
253246
</li>
247+
<li>
248+
<Link href="https://dev.recodehive.com/devfolio" className="footer-link">
249+
<FooterIcon icon={Award} className="link-icon" />
250+
GitHub Profiles
251+
</Link>
252+
</li>
253+
<li>
254+
<Link to="/courses" className="footer-link">
255+
<FooterIcon icon={Video} className="link-icon" />
256+
Video Courses
257+
<span className="link-badge new">New</span>
258+
</Link>
259+
</li>
254260
</ul>
255261
</div>
256262

@@ -263,6 +269,13 @@ export default function FooterLayout(): ReactNode {
263269
Company
264270
</h3>
265271
<ul className="footer-links">
272+
<li>
273+
<Link to="/careers" className="footer-link">
274+
<FooterIcon icon={BriefcaseBusiness} className="link-icon"/>
275+
Careers
276+
<span className="link-badge hiring">We're Hiring!</span>
277+
</Link>
278+
</li>
266279
<li>
267280
<Link to="/community" className="footer-link">
268281
<FooterIcon icon={Users} className="link-icon" />
@@ -275,16 +288,6 @@ export default function FooterLayout(): ReactNode {
275288
Our Blog
276289
</Link>
277290
</li>
278-
<li>
279-
<Link to="/careers" className="footer-link">
280-
<FooterIcon
281-
icon={BriefcaseBusiness}
282-
className="link-icon"
283-
/>
284-
Careers
285-
<span className="link-badge hiring">We're Hiring!</span>
286-
</Link>
287-
</li>
288291
<li>
289292
<Link to="/our-sponsors" className="footer-link">
290293
<FooterIcon icon={Handshake} className="link-icon" />
@@ -309,27 +312,30 @@ export default function FooterLayout(): ReactNode {
309312
Support
310313
</h3>
311314
<ul className="footer-links">
312-
<li>
313-
<Link to="/contact-us" className="footer-link">
314-
<FooterIcon
315-
icon={MessageCircleQuestion}
316-
className="link-icon"
317-
/>
318-
Contact Us
319-
</Link>
320-
</li>
321315
<li>
322316
<Link to="/broadcasts" className="footer-link">
323317
<FooterIcon icon={MonitorPlay} className="link-icon" />
324318
Broadcasts
325319
</Link>
326320
</li>
321+
<li>
322+
<Link to="/contact-us" className="footer-link">
323+
<FooterIcon icon={MessageCircleQuestion} className="link-icon"/>
324+
Contact Us
325+
</Link>
326+
</li>
327327
<li>
328328
<Link to="/podcasts" className="footer-link">
329329
<FooterIcon icon={Mic2} className="link-icon" />
330330
Podcasts
331331
</Link>
332332
</li>
333+
<li>
334+
<Link to="https://github.com/orgs/recodehive/projects/9" className="footer-link">
335+
<FooterIcon icon={MonitorPlay} className="link-icon" />
336+
Roadmap
337+
</Link>
338+
</li>
333339
</ul>
334340
</div>
335341

0 commit comments

Comments
 (0)