Skip to content
This repository has been archived by the owner on Feb 22, 2024. It is now read-only.

Commit

Permalink
Merge pull request #38 from Yoochangmin/main
Browse files Browse the repository at this point in the history
[FE][창수] :: sign up, ranking css 작업
  • Loading branch information
Yoochangmin authored Nov 19, 2021
2 parents 226f177 + 1ed8ab0 commit f1fe942
Show file tree
Hide file tree
Showing 15 changed files with 845 additions and 98 deletions.
3 changes: 3 additions & 0 deletions account/static/css/header.css
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@
list-style: none;
color: black;
display: flex;
}
.navbar_icons li{

}
.navbar_icons li a img{
margin: 0 0.5vw 0 0.5vw;
Expand Down
2 changes: 1 addition & 1 deletion account/static/css/login.css
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ body {
height: 60px;
font-size: var(—-fonit20);
margin-top: 40px;
background-color: #CDF0FF; !important
background-color: #CDF0FF !important;
}
.sureLogin #button{
font-size: var(—-fonit20);
Expand Down
206 changes: 206 additions & 0 deletions account/static/css/signup.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,206 @@
@font-face {
font-family: 'IM_Hyemin-Bold';
src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/[email protected]/IM_Hyemin-Bold.woff2') format('woff');
font-weight: normal;
font-style: normal;
}

:root {
--maincolor: #CDF0FF; /*메인 색상*/
--font50: 50px; /*메인 폰트 사이즈*/
--font30: 30px;
--font15: 15px;
--fonit20: 20px;
}


.cloud1 {
position: absolute;
top: 40px;
left: 100px;
}

.cloud2 {
position: absolute;
top: 400px;
left: 1650px;
}

body {
font-family: 'IM_Hyemin-Bold';
font-weight: normal;
font-style: normal;
margin: 0;
background-color: var(--maincolor);
}

.containnerLayout {
display: grid;
grid-template-areas: 'upLayout upLayout upLayout'
'LMarginLayout LoginLayout RMarginLayout'
'underLayout underLayout underLayout';
grid-template-columns: 1fr 819px 1fr;
grid-template-rows: 40px 1000px 40px;
}

.containnerLayout div {
display: grid;
}

.upLayout {

grid-area: upLayout;
background-color: #CDF0FF;

}

.LMarginLayout {
grid-area: LMarginLayout;
background-color: #CDF0FF;
}

.LoginLayout {
grid-area: LoginLayout;
background-color: #ffffff;
border-radius: 180px;
z-index: 1;
justify-content: center;
align-content: center;
}

.RMarginLayout {
grid-area: RMarginLayout;

}

.underLayout {
grid-area: underLayout;
}

.LoginCenter {
width: 528px;
height: 662px;
padding: 10px;
}
.LoginLayout .LoginCenter .logo{



}
.LoginLayout .LoginCenter .logo img{
height: 100px;

}
.logo {
height: 120px;
font-family: 'Monospace', sans-serif;
font-size: var(--font50);
border-bottom: black 3px solid;

}

.membership {
font-size: var(--font50);
position: relative;
top: 10px;
}

.membership_under {
font-size: var(--font15);
position: relative;
left: 20px;

}

.email {
position: relative;
top: 20px;
font-size: var(--font30);
margin-bottom: 20px;
margin-top: 20px;

}

.submit {
font-size: var(--font30);
}

.check {
font-size: var(--font15);
}

.loginbutton {
font-size: var(--font15);
}

.email_bar {
border: 3px solid rgba(33, 33, 33, .5);
width: 100%;
border-radius: 20px;
height: 60px;
display: flex;
justify-content: center;
align-content: center;
font-size: var(--fonit20);
}

.email_submit_bar {
width: 100%;
display: flex;
justify-content: center;
align-content: center;
border: 3px solid rgba(33, 33, 33, .5);
border-radius: 20px;
height: 60px;
font-size: var(--fonit20)

}

.email_submit {
display: flex;
margin-top: 20px;
margin-bottom: 20px;

}

.undercontent {
display: flex;
justify-items: center;
align-items: center;
font-size: var(--font15);
padding: 5px;
height: 100px;
margin-top: 40px;


}

.sureLogin {
width: 100%;
display: flex;
justify-content: center;
align-content: center;
vertical-align: middle;
border: 3px solid rgba(33, 33, 33, .5);
border-radius: 50px;
height: 60px;
font-size: var(—-fonit20);
margin-top: 40px;
background-color: #CDF0FF !important;
}
.sureLogin #button{
font-size: var(—-fonit20);
background-color: #CDF0FF;
border:none;
width: 612px;
border-radius: 50px;
height: 60px;
font-family: 'IM_Hyemin-Bold';
}
.undercontent #join a{
text-decoration: none; /* 링크의 밑줄 제거 */
color: inherit; /* 링크의 색상 제거 */
}
form{
margin-top: 10px;
}
58 changes: 40 additions & 18 deletions account/templates/signup.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,47 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
<title>signup</title>
<link rel ="stylesheet" href=" {% static 'css/signup.css' %}">
</head>
<body>
<form method = "POST" action = "{%url 'signup'%}" enctype="multipart/form-data">
{%csrf_token%}
<input type = "text" name = "username" placeholder="아이디를 입력하세요">{{error}}<br>
<input type = "text" name = "real_name" placeholder="이름을 입력하세요"><br>
<input type = "email" name = "email" placeholder="이메일을 입력하세요"><br>
<input type = "text" name = "uni_num" placeholder="학번을 입력하세요"><br>
<input type = "password" name = "password" placeholder="비밀번호를 입력하세요"><br>
<input type = "password" name = "password2" placeholder="비밀번호를 한 번 더 입력하세요"><br>
<select name = "status">
<option value = "" disabled>직위선택</option>
<option value = "학부생">학부생</option>
<option value = "관리자">관리자</option>
</select><br>
<p>학생증을 올려주세요.
<input type = "file" name = "card"></p>
<button>회원가입 신청</button>
</form>
<div class="containnerLayout">
<div class="upLayout"></div>
<div class="LMarginLayout"></div>

