diff --git a/client/.gitignore b/client/.gitignore index c4890e18..db24db7b 100644 --- a/client/.gitignore +++ b/client/.gitignore @@ -10,6 +10,7 @@ # production /build +.vercel .package.lock. diff --git a/client/src/assets/giphy.png b/client/src/assets/giphy.png index 7622dd21..4a039821 100644 Binary files a/client/src/assets/giphy.png and b/client/src/assets/giphy.png differ diff --git a/client/src/components/Apps/Giphy/buttons/button.css b/client/src/components/Apps/Giphy/buttons/button.css index 4e042621..07e1665d 100644 --- a/client/src/components/Apps/Giphy/buttons/button.css +++ b/client/src/components/Apps/Giphy/buttons/button.css @@ -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; } \ No newline at end of file diff --git a/client/src/components/Apps/Giphy/buttons/button.js b/client/src/components/Apps/Giphy/buttons/button.js index 2e3bf545..17128294 100644 --- a/client/src/components/Apps/Giphy/buttons/button.js +++ b/client/src/components/Apps/Giphy/buttons/button.js @@ -12,7 +12,7 @@ export const GreenBtn = (props)=>{ export const WhiteBtn = (props)=>{ return ( - ) diff --git a/client/src/components/Apps/Giphy/description/Description.js b/client/src/components/Apps/Giphy/description/Description.js new file mode 100644 index 00000000..aaf111f3 --- /dev/null +++ b/client/src/components/Apps/Giphy/description/Description.js @@ -0,0 +1,11 @@ +import React from 'react' + +const Description = () => { + return ( +
+

Giphy

+
+ ) +} + +export default Description diff --git a/client/src/components/Apps/Giphy/descriptionActions/descriptionAction.css b/client/src/components/Apps/Giphy/descriptionActions/descriptionAction.css index 05f88f30..068d1446 100644 --- a/client/src/components/Apps/Giphy/descriptionActions/descriptionAction.css +++ b/client/src/components/Apps/Giphy/descriptionActions/descriptionAction.css @@ -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; } \ No newline at end of file diff --git a/client/src/components/Apps/Giphy/descriptionActions/descriptionAction.js b/client/src/components/Apps/Giphy/descriptionActions/descriptionAction.js index 0aaa4d26..130f8216 100644 --- a/client/src/components/Apps/Giphy/descriptionActions/descriptionAction.js +++ b/client/src/components/Apps/Giphy/descriptionActions/descriptionAction.js @@ -1,3 +1,5 @@ +import { Link } from 'react-router-dom'; + import { GreenBtn, WhiteBtn } from '../buttons/button'; import Logo from '../logo/logo'; @@ -9,7 +11,17 @@ const DescriptionAction = () => {
Add to Zuri Chat - Learn more +
+
+ Learn more & Support +
+
+

Categories

+
+ Social & fun + Essential Apps +
+
); diff --git a/client/src/components/Apps/Giphy/logo/logo.css b/client/src/components/Apps/Giphy/logo/logo.css index bb17a6d9..004f02c2 100644 --- a/client/src/components/Apps/Giphy/logo/logo.css +++ b/client/src/components/Apps/Giphy/logo/logo.css @@ -1,5 +1,5 @@ .logo-wrapper { - background: white; + background: #242424; border-radius: 8px; width: 100%; height: 220px; diff --git a/client/src/components/Apps/Giphy/main-giphy-layout/main-layout.css b/client/src/components/Apps/Giphy/main-giphy-layout/main-layout.css index b74577bd..f5377b68 100644 --- a/client/src/components/Apps/Giphy/main-giphy-layout/main-layout.css +++ b/client/src/components/Apps/Giphy/main-giphy-layout/main-layout.css @@ -1,11 +1,7 @@ -* { - padding: 0; - margin: 0; - box-sizing: border-box; -} .main-side-section { width: 100%; + padding: 0.5em 2em; color: black; }