Skip to content

Commit 6b5b62b

Browse files
committed
Merge branch 'rebase-experiment'
2 parents 10211ad + ec763e5 commit 6b5b62b

File tree

9 files changed

+105
-28
lines changed

9 files changed

+105
-28
lines changed

docs/fl-node-homepage-inventory.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,4 +236,4 @@ This migration aligns with our 8 component systems:
236236
- Micro-commits allow for easy rollback
237237
- Comprehensive testing at each stage
238238
- Conservative timeline with buffer for issues
239-
- Team coordination through swarm methodology
239+
- Team coordination through swarm methodology

test/system/desktop_site_test.rb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,18 @@ def setup
1111

1212
def test_homepage
1313
visit "/"
14+
15+
preload_all_images
16+
1417
assert_text "Build faster. Scale smarter."
1518
assert_screenshot "homepage", tolerance: 0.10
1619
end
1720

1821
def test_top_image_have_highest_priority
1922
visit "/"
23+
24+
preload_all_images
25+
2026
within ".fl-photo-content.fl-photo-img-jpeg" do
2127
assert_css "img[fetchpriority=high]"
2228
end

themes/beaver/assets/css/base-layout.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
.grid-col-4 { grid-template-columns: repeat(4, 1fr); }
5454

5555
/* FL-Builder Compatibility: Responsive Modifiers */
56-
@media (max-width: var(--fl-breakpoint-medium)) {
56+
@media (max-width: 1115px) {
5757
.grid-col-2, .grid-col-3, .grid-col-4 { grid-template-columns: 1fr; }
5858
}
5959

@@ -2916,12 +2916,12 @@ a.text-dark:focus {
29162916
/* Responsive Utilities - Consolidates duplicate media queries */
29172917
/* Use these classes to replace duplicate @media (max-width: 1115px) and @media (max-width: 860px) */
29182918

2919-
@media (max-width: var(--fl-breakpoint-medium)) { /* 1115px */
2919+
@media (max-width: 1115px) { /* 1115px */
29202920
.responsive-single-col { grid-template-columns: 1fr !important; }
29212921
.medium-hidden { display: none !important; }
29222922
}
29232923

2924-
@media (max-width: var(--fl-breakpoint-mobile)) { /* 860px */
2924+
@media (max-width: 860px) { /* 860px */
29252925
.mobile-single-col { grid-template-columns: 1fr !important; }
29262926
.mobile-hidden { display: none !important; }
29272927
}

themes/beaver/assets/css/component-bundle.css

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ img.mfp-img {
182182
.pp-advanced-menu .pp-toggle-arrows .pp-menu-toggle:before,
183183
.pp-advanced-menu .pp-toggle-none .pp-menu-toggle:before {
184184
content: "";
185-
border-color: #333;
185+
border-color: #333333;
186186
}
187187

188188
.pp-advanced-menu .pp-menu-expanded .pp-menu-toggle {
@@ -200,7 +200,7 @@ img.mfp-img {
200200
padding: 8px;
201201
background-color: transparent;
202202
border: none;
203-
color: #333;
203+
color: #333333;
204204
border-radius: 0;
205205
cursor: pointer;
206206
line-height: 0;
@@ -292,7 +292,7 @@ img.mfp-img {
292292
.pp-hamburger
293293
.pp-hamburger-box
294294
.pp-hamburger-inner:after {
295-
background-color: #000;
295+
background-color: #000000;
296296
position: absolute;
297297
width: 30px;
298298
height: 3px;
@@ -632,7 +632,7 @@ html:not(.pp-off-canvas-menu-open)
632632
width: 320px;
633633
height: 100%;
634634
opacity: 0;
635-
background: #333;
635+
background: #333333;
636636
overflow-y: auto;
637637
overflow-x: hidden;
638638
-ms-overflow-style: -ms-autohiding-scrollbar;
@@ -1070,7 +1070,7 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
10701070
border-style: solid;
10711071
border-bottom-width: 0px;
10721072
border-color: transparent;
1073-
1073+
10741074
color: #121212;
10751075
}
10761076

@@ -1095,7 +1095,7 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
10951095
.fl-node-menu .sub-menu > li > .pp-has-submenu-container > a:focus,
10961096
.fl-node-menu .sub-menu > li.current-menu-item > a,
10971097
.fl-node-menu .sub-menu > li.current-menu-item > .pp-has-submenu-container > a {
1098-
1098+
10991099
color: #1a8cff;
11001100
}
11011101

@@ -1410,7 +1410,7 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
14101410
.fl-node-menu .sub-menu > li > a,
14111411
.fl-node-menu .sub-menu > li > .pp-has-submenu-container > a {
14121412
border-bottom-width: 0px;
1413-
1413+
14141414
}
14151415

14161416
.fl-node-menu .sub-menu {
@@ -1446,7 +1446,7 @@ ul.pp-advanced-menu-horizontal li.mega-menu > ul.sub-menu ul.sub-menu {
14461446
.fl-node-menu .sub-menu > li > a,
14471447
.fl-node-menu .sub-menu > li > .pp-has-submenu-container > a {
14481448
border-bottom-width: 0px;
1449-
1449+
14501450
}
14511451

14521452
.fl-node-menu .pp-advanced-menu-mobile {
@@ -1891,7 +1891,7 @@ body:not(.single-fl-theme-layout)
18911891
}
18921892

18931893
.fl-node-530uo7f2gcli > .fl-row-content-wrap {
1894-
background-color: #000;
1894+
background-color: #000000;
18951895
background-repeat: no-repeat;
18961896
background-position: center center;
18971897
background-attachment: scroll;
@@ -2758,15 +2758,15 @@ body:not(.single-fl-theme-layout)
27582758
.trust-details {
27592759
grid-template-columns: 1fr;
27602760
}
2761-
2761+
27622762
.rating-display {
27632763
grid-template-columns: 1fr;
27642764
}
2765-
2765+
27662766
.rating-stats {
27672767
grid-template-columns: 1fr;
27682768
}
2769-
2769+
27702770
.trust-signals-comprehensive section {
27712771
padding: 1.5rem;
27722772
}
@@ -2785,7 +2785,7 @@ body:not(.single-fl-theme-layout)
27852785
position: relative;
27862786
padding: 0.5rem 0 0.5rem 1.5rem;
27872787
margin-bottom: 0.5rem;
2788-
color: #333;
2788+
color: #333333;
27892789
line-height: 1.4;
27902790
}
27912791

themes/beaver/assets/css/components/c-navigation.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020

2121
.c-nav__link {
2222
display: block;
23-
padding: var(--spacing-sm) var(--spacing-md);
24-
color: var(--jt-text-color);
23+
padding: 0.5rem 1rem;
24+
color: #121212;
2525
text-decoration: none;
2626
transition: all 0.2s ease;
2727

2828
&:hover {
29-
background-color: var(--jt-primary-color);
29+
background-color: #1a8cff;
3030
color: white;
3131
}
3232
}

themes/beaver/assets/css/navigation.css

Lines changed: 64 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,18 @@
2222
background-color: #007af4;
2323
}
2424

25+
/* Mobile-specific button styles with direct hex values for consistent rendering */
26+
@media (max-width: 768px) {
27+
.btn-primary {
28+
background-color: #1a8cff;
29+
color: #fff !important;
30+
}
31+
32+
.btn-primary:hover {
33+
background-color: #007af4;
34+
}
35+
}
36+
2537
.top-panel {
2638
padding: 15px 20px 0;
2739
position: absolute;
@@ -55,7 +67,7 @@
5567
.navigation {
5668
@media (max-width: 1024px) {
5769
position: fixed;
58-
background-color: #fff;
70+
background-color: #FFFFFF;
5971
top: 0;
6072
bottom: 0;
6173
width: 320px;
@@ -110,6 +122,8 @@
110122
top: 50%;
111123
margin-top: -1px;
112124
transform: rotate(45deg);
125+
backface-visibility: hidden;
126+
will-change: transform;
113127
}
114128

115129
.menu-close:after {
@@ -122,6 +136,8 @@
122136
top: 50%;
123137
margin-top: -1px;
124138
transform: rotate(-45deg);
139+
backface-visibility: hidden;
140+
will-change: transform;
125141
}
126142

127143
.navigation.-open .menu-close {
@@ -169,6 +185,8 @@
169185
transform-origin: 70% 70%;
170186
transform: rotate(45deg);
171187
transition: .3s;
188+
backface-visibility: hidden;
189+
will-change: transform;
172190
}
173191

174192
.navigation .link {
@@ -193,7 +211,7 @@
193211

194212
.navigation .sub-menu {
195213
display: none;
196-
background-color: #fff;
214+
background-color: #FFFFFF;
197215
box-shadow: 0 10px 40px rgba(0,0,0,.1);
198216
border-radius: 20px;
199217
padding: 30px 30px 0;
@@ -207,6 +225,8 @@
207225
width: 888px;
208226
transform: translateX(-40%);
209227
font-size: 0;
228+
backface-visibility: hidden;
229+
will-change: transform;
210230
line-height: 0;
211231

212232
@media (max-width: 1080px) {
@@ -221,7 +241,7 @@
221241
height: 0;
222242
border-style: solid;
223243
border-width: 15px 0 15px 15px;
224-
border-color: transparent transparent transparent #fff;
244+
border-color: transparent transparent transparent #FFFFFF;
225245
right: unset!important;
226246
top: -20px !important;
227247
left: 45% !important;
@@ -280,7 +300,7 @@
280300
font-weight: 300;
281301
margin-bottom: 0;
282302
margin-top: 5px;
283-
color: #7e7e7e;
303+
color: #666666;
284304
}
285305

286306
@media (min-width: 1025px) {
@@ -299,6 +319,40 @@
299319
}
300320

301321
@media (max-width: 1024px) {
322+
.menu-opener {
323+
border-color: #121212;
324+
}
325+
326+
.menu-opener:before {
327+
background-color: #121212;
328+
}
329+
330+
.menu-close:before,
331+
.menu-close:after {
332+
background-color: #121212;
333+
}
334+
335+
.navigation .link {
336+
color: #121212;
337+
}
338+
339+
.navigation .item .arrow {
340+
border-color: #121212;
341+
}
342+
343+
.navigation .sub-name {
344+
color: #121212;
345+
}
346+
347+
.navigation {
348+
background-color: #FFFFFF;
349+
}
350+
351+
.navigation .sub-menu {
352+
background-color: #FFFFFF;
353+
}
354+
355+
302356
.navigation.-open {
303357
right: 0;
304358
overflow-y: auto;
@@ -344,6 +398,12 @@
344398
margin-top: 15px;
345399
}
346400

401+
/* Mobile-specific color overrides to fix CSS variable inconsistencies */
402+
.navigation .btn {
403+
background-color: #121212 !important;
404+
color: #FFFFFF !important;
405+
}
406+
347407
.navigation .item {
348408
padding: 0;
349409
margin: 0;

themes/beaver/assets/css/theme-main.css

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
:root {
2+
--jt-primary-color: #1a8cff;
3+
--jt-text-color: #121212;
4+
--jt-primary: #1a8cff;
5+
--jt-text-primary: #121212;
6+
--jt-primary-dark: #0066cc;
7+
--jt-primary-hover: #007af4;
8+
--jt-white: #ffffff;
9+
--jt-text-secondary: #7e7e7e;
10+
}
11+
112
body {
213
background-color: #fff;
314
color: #121212;

themes/beaver/assets/css/use-cases-dynamic.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.use-cases > .heading {
2-
color: #1a8cff;
2+
color: var(--jt-primary);
33
font-weight: 600;
44
text-align: center;
55
margin-bottom: 30px;

themes/beaver/assets/css/utilities/c-spacing.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
--spacing-5xl: 8rem; // 128px
2727

2828
// Component-specific spacing
29-
--spacing-component-padding: var(--spacing-lg);
30-
--spacing-section-padding: var(--spacing-2xl);
31-
--spacing-container-padding: var(--spacing-md);
29+
--spacing-component-padding: 1.5rem;
30+
--spacing-section-padding: 3rem;
31+
--spacing-container-padding: 1rem;
3232
}
3333

3434
/* ==========================================================================

0 commit comments

Comments
 (0)