pav
/
pav-fe-tp-pal
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

로그인 임시수정

pull/2/head
김지은 1 year ago
parent
5f00246aaa
commit
fe9fd53a81
3 changed files with 7233 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      src/assets/css/custom.css
  2. 7210
      src/assets/images/login_bg.svg
  3. 17
      src/components/account/login/AccountLogin.js

28
src/assets/css/custom.css
Unescape View File

@ -27,7 +27,7 @@ time, mark, audio, video, button {
border: 0;
font-size: 100%;
/* font-family:'Rubik','NotoSansKR',맑은고딕, Arial,sans-serif, Dotum, 돋움, "Apple SD Gothic Neo", arial; */
font-family: 'Rubik', 'NotoSansKR', sans-serif;
font-family: 'Rubik', 'Montserrat', 'NotoSansKR', sans-serif;
font-style: normal;
font-weight:300;
vertical-align: baseline;
@ -280,29 +280,29 @@ h1.logo span{display:block;color:#f4f4f4;font-weight:bold;letter-spacing:2px;fon
.layer-content-list dl.notice-list dt div.list-txt{margin-top:8px;}
/*로그인*/
.login{display:flex;height:100vh;color:#555;position:relative;}
.login{display:flex;height:100vh;color:#555;position:relative;width:100%;background:#fff;justify-content: center;}
/* .login{background:url('../images/login_bg.svg') #fff no-repeat;background-size:100%;background-position:0 100%;} */
.login-logo{position:absolute;top:80px;left:100px;color:#555;font-weight:bold;font-size:1.8rem;width: 100%;}
.login-img, .login-form {display: flex;align-items: center;justify-content: center;}
.login-img{flex:1.2;background:#fff;}
.login-form{background:#fff;width:100%;flex:0.8;flex-direction: column;}
.login-form form{width:100%;padding:0 120px;}
.login-form .form-control{background:transparent}
.login-form{width:100%;flex-direction: column;}
.login-form form{width:100%;max-width:480px;}
.login-form .form-control{background:#fff}
.login-form .form-control:focus{border-color:#7367f0;border-right:1px solid #7367f0;}
/* .login-form .form-label-group > label{color:#bbb;}
.login-form .form-control-position svg{color:#bbb;}
.login-form .form-control::placeholder{color:#bbb;}
.login-form .vx-checkbox-con .vx-checkbox{border-color: #404656;} */
.login-txt{width:100%;margin-bottom:20px;}
.login-txt h2{color:#555;font-family: "Montserrat", serif;font-size:1.8rem;font-weight:bold;text-align: center;}
.login-txt p{color:#555;font-family: "Montserrat", serif;font-size:1.125rem;font-weight:normal;text-align: center;margin-top:20px;}
.login-txt h2{color:#555;font-family: "Montserrat", "NotoSansKR", serif;font-size:1.8rem;font-weight:600;text-align: center;}
.login-txt p{color:#555;font-family: "Montserrat", "NotoSansKR",serif;font-size:1.125rem;font-weight:normal;text-align: center;margin-top:20px;}
.full-btn button{width:100%;margin-bottom:10px;}
.login-link{margin-top:10px;}
.dark-layout .login{display:flex;height:100vh;color:#bbb;position:relative;}
.dark-layout .login-logo{position:absolute;top:80px;left:100px;color:#bbb;font-weight:bold;font-size:1.8rem;width: 100%;}
.dark-layout .login-img, .login-form {display: flex;align-items: center;justify-content: center;}
.dark-layout .login-img{flex:1.2;background:#161d31;}
.dark-layout .login-form{background:#283046;width:100%;flex:0.8;flex-direction: column;}
.dark-layout .login{color:#bbb;}
.dark-layout .login-logo{color:#bbb;}
.dark-layout .login-img{background:#161d31;}
.dark-layout .login-form{background:#283046;}
.dark-layout .login-form form{width:100%;padding:0 120px;}
.dark-layout .login-form .form-control{background:transparent;border:1px solid #404656;}
.dark-layout .login-form .form-control:focus{border-color:#7367f0;border-right:1px solid #7367f0;}
@ -311,8 +311,8 @@ h1.logo span{display:block;color:#f4f4f4;font-weight:bold;letter-spacing:2px;fon
.dark-layout .login-form .form-control::placeholder{color:#bbb;}
.dark-layout .login-form .vx-checkbox-con .vx-checkbox{border-color: #404656;}
.dark-layout .login-txt{width:100%;margin-bottom:20px;}
.dark-layout .login-txt h2{color:#f4f4f4;font-family: "Montserrat", serif;font-size:1.8rem;font-weight:bold;text-align: center;}
.dark-layout .login-txt p{color:#bbb;font-family: "Montserrat", serif;font-size:1.125rem;font-weight:normal;text-align: center;margin-top:20px;}
.dark-layout .login-txt h2{color:#f4f4f4;font-family: "Montserrat", serif;}
.dark-layout .login-txt p{color:#bbb;font-family: "Montserrat", serif}
.full-btn button{width:100%;margin-bottom:10px;}
.login-link{margin-top:10px;}
@media screen and (max-width:1280px){

7210
src/assets/images/login_bg.svg
View File

File diff suppressed because it is too large Load Diff
Side by Side

After

Width:  |  Height:  |  Size: 686 KiB

17
src/components/account/login/AccountLogin.js
Unescape View File

@ -15,6 +15,7 @@ import {
import { Mail, Lock, Check, Facebook, Twitter, GitHub } from 'react-feather';
import loginImg from '../../../assets/images/login01.png';
import kacLogo from '../../../assets/images/logo/kac_logo.svg';
import { Link } from 'react-router-dom';
import '../../../assets/css/custom.css';
@ -98,17 +99,17 @@ export const AccountLogin = ({ props }) => {
return (
<>
<div className='login'>
<div className='login-logo'>Drone Control System</div>
<div className='login-img'>
<div className='login-logo'><img src={kacLogo} /></div>
{/* <div className='login-img'>
<img src={loginImg} />
</div>
</div> */}
<div className='login-form'>
<div className='login-txt'>
<h2>Welcome to Drone Control System</h2>
<h2>드론교통관리(UTM) 시스템</h2>
<p>
control system is a web system that provides
<br />
convenient control and monitoring of drones!
Drone traffic management (UTM) system
{/* <br />
convenient control and monitoring of drones! */}
</p>
</div>
<Form>
@ -147,7 +148,7 @@ export const AccountLogin = ({ props }) => {
</FormGroup>
<div className='full-btn'>
<Button color='primary' onClick={handelrLogin}>
Login
로그인
</Button>
</div>
<div className='d-flex justify-content-between align-items-center login-link'>

Write Preview
Loading…
Cancel
Save