From 4578c880cd54d759a2a1680562040dc09c546954 Mon Sep 17 00:00:00 2001 From: quarkum-0 <122341624+quarkum-0@users.noreply.github.com> Date: Sun, 12 Jan 2025 21:38:47 +0530 Subject: [PATCH 1/7] Fixed Footer UI for smaller devices --- _includes/footer.html | 290 +++++++++++++++++++++--------------------- 1 file changed, 143 insertions(+), 147 deletions(-) diff --git a/_includes/footer.html b/_includes/footer.html index 5d0946b2..dfc96a4a 100755 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,5 +1,5 @@ - + -/* Responsive Adjustments */ -@media (max-width: 768px) { - .widget { - text-align: center; - margin-bottom: 2rem; - } - - .footerHeaderStyle { - margin-bottom: 1rem; - } - - .social-icons-container { - margin-top: 1rem; - } + + + + -@media (max-width: 576px) { - footer { - padding: 1rem 0; - } + + + + + \ No newline at end of file From 7cb8783539cddc4bdf3e7609055b5b339775fc4b Mon Sep 17 00:00:00 2001 From: quarkum-0 <122341624+quarkum-0@users.noreply.github.com> Date: Mon, 13 Jan 2025 20:25:09 +0530 Subject: [PATCH 3/7] Fixed #635 --- _includes/footer.html | 61 ++++++++++++++++++++++++++++++++++++++++--- css/airspace.css | 13 ++++++--- 2 files changed, 66 insertions(+), 8 deletions(-) diff --git a/_includes/footer.html b/_includes/footer.html index dd19949c..ca25dbf1 100755 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -4,7 +4,7 @@
@@ -14,7 +14,7 @@
- Sugar Labs® is a registered USA 501(c)(3) tax-exempt, not-for-profit organization, supported by our generous contributors and sponsors. + Sugar Labs® is a registered USA 501(c)(3) tax-exempt, not-for-profit organization, supported by our generous contributors and sponsors.

Donate or Volunteer today! @@ -26,9 +26,10 @@

Sugar Labs

+
+
+

Resources

+ +
+
+

Development

+
@@ -248,7 +297,11 @@

thirtyPercentOfPage) { $('#scrollToTopBtn').fadeIn(); +<<<<<<< Updated upstream } +======= + } +>>>>>>> Stashed changes else { $('#scrollToTopBtn').fadeOut(); } diff --git a/css/airspace.css b/css/airspace.css index ef2e1cb8..7d64ee7d 100755 --- a/css/airspace.css +++ b/css/airspace.css @@ -990,8 +990,10 @@ footer .footer-manu ul li a:hover { text-align: center; } .widget_content{ - display:flex; - justify-content: center; + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: space-between; } .active .widget_content{ display: flex; @@ -1016,8 +1018,10 @@ footer .footer-manu ul li a:hover { } @media (min-width: 576px) { .grid-two-columns { - display: grid; - grid-template-columns: 1fr 1fr; /* Two equal-width columns */ + display: flex; + flex-direction: column; + align-items: center; + gap: 1rem; } } .listFont{ @@ -2570,6 +2574,7 @@ input.gsc-input, } .leftAlign{ text-align: left; + padding-left: 0; } .boxDownload2{ height: 670px; From cc40e01af1b1182fb469bd0a05e41de6d23cc13a Mon Sep 17 00:00:00 2001 From: quarkum-0 <122341624+quarkum-0@users.noreply.github.com> Date: Tue, 14 Jan 2025 19:27:03 +0530 Subject: [PATCH 4/7] Update footer.html --- _includes/footer.html | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/_includes/footer.html b/_includes/footer.html index ca25dbf1..2dfe4ba6 100755 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -29,34 +29,6 @@

Sugar Labs

 - -

- - -
-

Resources

-
@@ -297,11 +268,7 @@

thirtyPercentOfPage) { $('#scrollToTopBtn').fadeIn(); -<<<<<<< Updated upstream - } -======= } ->>>>>>> Stashed changes else { $('#scrollToTopBtn').fadeOut(); } From e42f4dfe27a5b03b38da3870b58bb7d2f92f94f0 Mon Sep 17 00:00:00 2001 From: quarkum-0 <122341624+quarkum-0@users.noreply.github.com> Date: Tue, 14 Jan 2025 20:42:43 +0530 Subject: [PATCH 5/7] Update footer.html --- _includes/footer.html | 87 ------------------------------------------- 1 file changed, 87 deletions(-) diff --git a/_includes/footer.html b/_includes/footer.html index 2dfe4ba6..efa47c67 100755 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -78,23 +78,6 @@

Development

- -
-

Development

- -
-
@@ -135,76 +118,6 @@

- - - From b15aee2850f84c63ae6c9d563419e3cc8477caa4 Mon Sep 17 00:00:00 2001 From: quarkum-0 <122341624+quarkum-0@users.noreply.github.com> Date: Tue, 14 Jan 2025 20:53:01 +0530 Subject: [PATCH 6/7] chore: Resolve merge conflicts --- _includes/footer.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/footer.html b/_includes/footer.html index efa47c67..372054ed 100755 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -108,8 +108,8 @@

- Copyright © 2024 Sugar Labs® available under the Creative Commons Attribution-ShareAlike 4.0 International License (CC BY-SA).
- Website design credit: Base template Airspace by Themefisher was used for this site. + Copyright © 2025 Sugar Labs® available under the Creative Commons Attribution-ShareAlike 4.0 International License (CC BY-SA).
+ Website design credit: Base template Airspace by Themefisher was used for this site.

From 52119220e7c4f8531a983fc3792b27ae9ea90b27 Mon Sep 17 00:00:00 2001 From: quarkum-0 <122341624+quarkum-0@users.noreply.github.com> Date: Sat, 18 Jan 2025 00:02:38 +0530 Subject: [PATCH 7/7] Refactor: empty last line --- _includes/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/footer.html b/_includes/footer.html index 372054ed..3e261ae3 100755 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -196,4 +196,4 @@

\ No newline at end of file +