Skip to content

Commit

Permalink
Fix misalignments and enhance responsiveness (#262)
Browse files Browse the repository at this point in the history
* Fix misalignments and enhance responsiveness

* fix the height positioning of the banner in all devices

* fix linter errors

* add designed by Flagrant text in the footer section
  • Loading branch information
fatmahussein authored Jan 7, 2025
1 parent 04f0354 commit 3604148
Show file tree
Hide file tree
Showing 9 changed files with 78 additions and 34 deletions.
2 changes: 1 addition & 1 deletion app/javascript/components/Thankyou.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import mike from '../../assets/images/mike.png';
const Thankyou = () => {
return (
<div className="thankyou">
<h2>Thank you to our Sponsors</h2>
<h2>Thank you to our Sponsor</h2>
<p>
We are immensely grateful to our sponsor for his generous support and commitment.
His invaluable contribution has been instrumental in helping us achieve our goals
Expand Down
9 changes: 9 additions & 0 deletions app/javascript/components/layout/Footer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,15 @@ const Footer = () => (
<i className="bi bi-linkedin"></i>
</a>
</div>
<p>
<span>Designed by </span>
<a
href="https://www.beflagrant.com/"
style={{ textDecoration: 'underline' }}
>
Flagrant
</a>
</p>
<p className="made-with-love">
Made with{' '}
<span role="img" aria-label="heart">
Expand Down
4 changes: 3 additions & 1 deletion app/javascript/components/pages/Home.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@ const Home = () => {
<SharedLayout>
<section className="hero-container mt-2rem">
<div className="work-in-progress">
<h1 className="font-besley text-lg">🚧 Website Redesign in Progress 🚧</h1>
<h1 className="font-besley text-base md:text-lg lg:text-lg">
🚧 Website Redesign in Progress 🚧
</h1>
<p className="font-besley text-base">
You might spot old branding, broken links, or other inconsistencies.
We&apos;re on it!
Expand Down
6 changes: 5 additions & 1 deletion app/javascript/stylesheets/footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ footer {
width: 100%;

.footer {
@apply container mx-auto max-w-6xl flex justify-between text-sm px-12 xl:px-0 py-8 md:py-20 flex-col md:flex-col border-t border-gray-100 md:border-t-0;
@apply container mx-auto max-w-6xl flex justify-between text-sm px-12 xl:px-0 py-8 md:py-20 flex-col md:flex-col border-t border-gray-100 md:border-t-0 xs:px-[1rem];
@media (min-width: 416px) and (max-width: 640px){
padding-left: 1rem;
}
color:#2e0880;

.first-div{
Expand Down Expand Up @@ -57,6 +60,7 @@ footer {
.button{
padding-top: 0.2rem;
padding-bottom: 0.2rem;
@apply xs:text-[13px];
}

.footer-right {
Expand Down
16 changes: 12 additions & 4 deletions app/javascript/stylesheets/hire.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,26 @@
padding: 2rem;
width: 80%;
margin: auto;
@apply text-wnbrb-blue-navy text-base font-rubik

@apply text-wnbrb-blue-navy text-base font-rubik xs:w-[100%];
@media (min-width: 416px) and (max-width: 640px){
width: 100%;
}
}
.hire h2{
@apply text-wnbrb-blue-navy text-4xl font-besley font-bold
@apply text-wnbrb-blue-navy text-4xl font-besley font-bold xs:text-2xl;
@media (min-width: 416px) and (max-width: 640px){
font-size: 1.8rem;
}
}
.grow{
text-align: center;
}
.hire-img{
border-radius: 30px;
height: 320px;
height: auto;
max-width: 100%;
margin-top: 2rem;
object-fit: cover;
object-fit: contain;
@apply lg:h-[320px] ;
}
66 changes: 41 additions & 25 deletions app/javascript/stylesheets/home.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,10 @@
padding: 0.5rem 1rem;
flex-direction: column;
font-weight: bold;
height: 10rem;
height: 8rem;
color: #2e0880;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
position: fixed;

@media (min-width: 768px) {
height: 5rem;
}
}
.hero {
@apply flex
Expand Down Expand Up @@ -60,19 +56,29 @@
}
.info {
background-color: #c6e6da;
padding-top: 18px;
@media (min-width: 768px) {
@media (min-width: 1025px) {
padding-top: 9px;
}
@media (min-width: 769px) and (max-width: 1024px){

padding-top: 13px;
padding-top: 18px;
}
@media (min-width: 1024px) {
@media (min-width: 641px) and (max-width: 768px) {

padding-top: 5px;
padding-top: 19px;
}
@media (min-width: 416px) and (max-width: 640px) {

padding-top: 25px;
}
@media (max-width: 416px) {
padding-top: 30px;
}
}
.info-layout {
padding-top: 5rem;
padding-bottom: 5rem;
padding-bottom: 3rem;
@apply sm:pb-[3rem] md:pb-[0rem] lg:pb-[5rem];
}
.info-card-section {
@apply mx-auto
Expand All @@ -99,9 +105,8 @@
}
.info-card-image{
border-radius: 20px;
height: 310px;
object-fit: cover;
max-width: 100%;
object-fit: contain;


@media (min-width: 768px) {

Expand All @@ -111,6 +116,7 @@
}
@media (min-width: 1024px) {
height: 270px;
object-fit: cover;
border-radius: 0;
border-top-right-radius: 20px;
border-bottom-right-radius: 20px;
Expand All @@ -130,11 +136,12 @@
color: white;
}
.bg-color-2 {
background-color: #b33c3c;
color: white;
background-color: #ffdd19;

}
.bg-color-3 {
background-color: #ffdd19;
background-color: #b33c3c;
color: white;
}
.line {
margin-top: -2.5rem;
Expand All @@ -148,7 +155,7 @@
grid-template-rows: auto;
padding-top: 4rem;
gap: 2rem;

@apply xs:pt-[3rem];

@media (min-width: 768px) {
grid-template-columns: 1fr 1fr;
Expand Down Expand Up @@ -263,14 +270,23 @@
}
.meetspeak{
background-color: #bfe444;
margin-top: -20px;

@media (min-width: 768px) {
margin-top: -26px;

@media (min-width: 1025px) {
margin-top: -33px;
}
@media (min-width:768px) and (max-width: 1024px){
margin-top: -27px;
}

@media (min-width: 641px) and (max-width: 768px){
margin-top: -23px;

@media (min-width: 1024px) {
margin-top: -32px;
}
@media (min-width: 416px) and (max-width: 640px) {

margin-top: -16px;
}
@media (max-width: 416px) {
margin-top: -12px;
}

}
4 changes: 3 additions & 1 deletion app/javascript/stylesheets/meetup.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
flex-direction: column;
gap: 2rem;
padding: 6rem 0;
@apply xs:py-[4rem];

@media (min-width: 768px) {
gap: 2rem;
Expand All @@ -52,12 +53,13 @@
background-color: #ffffe5;
display: flex;
flex-direction: column;
width: 70%;
width: 80%;
align-items: center;
padding: 2rem;
margin: auto;
padding-top: 0;
border-radius: 2rem;
@apply xs:w-[85%];

@media (min-width: 1024px) {
width: 35%;
Expand Down
1 change: 1 addition & 0 deletions app/javascript/stylesheets/thankyou.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
padding: 2rem;
gap: 2rem;
text-align: center;
@apply xs:text-left xs:px-[1.3rem];
}
.thankyou h2{
@apply text-4xl text-black font-besley font-bold
Expand Down
4 changes: 3 additions & 1 deletion tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ module.exports = {
presets: [],
theme: {
screens: {
sm: '640px',
xs: { max: '415px' },
sm: '640px',
md: '768px',
lg: '1024px',
xl: '1280px',
Expand Down Expand Up @@ -343,6 +344,7 @@ module.exports = {
],
},
fontSize: {
'13px': '13px',
xs: ['0.75rem', { lineHeight: '1rem' }],
sm: ['0.875rem', { lineHeight: '1.25rem' }],
base: ['1rem', { lineHeight: '1.5rem' }],
Expand Down

0 comments on commit 3604148

Please sign in to comment.