Skip to content

Commit 661219f

Browse files
author
TechStack Global
committed
merge: resolve conflicts by accepting mobile bug fixes
2 parents fdbba9c + f000c02 commit 661219f

21 files changed

Lines changed: 122 additions & 102 deletions

about.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<header class="glass-header">
3131
<nav class="container">
3232
<div class="logo"><a href="index.html">TechStack<span class="accent">Global</span></a></div>
33-
<button class="menu-toggle" aria-label="Toggle Menu">
33+
<button class="menu-toggle" aria-label="Toggle Menu">
3434
<i class="fa-solid fa-bars"></i>
3535
</button>
3636
<ul class="nav-links" id="nav-links">

affiliate-disclosure.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<header class="glass-header">
2020
<nav class="container">
2121
<div class="logo"><a href="index.html">TechStack<span class="accent">Global</span></a></div>
22-
<button class="menu-toggle" aria-label="Toggle Menu">
22+
<button class="menu-toggle" aria-label="Toggle Menu">
2323
<i class="fa-solid fa-bars"></i>
2424
</button>
2525
<ul class="nav-links" id="nav-links">

amazon-stack.html

Lines changed: 46 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<header class="glass-header">
4444
<nav class="container">
4545
<div class="logo"><a href="index.html">TechStack<span class="accent">Global</span></a></div>
46-
<button class="menu-toggle" aria-label="Toggle Menu">
46+
<button class="menu-toggle" aria-label="Toggle Menu">
4747
<i class="fa-solid fa-bars"></i>
4848
</button>
4949
<ul class="nav-links" id="nav-links">
@@ -64,106 +64,75 @@
6464

6565
<main class="container section-padding">
6666
<header class="section-header">
67-
<h1>The Amazon Stack</h1>
67+
<span class="badge">Amazon Associate Stack</span>
68+
<h1>Tech Hardware for <span class="gradient-text">Modern Work & Growth</span></h1>
69+
<p>Inclusive guides for students, freelancers, and remote teams.</p>
6870
</header>
6971

7072
<section class="stack-subcategory" style="margin-bottom: 4rem;">
7173
<h2
7274
style="margin-bottom: 0.5rem; border-bottom: 1px solid var(--accent); display: inline-block; padding-bottom: 5px;">
73-
Product Library
75+
🏠 Remote Work & Productivity Setup
7476
</h2>
7577
<p style="color: var(--text-muted); margin-bottom: 2rem; max-width: 800px;">
76-
Hardware chosen for performance, reliability, and practical daily use.
78+
Our fully vetted, core hardware stack designed to build a unified, high-performance home office. From
79+
powerful laptops to essential infrastructure, this is the productivity ecosystem of 2026.
7780
</p>
78-
<div class="blog-grid" style="grid-template-columns: repeat(auto-fit, minmax(320px, 1fr));">
81+
<div class="blog-grid" style="grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));">
7982
<!-- MacBook Pro -->
80-
<div class="product-item glass-panel">
81-
<div class="product-thumbnail-wrapper">
82-
<img src="assets/images/macbook_hero.jpg" alt="Apple MacBook Pro M4 Pro — product thumbnail"
83-
class="product-thumbnail" loading="lazy">
84-
</div>
85-
<div class="product-info">
86-
<div class="product-meta">Elite Performance</div>
87-
<h3><a href="posts/apple-macbook-pro-m4-pro-review.html"
88-
aria-label="Open review: Apple MacBook Pro M4 Pro">Apple MacBook Pro M4 Pro</a></h3>
89-
<a href="posts/apple-macbook-pro-m4-pro-review.html" class="view-review-cta">View Review <i
90-
class="fa-solid fa-arrow-right"></i></a>
91-
</div>
83+
<div class="blog-card glass-panel" style="border-top: 3px solid var(--accent);">
84+
<div class="blog-category">Premium Laptop</div>
85+
<h3><a href="posts/apple-macbook-pro-m4-pro-review.html">Apple MacBook Pro M4 Pro</a></h3>
86+
<p>The efficiency benchmark for AI engineers and mobile operators. 20+ hours of battery life.</p>
87+
<div class="card-meta"><span>9.8/10</span> <a href="posts/apple-macbook-pro-m4-pro-review.html"
88+
class="read-more">Full Analysis &rarr;</a></div>
9289
</div>
9390

