Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

website icon, activity page edit(#17) #17

Merged
merged 5 commits into from
Feb 19, 2024
Merged

website icon, activity page edit(#17) #17

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bafccae
timelinePage_edit
JohnJung-1017 Feb 17, 2024
38bca88
media-query
JohnJung-1017 Feb 17, 2024
1c8db3c
timeline_feedback_edit
JohnJung-1017 Feb 18, 2024
788b9d7
icon_edit
JohnJung-1017 Feb 19, 2024
d27dcb2
Merge branch 'main' into timelineRepo_edit
SeHyun-Kim04 Feb 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion project-front/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<link rel="icon" href="%PUBLIC_URL%/img/Logo.png" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
Expand Down
12 changes: 6 additions & 6 deletions project-front/src/components/Sessions.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ const Sessions = () => {
</header>

<div className={customStyle2.screen_header__underline} />
<div className={customStyle2.screen_header}>
<div className={customStyle2.screen_header__text}>
<a className={customStyle2.screen_header__text_bold}>GDSC Kookmin Sessions List</a>
<a className={customStyle2.screen_header__text_thin}>
기술 파트별 소속 구성원이 매주 정해진 시간에 모여 세션을 진행합니다.
<br /> 각 세션은 Seminar에 참여 시 진행 상황이나 새로 배운 내용을 간단히
<div className={customStyle2.session_header}>
<div className={customStyle2.session_header__text}>
<a className={customStyle2.session_header__text_bold}>GDSC Kookmin Sessions List</a>
<a className={customStyle2.session_header__text_thin}>
📗기술 파트별 소속 구성원이 매주 정해진 시간에 모여 세션을 진행합니다.
<br /> 📗각 세션은 Seminar에 참여 시 진행 상황이나 새로 배운 내용을 간단히
공유합니다.
</a>
</div>
Expand Down
13 changes: 13 additions & 0 deletions project-front/src/components/Style/contact.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,17 @@
margin-top: 15px;
font-size: 20px;
}
}
@media screen and (max-width: 426px) {

.bx-graybx{
height: 10vh;
}
.bx-graybx-apply{
font-size: 5vw;
}
.bx-word1{
padding: 1vw;
font-size: 5vw;
}
}
120 changes: 102 additions & 18 deletions project-front/src/components/Style/page2.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,31 @@
}



