diff --git a/account/static/css/header.css b/account/static/css/header.css index b2fe452..37629c3 100644 --- a/account/static/css/header.css +++ b/account/static/css/header.css @@ -43,7 +43,7 @@ .navbar_icons{ padding-left: 0px; list-style: none; - color: white; + color: black; display: flex; } .navbar_icons li a img{ @@ -57,6 +57,7 @@ body{ a{ text-decoration: none; /*a태그의 밑줄 제거*/ + color : black; } diff --git a/account/static/css/login.css b/account/static/css/login.css index f630e55..aaf75f3 100644 --- a/account/static/css/login.css +++ b/account/static/css/login.css @@ -81,7 +81,15 @@ body { height: 662px; padding: 10px; } - +.LoginLayout .LoginCenter .logo{ + + + +} +.LoginLayout .LoginCenter .logo img{ + height: 100px; + +} .logo { height: 120px; font-family: 'Monospace', sans-serif; @@ -176,14 +184,15 @@ body { border-radius: 50px; height: 60px; font-size: var(—-fonit20); - background-color: var(-—maincolor); margin-top: 40px; + background-color: #CDF0FF; !important } -#button{ +.sureLogin #button{ font-size: var(—-fonit20); - background-color: var(—-maincolor); + background-color: #CDF0FF; border:none; - width: 100%; + width: 612px; + border-radius: 50px; height: 60px; font-family: 'IM_Hyemin-Bold'; } diff --git a/account/static/css/start.css b/account/static/css/start.css deleted file mode 100644 index cfdff19..0000000 --- a/account/static/css/start.css +++ /dev/null @@ -1,101 +0,0 @@ -@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{ -} - -body{ - background-color: #CDF0FF; - height: 100vh; - margin: 0%; -} -#main{ - position: absolute; - height: 100%; - width:80%; -} -#main #cloudImg1{ - width: 31%; - height: 26%; - margin-left: 60%; - -} -#main #cloudImg1 img{ - width: 100%; - height: 100%; - transform: rotate(150deg); - -} -#main #text{ - margin-top: 5%; - margin-left: 35%; - font-family: 'IM_Hyemin-Bold'; - font-size:6.0vh; -} - -#main #cloudImg2{ - width: 30%; - height: 22%; - margin-top: 5%; - - margin-left: 5%; - -} -#main #cloudImg2 img{ - width: 100%; - height: 100%; - transform: rotate(-20deg); -} - -#side{ - height: 100%; - width:20%; - background-color: white; - float: right; -} -#side #img{ - margin-top: 122px; - margin-left: 17.7%; - width:148px; - height: 100px; - background-color: black; -} - - -#side #join{ - margin-top: 54.3%; - width: 87%; - height: 5.13%; - background-color: #E6E6E6; - float: center; - border-radius:32px; - text-align: center; - - margin-left:6.5%; - font-size: 2.0vw; - font-family: 'IM_Hyemin-Bold'; - -} -#side #join #text{ - display: inline-block; - margin-top: 7px; -} -#side #login{ - margin-top: 10%; - width: 87%; - height: 5.13%; - background-color: #CDF0FF; - float: center; - border-radius:32px; - text-align: center; - margin-left:6.5%; - font-size: 2.0vw; - font-family: 'IM_Hyemin-Bold'; -} -#side #login #text{ - display: inline-block; - margin-top: 7px; -} \ No newline at end of file diff --git a/account/templates/login.html b/account/templates/login.html index 6b236ca..89515ba 100644 --- a/account/templates/login.html +++ b/account/templates/login.html @@ -11,12 +11,8 @@
-
- cloud2 -
-
- cloud2 -
+ +
@@ -24,7 +20,9 @@
- +
로그인
diff --git a/school/static/css/header.css b/school/static/css/header.css index 7076faa..ebf1fa3 100644 --- a/school/static/css/header.css +++ b/school/static/css/header.css @@ -18,6 +18,10 @@ width: 75rem; margin: 40px auto 0 auto; height: 50px; + color: black; +} +.navbar_menu_item a{ + color: black !important; } .navbar_menu_item a:visited{ color: black; @@ -43,9 +47,10 @@ .navbar_icons{ padding-left: 0px; list-style: none; - color: white; + color: black; display: flex; } + .navbar_icons li a img{ margin: 0 0.5vw 0 0.5vw; } @@ -57,6 +62,7 @@ body{ a{ text-decoration: none; /*a태그의 밑줄 제거*/ + color: black; } diff --git a/school/static/css/home.css b/school/static/css/home.css new file mode 100644 index 0000000..50e4f4c --- /dev/null +++ b/school/static/css/home.css @@ -0,0 +1,153 @@ +@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 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; +} + +.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{ +border-radius: 30px; +background-color: var(--maincolor); +} + + + +.boardcontainner > .title{ + margin: 2vh 0 10px 1vh; + font-size: var(--fonit20); + +} +.boardcontainner > .mainstory{ +border: 1px solid black ; +position: relative; +height: 6vh; +border-radius: 10px; +background-color: white; +margin: 0 1vw 1vh 1vw; +} + +.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; +} + +.content a{ +margin: 0 3vw 0 3vw; +border-left: solid white 2px; +border-right: solid white 2px; +padding: 10px; +} + + + +.bulletin_board_table{ +width: 100%; +height: 150vh; +margin-top: 15vh; +} +.bulletin_board_table th{ + height: 1vh; + border-color: black; + +} +td{ + +} + +.first_row{ +border :3px solid black; +} + +.table_row_margin{ +height: 16vh; +background-color: white; +} +.table_column_margin{ +width: 8vw; +background-color: white; +} +td.content_board{ + +} + diff --git a/school/static/css/start.css b/school/static/css/start.css index b82b274..eaf932c 100644 --- a/school/static/css/start.css +++ b/school/static/css/start.css @@ -4,14 +4,13 @@ font-weight: normal; font-style: normal; } -html{ -} body{ - background-color: #CDF0FF; - height: 100vh; - margin: 0%; -} + background-color: #CDF0FF; + height: 100vh; + margin:0% + } + #main{ position: absolute; height: 100%; diff --git a/school/static/img/alarm.png b/school/static/img/alarm.png new file mode 100644 index 0000000..f3d8e44 Binary files /dev/null and b/school/static/img/alarm.png differ diff --git a/school/static/img/logout.png b/school/static/img/logout.png new file mode 100644 index 0000000..6de4bc4 Binary files /dev/null and b/school/static/img/logout.png differ diff --git a/school/static/img/profile.png b/school/static/img/profile.png new file mode 100644 index 0000000..3a7201a Binary files /dev/null and b/school/static/img/profile.png differ diff --git a/school/templates/base.html b/school/templates/base.html index 4ffd5af..a36ed87 100644 --- a/school/templates/base.html +++ b/school/templates/base.html @@ -17,7 +17,7 @@ {#헤더 끝입니다#} - {%block content %} + {% block content %} {% endblock %}
- cloud + logo
회원 가입 하기
diff --git a/school_ties/settings.py b/school_ties/settings.py index 8a833eb..0593bed 100644 --- a/school_ties/settings.py +++ b/school_ties/settings.py @@ -137,7 +137,8 @@ def get_secret(setting, secrets=secrets): STATIC_URL = '/static/' STATIC_DIRS = [ - os.path.join(BASE_DIR, 'school','static') + os.path.join(BASE_DIR, 'school','static'), + os.path.join(BASE_DIR,'account','static'), ] STATIC_ROOT = os.path.join(BASE_DIR, 'static') diff --git a/static/admin/fonts/LICENSE.txt b/static/admin/fonts/LICENSE.txt index d645695..75b5248 100644 --- a/static/admin/fonts/LICENSE.txt +++ b/static/admin/fonts/LICENSE.txt @@ -1,202 +1,202 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/static/css/boardform.css b/static/css/boardform.css new file mode 100644 index 0000000..69948fc --- /dev/null +++ b/static/css/boardform.css @@ -0,0 +1,105 @@ +@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; +} +/*헤더 css*/ +html{ + font-size: 1.5vw; + font-family: 'IM_Hyemin-Bold'; + +} +body{ + margin:0px; +} + + +@media (max-width:800px) { + + #header { + width:768px; + } +} +/*board_form css*/ +body #form{ + border-radius: 44px; + margin-left: 18.6%; + margin-right: 18.6%; + width: 1200px; + height: 100vh; + background-color: #CDF0FF; + +} + +#form #title{ + width: 100%; + height: 7.8%; + margin-top: 2%; + margin-left: 3%; + display:inline-block; + +} +#form #title #input{ + border-radius: 15px; + background-color: white; + width: 89%; + height: 100%; + border-width: 3px; + border-color:black; +} +#form #text{ + width: 100%; + height: 75%; + margin-top: 2%; + margin-left: 3%; + display:inline-block; + +} +#form #text textarea{ + border-width: 3px; + border-radius: 15px; + border-color:black; + background-color: white; + padding-left: 1%; + padding-top: 1%; + width: 88%; + height: 100%; + display:inline-block; + resize: none; +} +#form #text #atag{ + display:inline-block; + vertical-align: top; + position:relative; + margin-top: 10vh; + margin-bottom: 20vh; + +} +#form #submit{ + width: 100%; + font-family: 'IM_Hyemin-Bold'; + +} +#form #submit input{ + background-color: #C4C4C4; + border-radius: 5px; + width: 10%; + height: 100%; + float:right; + margin-right: 3%; +} +@media screen and (max-width:1000px) { + #form { + width:628.88px; + margin-left: 186px; + margin-right: 186px;; + } +} + + + +.boardcontainner{ + height: auto; + padding: 20px; +} \ No newline at end of file diff --git a/static/css/header.css b/static/css/header.css index 7076faa..b2fe452 100644 --- a/static/css/header.css +++ b/static/css/header.css @@ -11,16 +11,14 @@ .navbar{ display: flex; /*flex사용*/ justify-content: space-between; /*중심축 배치*/ - align-items: center; background-color: #CDF0FF; padding: 8px 12px; /*위아래 8px, 양옆 12px*/ border-radius: 20px; width: 75rem; margin: 40px auto 0 auto; - height: 50px; } .navbar_menu_item a:visited{ - color: black; + color: black; } .navbar_logo{ font-size: 20px; @@ -32,6 +30,8 @@ display: flex; /*이렬배치를 위해 사용*/ list-style: none; /*ul태그 점 제거*/ padding-left: 0; + align-items: center; + justify-content: center; } .navbar_menu li{ padding: 8px 12px; diff --git a/static/css/home.css b/static/css/home.css new file mode 100644 index 0000000..50e4f4c --- /dev/null +++ b/static/css/home.css @@ -0,0 +1,153 @@ +@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 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; +} + +.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{ +border-radius: 30px; +background-color: var(--maincolor); +} + + + +.boardcontainner > .title{ + margin: 2vh 0 10px 1vh; + font-size: var(--fonit20); + +} +.boardcontainner > .mainstory{ +border: 1px solid black ; +position: relative; +height: 6vh; +border-radius: 10px; +background-color: white; +margin: 0 1vw 1vh 1vw; +} + +.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; +} + +.content a{ +margin: 0 3vw 0 3vw; +border-left: solid white 2px; +border-right: solid white 2px; +padding: 10px; +} + + + +.bulletin_board_table{ +width: 100%; +height: 150vh; +margin-top: 15vh; +} +.bulletin_board_table th{ + height: 1vh; + border-color: black; + +} +td{ + +} + +.first_row{ +border :3px solid black; +} + +.table_row_margin{ +height: 16vh; +background-color: white; +} +.table_column_margin{ +width: 8vw; +background-color: white; +} +td.content_board{ + +} + diff --git a/static/css/login.css b/static/css/login.css index 6523e62..aaf75f3 100644 --- a/static/css/login.css +++ b/static/css/login.css @@ -1,38 +1,40 @@ @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; + 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; /*메인 색상*/ +:root { + --maincolor: #CDF0FF; /*메인 색상*/ --font50: 50px; /*메인 폰트 사이즈*/ - --font30:30px; + --font30: 30px; --font15: 15px; - --fonit20:20px; + --fonit20: 20px; } -.cloud1{ +.cloud1 { position: absolute; top: 40px; left: 100px; } -.cloud2{ + +.cloud2 { position: absolute; top: 400px; left: 1650px; } -body{ - font-family:'IM_Hyemin-Bold'; - font-weight: normal; - font-style: normal; + +body { + font-family: 'IM_Hyemin-Bold'; + font-weight: normal; + font-style: normal; margin: 0; background-color: var(--maincolor); } -.containnerLayout{ +.containnerLayout { display: grid; grid-template-areas: 'upLayout upLayout upLayout' 'LMarginLayout LoginLayout RMarginLayout' @@ -40,19 +42,23 @@ body{ grid-template-columns: 1fr 819px 1fr; grid-template-rows: 40px 1000px 40px; } -.containnerLayout div{ -display: grid; + +.containnerLayout div { + display: grid; } -.upLayout{ + +.upLayout { grid-area: upLayout; background-color: #CDF0FF; } -.LMarginLayout{ + +.LMarginLayout { grid-area: LMarginLayout; background-color: #CDF0FF; } -.LoginLayout{ + +.LoginLayout { grid-area: LoginLayout; background-color: #ffffff; border-radius: 180px; @@ -60,38 +66,52 @@ display: grid; justify-content: center; align-content: center; } -.RMarginLayout{ + +.RMarginLayout { grid-area: RMarginLayout; } -.underLayout{ + +.underLayout { grid-area: underLayout; } -.LoginCenter{ +.LoginCenter { width: 528px; height: 662px; padding: 10px; } -.logo{ +.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 ; + border-bottom: black 3px solid; } -.membership{ + +.membership { font-size: var(--font50); - position: relative; + position: relative; top: 10px; } -.membership_under{ + +.membership_under { font-size: var(--font15); - position: relative; + position: relative; left: 20px; } -.email{ + +.email { position: relative; top: 20px; font-size: var(--font30); @@ -99,16 +119,20 @@ display: grid; margin-top: 20px; } -.submit{ + +.submit { font-size: var(--font30); } -.check{ + +.check { font-size: var(--font15); } -.loginbutton{ + +.loginbutton { font-size: var(--font15); } -.email_bar{ + +.email_bar { border: 3px solid rgba(33, 33, 33, .5); width: 100%; border-radius: 20px; @@ -118,7 +142,8 @@ display: grid; align-content: center; font-size: var(--fonit20); } -.email_submit_bar{ + +.email_submit_bar { width: 100%; display: flex; justify-content: center; @@ -129,14 +154,15 @@ display: grid; font-size: var(--fonit20) } + .email_submit { - display: flex; - margin-top: 20px; + display: flex; + margin-top: 20px; margin-bottom: 20px; } -.undercontent{ +.undercontent { display: flex; justify-items: center; align-items: center; @@ -147,15 +173,30 @@ display: grid; } -.sureLogin{ + +.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); - background-color: var(--maincolor); - margin-top: 20px; + 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; /* 링크의 색상 제거 */ +} \ No newline at end of file diff --git a/static/css/mainpage.css b/static/css/mainpage.css index 7ade8ec..63d2832 100644 --- a/static/css/mainpage.css +++ b/static/css/mainpage.css @@ -152,7 +152,6 @@ font-family: 'IM_Hyemin-Bold'; .mainboard{ height: 100%; border-radius: 20px; - background-color: #025ce2; } .content a{ margin: 0 3vw 0 3vw; diff --git a/static/css/notice.css b/static/css/notice.css index e298a11..83aa85e 100644 --- a/static/css/notice.css +++ b/static/css/notice.css @@ -1,3 +1,3 @@ *{ - color: grey; + color: black; } \ No newline at end of file diff --git a/static/css/start.css b/static/css/start.css index cfdff19..eaf932c 100644 --- a/static/css/start.css +++ b/static/css/start.css @@ -4,14 +4,13 @@ font-weight: normal; font-style: normal; } -html{ -} body{ - background-color: #CDF0FF; - height: 100vh; - margin: 0%; -} + background-color: #CDF0FF; + height: 100vh; + margin:0% + } + #main{ position: absolute; height: 100%; @@ -59,9 +58,9 @@ body{ #side #img{ margin-top: 122px; margin-left: 17.7%; - width:148px; - height: 100px; - background-color: black; + width:64.3%; + height: 13.7%; + } @@ -83,6 +82,10 @@ body{ display: inline-block; margin-top: 7px; } +#side #join #text a{ + text-decoration: none; /* 링크의 밑줄 제거 */ + color: inherit; /* 링크의 색상 제거 */ +} #side #login{ margin-top: 10%; width: 87%; @@ -95,7 +98,16 @@ body{ font-size: 2.0vw; font-family: 'IM_Hyemin-Bold'; } +#side #img img{ + width: 100%; + height: 100%; +} #side #login #text{ display: inline-block; margin-top: 7px; +} + +#side #login #text a{ + text-decoration: none; /* 링크의 밑줄 제거 */ + color: inherit; /* 링크의 색상 제거 */ } \ No newline at end of file diff --git a/static/img/alarm.png b/static/img/alarm.png new file mode 100644 index 0000000..f3d8e44 Binary files /dev/null and b/static/img/alarm.png differ diff --git a/static/img/leftcloud.svg b/static/img/leftcloud.svg new file mode 100644 index 0000000..ce10e1b --- /dev/null +++ b/static/img/leftcloud.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/static/img/logo.png b/static/img/logo.png new file mode 100644 index 0000000..baa2f40 Binary files /dev/null and b/static/img/logo.png differ diff --git a/static/img/logout.png b/static/img/logout.png new file mode 100644 index 0000000..6de4bc4 Binary files /dev/null and b/static/img/logout.png differ diff --git a/static/img/profile.png b/static/img/profile.png new file mode 100644 index 0000000..3a7201a Binary files /dev/null and b/static/img/profile.png differ diff --git a/static/img/right.svg b/static/img/right.svg new file mode 100644 index 0000000..da295eb --- /dev/null +++ b/static/img/right.svg @@ -0,0 +1,9 @@ + + + + + + + + +