9491
<!-- Dell XPS 15 -->
95-
<div class="product-item glass-panel">
96-
<div class="product-thumbnail-wrapper">
97-
<img src="https://m.media-amazon.com/images/I/61Ks9X44eVL._AC_SL1181_.jpg"
98-
alt="Dell XPS 15 9530 — product thumbnail" class="product-thumbnail" loading="lazy">
99-
</div>
100-
<div class="product-info">
101-
<div class="product-meta">Enterprise Windows</div>
102-
<h3><a href="posts/dell-xps-15-9530-review.html" aria-label="Open review: Dell XPS 15 9530">Dell
103-
XPS 15 9530</a></h3>
104-
<a href="posts/dell-xps-15-9530-review.html" class="view-review-cta">View Review <i
105-
class="fa-solid fa-arrow-right"></i></a>
106-
</div>
92+
<div class="blog-card glass-panel" style="border-top: 3px solid #00c3ff;">
93+
<div class="blog-category">Enterprise Laptop</div>
94+
<h3><a href="posts/dell-xps-15-9530-review.html">Dell XPS 15 9530</a></h3>
95+
<p>The premier Windows workstation with upgradeable RAM and classic enterprise build quality.</p>
96+
<div class="card-meta"><span>9.4/10</span> <a href="posts/dell-xps-15-9530-review.html"
97+
class="read-more">Full Analysis &rarr;</a></div>
10798
</div>
10899

109100
<!-- Surface Laptop Studio 2 -->
110-
<div class="product-item glass-panel">
111-
<div class="product-thumbnail-wrapper">
112-
<img src="https://m.media-amazon.com/images/I/61LMopCIyTL._AC_SL1200_.jpg"
113-
alt="Surface Laptop Studio 2 — product thumbnail" class="product-thumbnail" loading="lazy">
114-
</div>
115-
<div class="product-info">
116-
<div class="product-meta">Creative Hybrid</div>
117-
<h3><a href="posts/surface-laptop-studio-2-review.html"
118-
aria-label="Open review: Surface Laptop Studio 2">Surface Laptop Studio 2</a></h3>
119-
<a href="posts/surface-laptop-studio-2-review.html" class="view-review-cta">View Review <i
120-
class="fa-solid fa-arrow-right"></i></a>
121-
</div>
101+
<div class="blog-card glass-panel" style="border-top: 3px solid #ff4b2b;">
102+
<div class="blog-category">Creative Laptop</div>
103+
<h3><a href="posts/surface-laptop-studio-2-review.html">Surface Laptop Studio 2</a></h3>
104+
<p>The ultimate agile workstation for product managers and digital artists with a floating display.
105+
</p>
106+
<div class="card-meta"><span>9.2/10</span> <a href="posts/surface-laptop-studio-2-review.html"
107+
class="read-more">Full Analysis &rarr;</a></div>
122108
</div>
123109

124110
<!-- Samsung SSD -->
125-
<div class="product-item glass-panel">
126-
<div class="product-thumbnail-wrapper">
127-
<img src="https://images-na.ssl-images-amazon.com/images/P/B0BHJJ9Y77.01._SCLZZZZZZZ_.jpg"
128-
alt="Samsung 990 PRO SSD 2TB — product thumbnail" class="product-thumbnail" loading="lazy">
129-
</div>
130-
<div class="product-info">
131-
<div class="product-meta">High-Speed Storage</div>
132-
<h3><a href="posts/samsung-990-pro-ssd-review.html"
133-
aria-label="Open review: Samsung 990 PRO SSD 2TB">Samsung 990 PRO SSD 2TB</a></h3>
134-
<a href="posts/samsung-990-pro-ssd-review.html" class="view-review-cta">View Review <i
135-
class="fa-solid fa-arrow-right"></i></a>
136-
</div>
111+
<div class="blog-card glass-panel">
112+
<div class="blog-category">High-Speed Storage</div>
113+
<h3><a href="posts/samsung-990-pro-ssd-review.html">Samsung 990 PRO SSD 2TB</a></h3>
114+
<p>The premier NVMe upgrade for content creators, hitting 7,450 MB/s to eliminate loading times.</p>
115+
<div class="card-meta"><span>9.8/10</span> <a href="posts/samsung-990-pro-ssd-review.html"
116+
class="read-more">Full Analysis &rarr;</a></div>
137117
</div>
138118

