Skip to content

Commit

Permalink
Merge pull request #167 from super-waffle/footer
Browse files Browse the repository at this point in the history
[#123] feat: home/todays transition
  • Loading branch information
rosieyeon authored Feb 17, 2022
2 parents 25f1f4d + 01c621b commit 08d032f
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 21 deletions.
13 changes: 0 additions & 13 deletions src/components/footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,6 @@ export default function Footer() {
const logo = "../../images/logo-400.png";
return (
<footer className="footer">
{/* <div className="footer__contents">
<div className="footer__logo">
<img src={logo} alt=""></img>
</div>
<div className="footer__introduce">
<div>서비스</div>
<div></div>
</div>
<div className="footer__madeby">Creator</div>
<div>lorem</div>
</div> */}
<div className="footer__contents"></div>

<div className="footer__rights">
Expand Down
8 changes: 7 additions & 1 deletion src/statics/css/home/homeMeetings.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/statics/css/home/homeMeetings.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions src/statics/css/home/homeStudiesList.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/statics/css/home/homeStudiesList.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion src/statics/scss/home/homeMeetings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
position: relative;
width: 100%;
height: 0;
overflow: hidden;
// overflow: hidden;
padding-bottom: 72%;
& img {
position: absolute;
Expand All @@ -24,10 +24,17 @@
object-fit: cover;
margin: auto;
border-radius: 3px;
transition: all 0.2s linear;
}
& img:hover {
transform: scale(1.03);
box-shadow: 0px 0px 5px 1px rgba(104, 105, 172, 0.25);
transition: all 0.5s ease 0s;
}
}

.home-meeting-card__footer {
// margin-top: 10px;
display: flex;
}
.home-meeting-card__img__count {
Expand All @@ -39,6 +46,7 @@
}
}
.home-meetimg-card__title {
margin-top: 10px;
font-size: 16px;
font-weight: 500;
color: var(--textColor);
Expand Down
11 changes: 7 additions & 4 deletions src/statics/scss/home/homeStudiesList.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,17 @@
border: 1px solid var(--borderColor);
box-sizing: border-box;
border-radius: 10px;
// width: 100%;
height: 117px;
margin-bottom: 1%;
margin-top: 9px;
// margin-right: 15px;
padding: 1.1rem 1.5rem;
transition: all 0.2s linear;
overflow: hidden;
}
.home-study-box:hover {
transform: scale(1.03);
box-shadow: 0px 0px 5px 1px rgba(104, 105, 172, 0.25);
transition: all 0.5s ease 0s;
}

.home-study-box__top {
Expand All @@ -27,7 +32,6 @@
color: $mainColor;
font-size: 12px;
margin-right: 8px;
// text-align: center;
}
.home-study-box__top-title {
width: 45%;
Expand All @@ -37,7 +41,6 @@
margin-right: 16px;
text-overflow: ellipsis;
white-space: nowrap;
// font-weight: 400;
}
}
.home-study-box__time {
Expand Down

0 comments on commit 08d032f

Please sign in to comment.