Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Giphy Plugin Feat: add the categories section in the about page and fix buttons and logo to match design on figma #425

Merged
merged 3 commits into from
Sep 4, 2021
Merged

Giphy Plugin Feat: add the categories section in the about page and fix buttons and logo to match design on figma #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71ae7c4
adjusted components to fit design on figma and added categories section
Johndiddles Sep 4, 2021
a7d6c1e
adjusted components to fit design on figma and added categories section
Johndiddles Sep 4, 2021
22af504
adjusted components to fit design on figma and added categories section
Johndiddles Sep 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions client/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

# production
/build
.vercel

.package.lock.

Expand Down
Binary file modified client/src/assets/giphy.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 9 additions & 3 deletions client/src/components/Apps/Giphy/buttons/button.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,17 @@

.whiteBtn {
background-color: white;
color: #009B69;
border: 1px solid #009B69;
color: #767676;
border: 1px solid #767676;
width: fit-content;
padding: 4px 10px;
font-size: 12px;
font-weight: 400;
margin: 2px 0;
border-radius: 4px;
}

.whiteBtn:hover{
background: rgb(241, 241, 241);
background: rgb(240, 240, 240);
transition: 0.2s;
}
2 changes: 1 addition & 1 deletion client/src/components/Apps/Giphy/buttons/button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const GreenBtn = (props)=>{

export const WhiteBtn = (props)=>{
return (
<button className="giphyButton whiteBtn">
<button className="whiteBtn">
{props.children}
</button>
)
Expand Down
11 changes: 11 additions & 0 deletions client/src/components/Apps/Giphy/description/Description.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import React from 'react'

const Description = () => {
return (
<div>
<h4>Giphy</h4>
</div>
)
}

export default Description
21 changes: 20 additions & 1 deletion client/src/components/Apps/Giphy/descriptionActions/descriptionAction.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,25 @@
width: 240px;
}

.action-section .btn-wrappers {
.action-section .btn-wrapper {
margin: 10px auto;
border-bottom: 1px solid #C1C1C1;
padding-bottom: 1em;
margin-bottom: 1.5em;
}

.action-section .learn {
padding: 0.3em 0;
}
.action-section .categories-section {
width: 100%;
margin: 0.5em auto;
display: flex;
flex-direction: column;
align-items: flex-start;
}
.action-section .categories-section .categoryBtns {
margin: 10px 0;
display: flex;
flex-direction: column;
}
14 changes: 13 additions & 1 deletion client/src/components/Apps/Giphy/descriptionActions/descriptionAction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { Link } from 'react-router-dom';

import { GreenBtn, WhiteBtn } from '../buttons/button';
import Logo from '../logo/logo';

Expand All @@ -9,7 +11,17 @@ const DescriptionAction = () => {
<Logo />
<div className="btn-wrapper">
<GreenBtn>Add to Zuri Chat</GreenBtn>
<WhiteBtn>Learn more</WhiteBtn>
</div>
<div className="learn">
<Link >Learn more & Support</Link>
</div>
<div className="categories-section">
<p>Categories</p>
<div className="categoryBtns">
<WhiteBtn >Social & fun</WhiteBtn>
<WhiteBtn >Essential Apps</WhiteBtn>
</div>

</div>
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/Apps/Giphy/logo/logo.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.logo-wrapper {
background: white;
background: #242424;
border-radius: 8px;
width: 100%;
height: 220px;
Expand Down
6 changes: 1 addition & 5 deletions client/src/components/Apps/Giphy/main-giphy-layout/main-layout.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
* {
padding: 0;
margin: 0;
box-sizing: border-box;
}

.main-side-section {
width: 100%;
padding: 0.5em 2em;
color: black;
}

Expand Down