Skip to content

Commit

Permalink
Merge pull request #14 from PBTP/styles/tablet
Browse files Browse the repository at this point in the history
[styles]: phone and tablet responsive styles
  • Loading branch information
VictoryJu authored May 25, 2024
2 parents 7a3d4a9 + e8f9d22 commit 1e63e8d
Show file tree
Hide file tree
Showing 10 changed files with 62 additions and 62 deletions.
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@import "/src/styles/responsive.scss";
@import '/src/styles/responsive.scss';

.AllianceBenefitWrapper {
padding: 116px 176px;
background-color: #688edc;

@include media(phone) {
@include media(phone, tablet) {
padding: 40px 20px;
}

Expand All @@ -15,7 +15,7 @@
font-weight: 700;
line-height: 30px;

@include media(phone) {
@include media(phone, tablet) {
font-size: 17px;
font-weight: 600;
line-height: 24px;
Expand All @@ -30,7 +30,7 @@
line-height: 48px;
margin-top: 30px;

@include media(phone) {
@include media(phone, tablet) {
font-size: 24px;
font-weight: 700;
line-height: 32px;
Expand All @@ -46,7 +46,7 @@
justify-content: center;
gap: 20px;

@include media(phone) {
@include media(phone, tablet) {
flex-direction: column;
margin-top: 40px;
gap: 24px;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@import "/src/styles/responsive.scss";
@import '/src/styles/responsive.scss';

.AllianceContactWrapper {
background-color: #fefdee;
padding: 120px 0px 100px 0px;

@include media(phone) {
@include media(phone, tablet) {
padding: 80px 20px 60px;
}

Expand All @@ -17,7 +17,7 @@
font-size: 22px;
line-height: 30px;

@include media(phone) {
@include media(phone, tablet) {
font-size: 17px;
font-weight: 600;
line-height: 24px;
Expand All @@ -29,7 +29,7 @@
font-size: 36px;
line-height: 48px;

@include media(phone) {
@include media(phone, tablet) {
font-size: 24px;
line-height: 32px;
}
Expand All @@ -44,7 +44,7 @@
margin-top: 80px;
max-width: 460px;

@include media(phone) {
@include media(phone, tablet) {
margin-top: 48px;
}

Expand Down Expand Up @@ -83,7 +83,7 @@
grid-row-gap: 16px;
grid-template-columns: repeat(3, minmax(0, 1fr));

@include media(phone) {
@include media(phone, tablet) {
grid-template-columns: repeat(2, minmax(0, 1fr));
}

Expand Down Expand Up @@ -141,7 +141,7 @@
line-height: 32px;
transition: background-color 0.3s;

@include media(phone) {
@include media(phone, tablet) {
margin-top: 48px;
font-size: 17px;
font-weight: 600;
Expand Down
24 changes: 12 additions & 12 deletions src/components/Alliance/AllianceMain/AllianceMain.module.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@import "/src/styles/responsive.scss";
@import '/src/styles/responsive.scss';

.AllianceMainWrapper {
padding: 60px 176px;

@include media(phone) {
@include media(phone, tablet) {
padding: 0px 20px;
}

Expand All @@ -14,7 +14,7 @@
font-weight: 700;
line-height: 30px;

@include media(phone) {
@include media(phone, tablet) {
font-size: 17px;
font-weight: 600;
line-height: 24px;
Expand All @@ -29,7 +29,7 @@
line-height: 48px;
margin-top: 30px;

@include media(phone) {
@include media(phone, tablet) {
font-size: 24px;
font-weight: 700;
line-height: 32px;
Expand All @@ -45,7 +45,7 @@
line-height: 32px;
margin-top: 60px;

@include media(phone) {
@include media(phone, tablet) {
font-size: 14px;
font-weight: 400;
line-height: 20px;
Expand All @@ -60,7 +60,7 @@
display: flex;
justify-content: space-between;

@include media(phone) {
@include media(phone, tablet) {
flex-direction: column;
gap: 40px;
}
Expand All @@ -75,7 +75,7 @@
font-weight: 700;
line-height: 32px;

@include media(phone) {
@include media(phone, tablet) {
flex-direction: column-reverse;
//gap 값 다시 받아야함
gap: 24px;
Expand All @@ -94,7 +94,7 @@
> .AllianceMainScheduleContent {
margin-top: 60px;

@include media(phone) {
@include media(phone, tablet) {
display: flex;
flex-direction: column-reverse;
margin-top: 40px;
Expand All @@ -105,7 +105,7 @@
justify-content: center;
gap: 36px;

@include media(phone) {
@include media(phone, tablet) {
display: flex;
flex-direction: column;
gap: 24px;
Expand All @@ -120,7 +120,7 @@
line-height: 32px;
margin-top: 32px;

@include media(phone) {
@include media(phone, tablet) {
font-size: 17px;
font-weight: 600;
line-height: 24px;
Expand All @@ -137,7 +137,7 @@
gap: 90px;
margin-top: 85px;

@include media(phone) {
@include media(phone, tablet) {
flex-direction: column;
gap: 24px;
margin-top: 40px;
Expand All @@ -150,7 +150,7 @@
font-weight: 400;
line-height: 32px;

@include media(phone) {
@include media(phone, tablet) {
font-size: 17px;
font-weight: 600;
line-height: 24px;
Expand Down
6 changes: 3 additions & 3 deletions src/components/Layout/Footer/Footer.module.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@import "/src/styles/responsive.scss";
@import '/src/styles/responsive.scss';

.FooterWrapper {
background-color: #fff;
padding: 60px 176px;
color: #535961;

@include media(phone) {
@include media(phone, tablet) {
padding: 24px 20px;
}

Expand Down Expand Up @@ -52,7 +52,7 @@
display: flex;
gap: 16px;

@include media(phone) {
@include media(phone, tablet) {
font-size: 11px;
font-weight: 500;
line-height: 16px;
Expand Down
6 changes: 3 additions & 3 deletions src/components/Layout/Layout.module.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
@import "./src/styles/responsive.scss";
@import './src/styles/responsive.scss';
.LayoutContainer {
@include media(phone) {
@include media(phone, tablet) {
background: #fefdee;
}

> .LayoutMobileApplyLink {
display: none;
@include media(phone) {
@include media(phone, tablet) {
display: block;
position: fixed;
bottom: 34px;
Expand Down
16 changes: 8 additions & 8 deletions src/components/Layout/Nav/Nav.module.scss
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
@import "/src/styles/theme.scss";
@import "/src/styles/responsive.scss";
@import '/src/styles/theme.scss';
@import '/src/styles/responsive.scss';

.NavContainer {
width: 100%;

background: #f6f4dc;
@include media(phone) {
@include media(phone, tablet) {
background: #fefdee;
}
.NavWrapper {
max-width: 1200px;
margin: 0 auto;
display: flex;
align-items: center;
@include media(phone) {
@include media(phone, tablet) {
display: flex;
justify-content: space-between;
padding: 20px;
Expand All @@ -23,7 +23,7 @@
.MenuWrapper {
margin-left: 50px;
width: 100%;
@include media(phone) {
@include media(phone, tablet) {
width: auto;
margin-left: 0;
}
Expand All @@ -37,7 +37,7 @@
align-items: center;
li:nth-child(2) {
margin-left: 53px;
@include media (phone) {
@include media(phone) {
margin-left: 0;
}
}
Expand All @@ -46,7 +46,7 @@
cursor: pointer;
font-size: 24px;
font-weight: 400;
@include media(phone) {
@include media(phone, tablet) {
font-size: 14px;
font-weight: 600;
}
Expand All @@ -58,7 +58,7 @@
background-color: $primary;
color: #fff;
margin-right: 30px;
@include media(phone) {
@include media(phone, tablet) {
display: none;
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
@import "./src/styles/responsive.scss";
@import './src/styles/responsive.scss';

.LendingFlexContent {
width: 100%;
display: flex;
justify-content: space-between;
@include media(phone) {
@include media(phone, tablet) {
display: block;
}

}

.Header {
Expand All @@ -17,7 +16,7 @@
line-height: 68px;
margin-bottom: 24px;

@include media(phone) {
@include media(phone, tablet) {
font-size: 24px;
line-height: 32px; /* 133.333% */
}
Expand All @@ -27,8 +26,8 @@
color: #000;
font-size: 24px;
line-height: 32px;
@include media(phone) {

@include media(phone, tablet) {
> div {
font-size: 14px;
font-style: normal;
Expand All @@ -39,8 +38,8 @@
}

.Image {
display: block;
@include media(phone) {
display: block;
@include media(phone, tablet) {
display: none;
}
}
}
Loading

0 comments on commit 1e63e8d

Please sign in to comment.