Skip to content

Commit 0623a55

Browse files
committed
design fix
1 parent 8cb5057 commit 0623a55

File tree

5 files changed

+7
-9
lines changed

5 files changed

+7
-9
lines changed

public/favicon.ico

57 KB
Binary file not shown.

public/favicon.old.ico

3.78 KB
Binary file not shown.

src/App.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ function App() {
207207
</button>
208208
}
209209
<button className="btn btn-light m-1" onClick={() => setOpenLogin(true)}>
210-
{logged ? `Login: ${userName}` : <span><i className="bi bi-arrow-right-circle"></i> LOG IN</span>}
210+
{logged ? <span><i className="bi bi-person"></i> {userName}</span> : <span><i className="bi bi-arrow-right-circle"></i> LOG IN</span>}
211211
</button>
212212
</div>
213213
</nav>

src/Cards/AddCard.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ function AddCard({ onCreate, onDeleteAll }) {
4949
</div>
5050

5151
<div className="col-lg-2 col-md-3 col-sm-4 col-6 p-1">
52-
<button className="btn btn-success btn-block" onClick={submitHandler}><i className="bi bi-clipboard-plus"></i> Add card</button>
52+
<button disabled={!input.value().trim()} className="btn btn-success btn-block" onClick={submitHandler}><i className="bi bi-clipboard-plus"></i> Add card</button>
5353
</div>
5454

5555
<div className="col-lg-2 col-md-3 col-sm-4 col-6 p-1">

src/Modal/ModalLogin.js

+5-7
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,12 @@ function ModalLogin(props) {
8585
return (
8686
<Modal {...modalProps.bind()}>
8787
<div className="container p-3 bg-light">
88-
8988
<div className='bg-light form-group mb-2'>
9089
<div className='mb-1'>
91-
92-
{userName ? <span>Login: {userName} </span> : ``}
93-
<span className={logged ? `badge badge-success` : `badge badge-danger`}>
90+
<span className={logged ? `badge badge-success` : `badge badge-secondary`}>
9491
{logged ? <span><i className="bi bi-key"> </i>AUTORISED</span> : 'UNAUTORISED'}
9592
</span>
93+
{userName ? <span> {userName} </span> : ``}
9694
</div>
9795
</div>
9896

@@ -114,10 +112,10 @@ function ModalLogin(props) {
114112
<button className="btn btn-primary col" onClick={tryLogin}><i className="bi bi-person-check"></i> Log in</button>
115113
</div>
116114
<div className="col col-sm-4 col-md-4 p-1">
117-
<button className="btn btn-danger col" onClick={tryLogout}><i className="bi bi-person-x"></i> Logout</button>
115+
<button disabled={!logged} className="btn btn-danger col" onClick={tryLogout}><i className="bi bi-person-x"></i> Logout</button>
118116
</div>
119-
<div className="col-5 col-sm-4 col-md-3 p-1">
120-
<button className="btn btn-secondary col" onClick={tryClose}><i className="bi bi-x"></i> Close</button>
117+
<div className="col-4 col-sm-4 col-md-3 p-1">
118+
<button className="btn btn-secondary col" onClick={tryClose}><i className="bi bi-x d-inline d-sm-none"></i><span className="d-none d-sm-inline">Close</span></button>
121119
</div>
122120
</div>
123121

0 commit comments

Comments
 (0)