Skip to content
This repository was archived by the owner on Apr 21, 2026. It is now read-only.

Commit ea1dfdf

Browse files
committed
Merge remote-tracking branch 'origin/fix/design-issues' into develop
2 parents f4e5ddd + ca86e0a commit ea1dfdf

8 files changed

Lines changed: 61 additions & 31 deletions

File tree

app/views/layout.cfm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@
254254

255255
<footer class="bg-white <cfif isAuthPage>d-none</cfif> pt-5 pb-3 border-top">
256256
<div class="container">
257-
<div class="row gy-lg-0 gy-3 gx-5">
257+
<div class="row gy-lg-0 gy-3 gx-sm-5">
258258
<div class="col-lg-4">
259259
<img src="/images/wheels-logo.png" width="284" alt="">
260260
<div class="mt-3">

app/views/web/AuthController/register.cfm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<main class="w-100 vh-100 position-relative">
2-
<div class="row w-100 h-100 m-lg-auto">
2+
<div class="row w-100 g-0 h-100 m-lg-auto">
33
<div class="col-lg-6 bg-white col-12">
44
<div class="flex-column d-flex py-4 justify-content-center h-100 gap-3 align-items-center">
55
<h1 class="fs-36 mb-0 fw-bold text--secondary">Welcome to</h1>
@@ -13,7 +13,7 @@
1313
</div>
1414
</div>
1515
<div
16-
class="col-lg-6 p-lg-auto p-0 main-login col-12 d-flex flex-column justify-content-center align-items-center">
16+
class="col-lg-6 mt-lg-0 mt-5 px-lg-0 px-2 p-lg-auto main-login col-12 d-flex flex-column justify-content-center align-items-center">
1717
<div class="bg-white p-4 border rounded-4 w-100 max-w-570 mx-auto">
1818
<div>
1919
<h1 class="fs-24 mb-0 fw-bold text--secondary">Sign Up</h1>

app/views/web/BlogController/index.cfm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div>
22
<!-- Blog filter -->
3-
<div class="w-100 h-600 position-relative feature-blog">
3+
<div class="w-100 h-600 h-sm-400 position-relative feature-blog">
44
<div class="position-absolute mx-auto container start-0 end-0 bottom-50px">
55
<p id="featureBlogHeading" class="text-white fs-18 pb-2">Featured</p>
66
<p id="blogAuthorHeading" class="text-white fw-bold fs-36 pb-3 line-height-100">Wheels The Fast & Fun CFML Framework!</p>

app/views/web/HomeController/index.cfm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,22 @@
2828
</div>
2929
</div>
3030
</div>
31-
<div class="row justify-content-center align-items-center mt-5 gy-3 text-center gx-5">
31+
<div class="row justify-content-center align-items-center mt-5 gy-3 text-center gx-sm-5">
3232
<div class="col-md-auto">
3333
</div>
3434
</div>
3535
</div>
3636

3737
<!-- Cards -->
3838
<div class="container pb-5">
39-
<div class="row g-5" id="features-container" hx-get="/home/loadFeatures" hx-trigger="load"
39+
<div class="row gy-3 gy-sm-5 gx-sm-5" id="features-container" hx-get="/home/loadFeatures" hx-trigger="load"
4040
hx-target="#features-container" hx-swap="innerHTML">
4141
<!-- Features will be loaded here via HTMX -->
4242
</div>
4343
</div>
4444

4545
<!-- Latest blogs -->
46-
<div class="pt-5 blog-main">
46+
<div class="pt-5 px-2 blog-main">
4747
<h1 class="text-center fw-bold fs-60">Latest Blog Posts</h1>
4848
<div class="swiper py-5 blogSwiper h-max">
4949
<div class="swiper-wrapper" id="blogs-container" hx-get="/home/loadBlogs" hx-trigger="load"
@@ -94,11 +94,11 @@
9494
</p>
9595
</div>
9696
<!-- Swiper container -->
97-
<div class="col-12 pb-5 testimonialsSwiper swiper">
97+
<div class="col-12 pb-5 px-2 testimonialsSwiper swiper">
9898
<div class="w-100 gap-lg-5 gap-0 swiper-wrapper">
9999
<cfloop query="testimonials">
100100
<div class="d-flex row swiper-slide">
101-
<div class="col-lg-3 col-12">
101+
<div class="col-lg-3 col-12 pb-2 pb-sm-0">
102102
<img src="#len(testimonials.logoPath) gt 0 ? testimonials.logoPath : '/images/testi.png'#" class="img-fluid" alt="#encodeForHtml(testimonials.companyName)#" style="width: 330px; height: 290px;">
103103
</div>
104104
<div class="col-lg-9 col-12">

app/views/web/NewsController/index.cfm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<main class="main-bg">
2-
<div class="container py-5">
2+
<div class="container py-5 word-break">
33

44
<!-- Filter Buttons -->
55
<div class="d-flex justify-content-center flex-wrap align-items-center gap-4">

public/javascripts/custom.js

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,34 @@
1-
var swiper = new Swiper(".blogSwiper", {
2-
spaceBetween: 30,
3-
freeMode: true,
4-
// autoHeight: true,
5-
initialSlide: 1,
6-
slidesOffsetBefore: 250,
7-
breakpoints: {
8-
640: {
9-
slidesPerView: 1,
10-
spaceBetween: 10,
11-
},
12-
768: {
13-
slidesPerView: 2,
14-
spaceBetween: 20,
15-
},
16-
1024: {
17-
slidesPerView: 3,
1+
let swiperInstance = null;
2+
3+
function initSwiper() {
4+
if (window.innerWidth >= 768 && !swiperInstance) {
5+
swiperInstance = new Swiper(".blogSwiper", {
186
spaceBetween: 30,
19-
},
20-
},
21-
});
7+
freeMode: true,
8+
initialSlide: 1,
9+
slidesOffsetBefore: 250,
10+
breakpoints: {
11+
768: {
12+
slidesPerView: 2,
13+
spaceBetween: 20,
14+
},
15+
1024: {
16+
slidesPerView: 3,
17+
spaceBetween: 30,
18+
},
19+
},
20+
});
21+
} else if (window.innerWidth < 768 && swiperInstance) {
22+
swiperInstance.destroy(true, true);
23+
swiperInstance = null;
24+
}
25+
}
26+
27+
// Initialize on load
28+
window.addEventListener("load", initSwiper);
29+
// Re-initialize on resize
30+
window.addEventListener("resize", initSwiper);
31+
2232

2333
var contributorsSwiperThumb = new Swiper(".contributorsSwiperThumb", {
2434
spaceBetween: 0,

public/stylesheets/style.css

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,4 +374,20 @@ main.main-bg {
374374

375375
.comment-wrapper .ql-hidden{
376376
display: none !important;
377+
}
378+
379+
@media (max-width: 768px) {
380+
.hero-section {
381+
padding: 4rem 0 1rem;
382+
}
383+
.icon-container {
384+
display: none !important;
385+
}
386+
.h-sm-400{
387+
height: 400px !important;
388+
}
389+
.feature-blog{
390+
background-position: right !important;
391+
background-size: auto !important;
392+
}
377393
}

public/stylesheets/utils.css

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,4 +266,8 @@
266266
.w-25-col { width: 25%; }
267267
.w-35-col { width: 35%; }
268268
.w-20-col { width: 20%; }
269-
.w-5-col { width: 5%; }
269+
.w-5-col { width: 5%; }
270+
271+
.word-break{
272+
word-break: break-word;
273+
}

0 commit comments

Comments
 (0)