<div class="LoginLayout">
<div class="LoginCenter">
<div class="logo">
<img src = "{% static 'img/logo.png' %}" alt ="logo">
</div>
<div class="membership">회원가입</div>


<form method = "POST" action = "{%url 'signup'%}" enctype="multipart/form-data">
{%csrf_token%}
<input class="email_submit_bar" type = "text" name = "username" placeholder="아이디를 입력하세요">{{error}}<br>
<input class="email_submit_bar" type = "text" name = "real_name" placeholder="이름을 입력하세요"><br>
<input class="email_submit_bar" type = "email" name = "email" placeholder="이메일을 입력하세요"><br>
<input class="email_submit_bar" type = "text" name = "uni_num" placeholder="학번을 입력하세요"><br>
<input class="email_submit_bar" type = "password" name = "password" placeholder="비밀번호를 입력하세요"><br>
<input class="email_submit_bar" type = "password" name = "password2" placeholder="비밀번호를 한 번 더 입력하세요"><br>
<select name = "status">
<option value = "" disabled>직위선택</option>
<option value = "학부생">학부생</option>
<option value = "관리자">관리자</option>
</select><br>
<p>학생증을 올려주세요.
<input type = "file" name = "card"></p>
<button id="submit">회원가입 신청</button>
</form>

<div class="undercontent">
<div class="loginbutton" id ="join"><a href ={% url 'signup' %}>회원가입</a></div>
</div>
</div>
</div>
<div class="RMarginLayout"></div>
<div class="underLayout"></div>
</div>
</body>
</html>
35 changes: 34 additions & 1 deletion school/static/css/home.css
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,41 @@ background-color: #CDF0FF;
height: 100%;
width: 100%;
border-radius: 44px;
display:block;
}
.content_board{
.content_board{
width: 560px;
height: 402px;
}
.test{
display: flex;
}
.plz{
margin-left:34px;
margin-top:34px;
font-size: var(--font30);
}
#more{
margin-left: auto;
margin-right:34px;
font-size: var(--font30);
}
#atag{
margin-top:20px;
margin-left: 10px;
margin-right: 10px;
line-height: -10px;

}
#board_name{
display: flex;

}
#atag{
background-color: white;
height: 50px;
}
#header{
display: flex;
flex-direction: column;
}
Loading

0 comments on commit f1fe942

Please sign in to comment.