Skip to content

Commit 13a2afe

Browse files
committed
bug fixed and header button added
1 parent 6f954c4 commit 13a2afe

3 files changed

Lines changed: 26 additions & 8 deletions

File tree

components/utils/Header.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import FormControl from 'react-bootstrap/FormControl';
2020
import DropdownButton from 'react-bootstrap/DropdownButton';
2121
import Dropdown from 'react-bootstrap/Dropdown'
2222

23-
import { FiSearch, FiPlus } from "react-icons/fi";
23+
import { FiSearch, FiPlus, FiTwitter } from "react-icons/fi";
2424

2525
// Styled Component
2626
import styled from "styled-components";
@@ -209,10 +209,14 @@ const Header = ({
209209
{(user.email || user.displayName) ? (
210210
<>
211211
<LoginBar>
212+
<Button variant="outline-secondary" size="sm" className="mr-1" onClick={() => setShowCreateShape(true)}>
213+
<FiTwitter />
214+
Tweet us
215+
</Button>
212216
<Button variant="primary" size="sm" className="mr-3" onClick={() => setShowCreateShape(true)}>
213217
<FiPlus />
214218
Add Shape
215-
</Button>
219+
</Button>
216220
<UserThumb>
217221
<img
218222
src={
@@ -228,6 +232,7 @@ const Header = ({
228232
<FiPower color='var(--color-neutral-10' size="18px"/>
229233
<div className="sr-only">Sign Out</div>
230234
</LogoutButton>
235+
231236
</LoginBar>
232237
</>
233238
) : (

components/utils/ShapeList.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,12 +162,12 @@ const ShapeCardsContainer = styled.div`
162162

163163
const ShapeCardBody = styled.div`
164164
position: relative;
165-
padding: 1rem 1.6rem;
165+
padding: 1rem 1.4rem;
166166
`;
167167

168168
const ShapeCardHeader = styled.div`
169169
margin: 0;
170-
padding: 0 1.8rem 1.6rem 1.8rem;
170+
padding: 0 1.4rem 1.2rem 1.4rem;
171171
`;
172172

173173
const ShapeCardSwitch = styled.div`
@@ -389,24 +389,24 @@ const ShapeList = (
389389
{
390390
shape.liked ?
391391
(
392-
<Button title="Remove Like" variant="danger" className="btn-icon">
392+
<Button title="Remove Like" variant="danger" className="btn-icon btn-icon--rounded">
393393
<LikeFilledIcon size={24} />
394394
</Button>
395395
)
396396
:
397397
(
398-
<Button title="Add Like" variant="outline-light" className="btn-icon">
398+
<Button title="Add Like" variant="outline-light" className="btn-icon btn-icon--rounded">
399399
<LikeIcon size={24} />
400400
</Button>
401401
)
402402
}
403403

404404
</span>{" "}
405-
<Button title="Export Shape" variant="outline-light" onClick={() => performExport(shape)} className="btn-icon">
405+
<Button title="Export Shape" variant="outline-light" onClick={() => performExport(shape)} className="btn-icon btn-icon--rounded">
406406
<ExportIcon
407407
size={24} />
408408
</Button>
409-
<Button title="Copy Source" variant="outline-light" onClick={() => performCopySource(shape)} className="btn-icon">
409+
<Button title="Copy Source" variant="outline-light" onClick={() => performCopySource(shape)} className="btn-icon btn-icon--rounded">
410410
<CopyIcon
411411
size={24} />
412412
</Button>

styles/global.css

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,14 @@ code {
312312
margin-right: 0;
313313
}
314314

315+
.btn-icon--rounded {
316+
border-radius: 50%;
317+
padding: 0.6rem;
318+
width: 3.6rem;
319+
height: 3.6rem;
320+
border-width: 0.3rem;
321+
}
322+
315323
/* Dropdown Menu */
316324
.dropdown-menu {
317325
border-color: transparent;
@@ -332,6 +340,11 @@ code {
332340
color: var(--color-brand);
333341
}
334342

343+
.dropdown-menu .dropdown-item:active {
344+
background-color: var(--color-brand);
345+
color: var(--color-neutral-10);
346+
}
347+
335348
.dropdown-toggle::after {
336349
margin-left: .8em;
337350
}

0 commit comments

Comments
 (0)