139119
<!-- LG Monitor -->
140-
<div class="product-item glass-panel">
141-
<div class="product-thumbnail-wrapper">
142-
<img src="https://m.media-amazon.com/images/I/71R-r8EAn2L._AC_SL1500_.jpg"
143-
alt="LG 27US500-W 4K Monitor — product thumbnail" class="product-thumbnail" loading="lazy">
144-
</div>
145-
<div class="product-info">
146-
<div class="product-meta">4K Productivity</div>
147-
<h3><a href="posts/lg-27us500-w-ultrafine-monitor-review.html"
148-
aria-label="Open review: LG 27US500-W 4K Monitor">LG 27US500-W 4K Monitor</a></h3>
149-
<a href="posts/lg-27us500-w-ultrafine-monitor-review.html" class="view-review-cta">View Review
150-
<i class="fa-solid fa-arrow-right"></i></a>
151-
</div>
120+
<div class="blog-card glass-panel">
121+
<div class="blog-category">4K Display</div>
122+
<h3><a href="posts/lg-27us500-w-ultrafine-monitor-review.html">LG 27US500-W 4K Monitor</a></h3>
123+
<p>Expand your workspace and reduce eye strain with stunning retina-level 4K text clarity.</p>
124+
<div class="card-meta"><span>9.3/10</span> <a
125+
href="posts/lg-27us500-w-ultrafine-monitor-review.html" class="read-more">Full Analysis
126+
&rarr;</a></div>
152127
</div>
153128

154129
<!-- Dell Dock -->
155-
<div class="product-item glass-panel">
156-
<div class="product-thumbnail-wrapper">
157-
<img src="assets/images/products/dell-sd25tb4-box.jpg"
158-
alt="Dell SD25TB4 Pro Dock — product thumbnail" class="product-thumbnail" loading="lazy">
159-
</div>
160-
<div class="product-info">
161-
<div class="product-meta">Thunderbolt Hub</div>
162-
<h3><a href="posts/dell-thunderbolt-smart-dock-review.html"
163-
aria-label="Open review: Dell SD25TB4 Pro Dock">Dell SD25TB4 Pro Dock</a></h3>
164-
<a href="posts/dell-thunderbolt-smart-dock-review.html" class="view-review-cta">View Review <i
165-
class="fa-solid fa-arrow-right"></i></a>
166-
</div>
130+
<div class="blog-card glass-panel">
131+
<div class="blog-category">Thunderbolt Hub</div>
132+
<h3><a href="posts/dell-thunderbolt-smart-dock-review.html">Dell SD25TB4 Pro Dock</a></h3>
133+
<p>The core of a one-cable desk setup, providing massive bandwidth and 130W laptop charging.</p>
134+
<div class="card-meta"><span>9.6/10</span> <a href="posts/dell-thunderbolt-smart-dock-review.html"
135+
class="read-more">Full Analysis &rarr;</a></div>
167136
</div>
168137
</div>
169138
</section>

blog.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<header class="glass-header">
3434
<nav class="container">
3535
<div class="logo"><a href="index.html">TechStack<span class="accent">Global</span></a></div>
36-
<button class="menu-toggle" aria-label="Toggle Menu">
36+
<button class="menu-toggle" aria-label="Toggle Menu">
3737
<i class="fa-solid fa-bars"></i>
3838
</button>
3939
<ul class="nav-links" id="nav-links">
@@ -54,8 +54,8 @@
5454