.actBackground{
background: linear-gradient(90deg, #f4d455 45%, #7dfca9 80%);
background: linear-gradient(90deg, #FCBC05 45%, #119D5A 80%);
padding: 80px;
text-align: center;
width: auto;
height: 500px;
margin-top: 70px;
color: #595959;
}

/* -webkit-text-stroke-color: #119D5A;
-webkit-text-stroke-width: 2px;

text-shadow:
-2px -2px 5px whitesmoke,
2px -2px 5px whitesmoke,
-2px 2px 5px whitesmoke,
2px 2px 5px whitesmoke;
*/
.act{
margin-top: 50px;
margin-bottom: 50px;
font-size: 120px;
text-shadow:
-1px -1px 3px whitesmoke,
1px -1px 3px whitesmoke,
-1px 1px 3px whitesmoke,
1px 1px 3px whitesmoke;
font-weight: 1000;
-webkit-text-stroke-color: #fdfdfd;
-webkit-text-stroke-width: 4px;
}

.nav1{
Expand Down Expand Up @@ -62,9 +67,9 @@
text-shadow: 0 2px 4px rgba(0, 0, 0, 0.5);
}
@media screen and (max-width: 768px) {
.greenBox {
.actBackground {
padding: 40px;
height: auto;
height: 60vh;
}

.act {
Expand All @@ -84,6 +89,28 @@
font-size: 30px;
}
}
@media screen and (max-width: 426px) {
.actBackground{
height: 45vh;
}
.act{
font-size: 15vw;
margin-bottom: 0;
-webkit-text-stroke-color: white;
-webkit-text-stroke-width: 2px;
}
.nav__link{
display: flex;
flex-direction: row;
justify-content: center;
}
.nav__linkS1,
.nav__linkS2,
.nav__linkE {
font-size: 5vw;
}

}

/* Seminars Page */

Expand Down Expand Up @@ -111,7 +138,7 @@
}
.seminar_p{
margin-top: 30px;
margin-left: 100px;
margin-left: 15vw;
line-height: 2.0;
font-weight: bolder;
color: #595959;
Expand Down Expand Up @@ -158,7 +185,7 @@
margin-right : auto;
margin-top:40px;
}
.seminar-previous__text{
.seminar_previous__text{
font-size: 25px;
font-weight: 600;
text-decoration: none;
Expand Down Expand Up @@ -199,9 +226,46 @@
.box__explain {
font-size: 2vw;
}

.seminar_previous{
height: 8vh;
width: 13vw;
}
.seminar_previous__text{
font-size: 1.8vw;
}
}

@media screen and (max-width: 720px) {
.container__box{
height: 10vh;
}
.seminar_previous{
display: flex;
flex-direction: column;
justify-content: center;
height: 5vh;
width: 30vw;
margin-top: 2vh;
}
.seminar_previous__text{
font-size: 2.5vh;
}
}
@media screen and (max-width: 500px) {
.box__title{
font-size: 4.5vw;
}
.box__explain{
font-size: 3vw;
}
.container .container__box:nth-child(2) {
height: 18vh;
}
.container .container__box:nth-child(3) {
height: 15vh;
}

}
/* Session Page */
.session_header {
margin-top: 20px;
Expand Down Expand Up @@ -255,8 +319,10 @@
background-color: #119D5A;
}
.session_text__a{
-webkit-text-stroke-color: #119D5A;
-webkit-text-stroke-color: #0c683b;
-webkit-text-stroke-width: 2px;
text-decoration: none;
color: white;
}
.session_repo {
margin-left: 250px;
Expand All @@ -283,25 +349,38 @@
.session_year__text{
color: white;
padding-left: 50px;
margin-left: 200px;
text-decoration: none;
font-weight: 600;
}
@media screen and (max-width: 1111px) {
.session_header__text{
display: flex;
justify-content: center;
padding-left: 0;
margin-left: 10vw;
}
.session_circle{
margin-top: 20px;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.session_text{
border-radius: 0%;
.session_text{
width: 50vw;
height: 30vh;
margin-bottom: 10px;
border-radius: 10vh;
font-size: 7vw;
}
.session_repo{
margin-left: 10vw;
}
}
@media screen and (max-width:440px) {
.session_text{
height: 15vh;
}

}

.expect_text {
Expand All @@ -323,4 +402,9 @@
margin-bottom: 30px;
font-weight: bold;
color: #595959;
}
@media screen and (max-width: 768px) {
.expect_text{
margin-left: 0;
}
}
92 changes: 47 additions & 45 deletions project-front/src/components/Style/timeline.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,64 +2,66 @@

.timeline{
color: #4285F5;
font-size: 60px;
font-size: 4vw;
font-weight: bolder;
text-decoration: none;
margin-left: 30vh;
margin-left: 20vh;
margin-top: 10vh;
margin-bottom: 70px;
margin-bottom: 5vh;
}
.timeline__Data{
margin-left: 40vh;
font-size: 25px;
text-decoration: none;
font-weight: bold;
margin-bottom: 20px;
}
.nameData {
width: 75px;
display: inline-block;
justify-content: center;
.commit_list{
font-size: 2vw;
}
.repositoryData {
display: inline-block;
background-color: #4285F5;
width: 200px;
height: 35px;
display: inline-block;
border-radius: 7px;
text-decoration: none;
.commit{
color: rgb(100, 100, 100);
display: flex;
margin-left: 20vh;
}
a {
.commit_link{
text-decoration: none;
color: white;
font-weight: bold;
margin-left: 40px;
color: white;
background-color: #4285F5;
border-radius: 15px;
width: 17vw;
}
.commit_link:hover{
background-color: #184fac;
}
.commit_time{
color: rgb(57, 57, 57);
display: flex;
margin-left: 22vh;
}

@media screen and (max-width: 768px) {
.timeline {
font-size: 40px;
margin-left: 10px;
font-size: 6vw;
display: flex;
}
.commit_list{
padding: 1.0vh;
}

.timeline__Data {
margin-left: 10px;
font-size: 18px;
.commit{
font-size: 2.5vw;
}

.nameData {
text-align: center;
margin-bottom: 10px;
width: 55px;
}
@media screen and (max-width: 426px) {
.timeline{
margin-top: 5vh;
margin-bottom: 2vh;
font-size: 8vw;
display: flex;
margin-left: 5vw;
}

.repositoryData {
margin-top: 10px;
width: 110px;
height: 25px;
.commit_list{
display: flex;
flex-direction: column;
}

a {
margin-left: 10px;
.commit,.commit_time{
display: flex;
margin-left: 3.8vw;
font-size: 3vw;
font-weight: bold;
}

}
2 changes: 1 addition & 1 deletion project-front/src/pages/ContactPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const ContactPage = () => {
<div className={style['bx-graybx']}>
<a className={style['bx-graybx-apply']}>지원하기</a>
</div>
<a className={style['bx-word1']}>GDSC Kookmin 에 궁금한 점이 있으시면 아래 메일로 문의 주시기 바랍니다.</a>
<a className={style['bx-word1']}>GDSC Kookmin에 궁금한 점이 있으시면 아래 메일로 문의 주시기 바랍니다.</a>
<a className={style['bx-word2']}>
gdsc.kookmin@gmail.com
</a>
Expand Down
Loading