diff --git a/account/static/css/header.css b/account/static/css/header.css index 37629c3..5109cd8 100644 --- a/account/static/css/header.css +++ b/account/static/css/header.css @@ -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; diff --git a/account/static/css/login.css b/account/static/css/login.css index aaf75f3..4a80dc7 100644 --- a/account/static/css/login.css +++ b/account/static/css/login.css @@ -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); diff --git a/account/static/css/signup.css b/account/static/css/signup.css new file mode 100644 index 0000000..ee2917e --- /dev/null +++ b/account/static/css/signup.css @@ -0,0 +1,206 @@ +@font-face { + font-family: 'IM_Hyemin-Bold'; + src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_2106@1.1/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; +} diff --git a/account/templates/signup.html b/account/templates/signup.html index 54e7ef6..e2011d8 100644 --- a/account/templates/signup.html +++ b/account/templates/signup.html @@ -5,25 +5,47 @@ - Document + signup + -
- {%csrf_token%} - {{error}}
-
-
-
-
-
-
-

학생증을 올려주세요. -

- -
+
+
+
+ +
+
+ +
회원가입
+ + +
+ {%csrf_token%} + {{error}}
+
+
+
+
+
+
+

학생증을 올려주세요. +

+ +
+ +
+ +
+
+
+
+
+
\ No newline at end of file diff --git a/school/static/css/home.css b/school/static/css/home.css index 47506bc..cdaaac3 100644 --- a/school/static/css/home.css +++ b/school/static/css/home.css @@ -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; } \ No newline at end of file diff --git a/school/static/css/rank.css b/school/static/css/rank.css new file mode 100644 index 0000000..ea3bc6a --- /dev/null +++ b/school/static/css/rank.css @@ -0,0 +1,128 @@ +@font-face { + font-family: 'IM_Hyemin-Bold'; + src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_2106@1.1/IM_Hyemin-Bold.woff2') format('woff'); + font-weight: normal; + font-style: normal; +} +html{ + height: 100vh; + width: 100vw; + overflow: auto; + } + :root{ + --maincolor: #CDF0FF; /*메인 색상*/ + --font50: 50px; /*메인 폰트 사이즈*/ + --font30:30px; + --font15: 15px; + --fonit20:20px; + --font40:40px; + + } + + .containner { + display: grid; + grid-template-areas: + 'marginL header marginR' + 'marginL main marginR' + 'marginL undermargin marginR'; + + grid-template-columns: 1fr 1200px 1fr; /*세로 좌:300px고정 가운데 1fr: 유동식 우 300px 고정*/ + grid-template-rows: 90px 160px 1fr 140px; /*가로 */ + } + .containner div { + display: grid; + + } + + .header { + grid-area: header; + } + + .marginL { + grid-area: marginL; + } + + .main { + grid-area: main; + } + + .marginR { + grid-area: marginR; + height: 100vh; + } + + .undermargin { + grid-area: undermargin; + } +#top{ + width: 1200px; + height: 65px; + background-color: #CDF0FF; + +} + +#top ul{ + justify-content: space-between; +} +.rank{ + margin-top: 10px; +} + +#top ul li{ + align-items: center; + display:inline-block; +} +#top ul #rank{ + margin-left: 0px; +} +#top ul #info{ + margin-left: 148px; +} +#top ul #point{ + margin-left: 226px; + +} +#top ul #level{ + margin-left: 239px; +} +#top ul #grade{ + margin-left: 239px; +} + +.rank{ + width: 1200px; + height: 110px; + background-color: #CDF0FF; + +} + +.rank ul{ + justify-content: space-between; +} + + +.rank ul li{ + align-items: center; + display:inline-block; +} +.rank ul #rank{ + margin-left: 0px; +} +.rank ul #info{ + margin-left: 148px; +} +.rank ul #info img{ + + border-radius: 45px; + background-color: white; +} +.rank ul #point{ + margin-left: 226px; + +} +.rank ul #level{ + margin-left: 239px; +} +.rank ul #grade{ + margin-left: 239px; +} \ No newline at end of file diff --git a/school/templates/home.html b/school/templates/home.html index bbea469..5ec7035 100644 --- a/school/templates/home.html +++ b/school/templates/home.html @@ -6,66 +6,91 @@ {%block content%} - -
-
-
-
-
-
- - 자유 게시판 - 스터디 게시판 - 공모전 게시판 - 졸업생 게시판 - 동아리 게시판 - -
+ +
+
+
+
+
+
+ + 자유 게시판 + 스터디 게시판 + 공모전 게시판 + 졸업생 게시판 + 동아리 게시판 +
-
-
- - - + + + + + + + + + + + + + + + + + +
- {%for a in notices%} - +
+
+ + + + - - + + + - - - - - - + + + + + + + - - - - - - - - - - - - - - - -
+ +
+
+
+ +
+ {% for a in notices %} + + {% endfor %} +
- {%endfor%} -
2
 +
2
+
+
+
+ 		+
+
+
+ 		+
+
-
+
-
+
-
+
{% endblock %} \ No newline at end of file diff --git a/school/templates/rank.html b/school/templates/rank.html index c16ae70..b76b4b6 100644 --- a/school/templates/rank.html +++ b/school/templates/rank.html @@ -1,22 +1,42 @@ - - - - - - - Document - - +{%extends 'base.html'%} +{% load static %} + +{%block title%}rank{%endblock%} +{%block link%}{%static 'css/rank.css'%}{%endblock%} -

통합 차트

+{%block content%} +
+
+
+ +
+ +
+ +
+ +
+
+
+

통합 차트

+ + - - \ No newline at end of file + {% endblock %} diff --git a/static/css/check.css b/static/css/check.css new file mode 100644 index 0000000..b653b89 --- /dev/null +++ b/static/css/check.css @@ -0,0 +1,49 @@ +:root { + --maincolor: #CDF0FF; /*메인 색상*/ + --font50: 50px; /*메인 폰트 사이즈*/ + --font30: 30px; + --font15: 15px; + --fonit20: 20px; +} + +.gridContainner{ + display: grid; + + grid-template-areas: + 'LMarginLayout main RMarginLayout'; + grid-template-rows: auto; + grid-template-columns: 1fr 1200px 1fr; +} + +.LMarginLayout{ + grid-area: LMarginLayout; +} +.RMarginLayout{ + grid-area: RMarginLayout; +} + +.upmargin{ + height: 60px; +} +.undermargin{ + height: 60px; +} +.bc{ + display: flex; + background-color: var(--maincolor); + border-radius: 60px; + flex-direction: column; + justify-content: center; + padding: 30px; +} +tr td{ + padding-bottom: 30px; + border: white 2px solid; + vertical-align: center; + justify-items: center; +} + +table{ + border: white 2px solid; + border-radius: 60px; +} \ No newline at end of file diff --git a/static/css/check_detail.css b/static/css/check_detail.css new file mode 100644 index 0000000..5627082 --- /dev/null +++ b/static/css/check_detail.css @@ -0,0 +1,55 @@ +:root { + --maincolor: #CDF0FF; /*메인 색상*/ + --font50: 50px; /*메인 폰트 사이즈*/ + --font30: 30px; + --font15: 15px; + --fonit20: 20px; +} + +.gridContainner{ + display: grid; + + grid-template-areas: + 'LMarginLayout main RMarginLayout'; + grid-template-rows: auto; + grid-template-columns: 1fr 1200px 1fr; +} + +.main{ + grid-area:main ; + background-color: var(--maincolor); + padding: 20px; + border-radius: 50px; +} +.LMarginLayout{ + grid-area: LMarginLayout; +} +.RMarginLayout{ + grid-area: RMarginLayout; +} + +.upmargin{ + height: 60px; +} +.undermargin{ + height: 60px; +} +.check_containner{ + display: flex; + justify-content: center; + flex-direction: column; + align-items: center; +} + + +.complete{ + padding-bottom: 20px; + color: white; +} +button{ +background-color: var(--maincolor); +} +img{ + border: 2px solid white; + background-color: var(--maincolor); +} \ No newline at end of file diff --git a/static/css/header.css b/static/css/header.css index b2fe452..5109cd8 100644 --- a/static/css/header.css +++ b/static/css/header.css @@ -43,8 +43,11 @@ .navbar_icons{ padding-left: 0px; list-style: none; - color: white; + color: black; display: flex; +} +.navbar_icons li{ + } .navbar_icons li a img{ margin: 0 0.5vw 0 0.5vw; @@ -57,6 +60,7 @@ body{ a{ text-decoration: none; /*a태그의 밑줄 제거*/ + color : black; } diff --git a/static/css/home.css b/static/css/home.css index 50e4f4c..67e5e25 100644 --- a/static/css/home.css +++ b/static/css/home.css @@ -129,10 +129,7 @@ margin-top: 15vh; .bulletin_board_table th{ height: 1vh; border-color: black; - -} -td{ - + } .first_row{ @@ -147,7 +144,24 @@ background-color: white; width: 8vw; background-color: white; } -td.content_board{ - +#board{ +background-color: #CDF0FF; +height: 100%; +width: 100%; +border-radius: 44px; } - +.content_board{ + width: 560px; + height: 402px; +} +#more{ + display: inline-grid; +} +#atag{ + background-color: white; + height: 50px; +} +#header{ + display: flex; + flex-direction: column; +} \ No newline at end of file diff --git a/static/css/login.css b/static/css/login.css index aaf75f3..4a80dc7 100644 --- a/static/css/login.css +++ b/static/css/login.css @@ -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); diff --git a/static/css/mainpage.css b/static/css/mainpage.css index 63d2832..3b8c6b4 100644 --- a/static/css/mainpage.css +++ b/static/css/mainpage.css @@ -103,6 +103,7 @@ html{ height: auto; border-bottom: black 1px solid ; padding: 10px; + background-color: var(--maincolor); } .writeList > .title{ diff --git a/static/css/study.css b/static/css/study.css new file mode 100644 index 0000000..733046b --- /dev/null +++ b/static/css/study.css @@ -0,0 +1,187 @@ + @font-face { + font-family: 'IM_Hyemin-Bold'; + src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_2106@1.1/IM_Hyemin-Bold.woff2') format('woff'); + font-weight: normal; + font-style: normal; +} +html{ + height: 100vh; + width: 100vw; + overflow: auto; +} +:root{ + --maincolor: #CDF0FF; /*메인 색상*/ + --font50: 50px; /*메인 폰트 사이즈*/ + --font30:30px; + --font15: 15px; + --fonit20:20px; + --font40:40px; + +} +.pagination{ + display: flex; + margin-top: 20px; + justify-content: center; +} + .containner { + display: grid; + grid-template-areas: + 'marginL header marginR' + 'marginL boardnav marginR' + 'marginL main marginR' + 'marginL undermargin marginR'; + + grid-template-columns: 1fr 1200px 1fr; /*세로 좌:300px고정 가운데 1fr: 유동식 우 300px 고정*/ + grid-template-rows: 90px 160px 1fr 140px; /*가로 */ + } +.containner div { + display: grid; + +} + +.header { + grid-area: header; +} + +.marginL { + grid-area: marginL; +} + +.main { + grid-area: main; + margin-top: 2vh; +} + +.marginR { + grid-area: marginR; + height: 100vh; +} + +.undermargin { + grid-area: undermargin; +} + +.navbr { + justify-items: center; + align-items: center; + width: 100%; +} +.boardnav { /*아직 안정함*/ + grid-area: boardnav; + background-color: var(--maincolor); + border-radius: 10px; + padding: 8px; + margin-bottom: 20px; + height: 160px; +} + +.middleboard{ + padding: 8px; + background-color: white; + +} +.mainboard{ + + background-color: var(--maincolor); +} +.introduce{ + +} +.writetext{ + display: flex !important; + background-color: var(--maincolor); + border-radius: 30px; + height: 15vh; + padding : 1rem 0.8rem 1rem 0.8rem; + flex-direction: row ; +} +.writetext div{ + border: 3px solid black; +} +.writeList{ + overflow:auto; + height: auto; + border-bottom: black 1px solid ; + padding: 10px; + background-color: var(--maincolor); +} + +.writeList > .title{ + margin: 2vh 0 10px 1vh; + font-size: var(--fonit20); + +} +.sort_bar{ + background-color: var(--maincolor); +} +.writearea{ + + border-color: var(--maincolor); + font-family: 'IM_Hyemin-Bold'; + font-size: var(--fonit20); +} +.test1{ + width: 95%; +} +.writeList > .mainstory{ + border: 1px solid black ; + position: relative; + height: 6vh; + border-radius: 10px; + margin: 0 1vw 1vh 1vw; + background-color: white; +} +.number{ + background-color: var(--maincolor); + height: 120px; +} + +.nextnav{ + display: flex; + justify-content: center; +} +.nextnav span{ + margin: 0 1vw 0 1vw; +} +.content{ + font-family: 'IM_Hyemin-Bold'; + + display:flex; + align-items: center; + justify-content: center; + margin: 0 20px 0 20px; +} +.imagesize{ + width: 40px; + height: 40px; + border: black 1px solid; +} + +.mainboard{ + height: 100%; + border-radius: 20px; +} +.content a{ + margin: 0 3vw 0 3vw; + border-left: solid white 2px; + border-right: solid white 2px; + padding: 10px; +} +.h{ + height: 50px; +} +.name{ + font-size: 2.0vw; + vertical-align: center; + margin-top: 40px; +} + +.sort_bar{ + display: flex; + flex-direction: row; + height: 100%; + margin-bottom: 15px; +} +/*.likebutton_bar {*/ +/* display: flex;*/ +/*}*/