5555
<main class="container section-padding" style="margin-top: 80px;">
5656
<div class="section-header">
57-
<h1>Guides</h1>
58-
<p>Clear comparisons and practical insights to help you make better tech decisions.</p>
57+
<h1>Articles & Comparison Guides</h1>
58+
<p>In-depth comparison guides, ecosystem setups, and tech advice for modern professionals.</p>
5959
</div>
6060

6161
<div class="blog-grid" id="blog-posts-container">

contact.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<header class="glass-header">
3232
<nav class="container">
3333
<div class="logo"><a href="index.html">TechStack<span class="accent">Global</span></a></div>
34-
<button class="menu-toggle" aria-label="Toggle Menu">
34+
<button class="menu-toggle" aria-label="Toggle Menu">
3535
<i class="fa-solid fa-bars"></i>
3636
</button>
3737
<ul class="nav-links" id="nav-links">

image_request_log.txt

Whitespace-only changes.

index.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
TechStack<span class="accent">Global</span>
6161
</a>
6262
</div>
63-
<button class="menu-toggle" aria-label="Toggle Menu">
63+
<button class="menu-toggle" aria-label="Toggle Menu">
6464
<i class="fa-solid fa-bars"></i>
6565
</button>
6666
<ul class="nav-links" id="nav-links">
@@ -88,6 +88,8 @@ <h1>Make Smarter <br><span class="gradient-text">Tech Decisions.</span>
8888
</h1>
8989
<p class="hero-sub">No hype. No fluff. Just clear guidance on the tech that powers modern work.</p>
9090
<div class="hero-ctas">
91+
<a href="#recommended" class="btn-primary">Browse the Full Stack</a>
92+
<a href="amazon-stack.html" class="btn-secondary">View the Amazon Stack</a>
9193
</div>
9294
</div>
9395
<!-- Abstract futuristic graphic representation -->
@@ -103,7 +105,7 @@ <h1>Make Smarter <br><span class="gradient-text">Tech Decisions.</span>
103105
<section id="categories" class="container section-padding">
104106
<div class="section-header">
105107
<h2>Explore the Stack</h2>
106-
<p>Browse hardware by category.</p>
108+
<p>Browse elite tech by category.</p>
107109
</div>
108110
<div class="category-grid" style="grid-template-columns: repeat(2, 1fr); max-width: 800px; margin: 0 auto;">
109111
<a href="amazon-stack.html" class="cat-card featured-cat">

posts/apple-macbook-pro-m4-pro-review.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<header class="glass-header">
7676
<nav class="container">
7777
<div class="logo"><a href="../index.html">TechStack<span class="accent">Global</span></a></div>
78-
<button class="menu-toggle" aria-label="Toggle Menu">
78+
<button class="menu-toggle" aria-label="Toggle Menu">
7979
<i class="fa-solid fa-bars"></i>
8080
</button>
8181
<ul class="nav-links" id="nav-links">

posts/best-premium-laptop-for-work-2026.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<header class="glass-header">
6161
<nav class="container">
6262
<div class="logo"><a href="../index.html">TechStack<span class="accent">Global</span></a></div>
63-
<button class="menu-toggle" aria-label="Toggle Menu">
63+
<button class="menu-toggle" aria-label="Toggle Menu">
6464
<i class="fa-solid fa-bars"></i>
6565
</button>
6666
<ul class="nav-links" id="nav-links">

posts/best-remote-work-setup-2026.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<header class="glass-header">
4242
<nav class="container">
4343
<div class="logo"><a href="../index.html">TechStack<span class="accent">Global</span></a></div>
44-
<button class="menu-toggle" aria-label="Toggle Menu">
44+
<button class="menu-toggle" aria-label="Toggle Menu">
4545
<i class="fa-solid fa-bars"></i>
4646
</button>
4747
<ul class="nav-links" id="nav-links">

0 commit comments

Comments
 (0)