1
0
mirror of https://github.com/oceanprotocol/market.git synced 2024-12-02 05:57:29 +01:00

global styling amends, change logo, search, header, footer WIP

This commit is contained in:
maxieprotocol 2020-05-12 15:12:44 +02:00
parent 7d0e33ea41
commit 3b11761ef8
15 changed files with 89 additions and 40 deletions

5
package-lock.json generated
View File

@ -3007,6 +3007,11 @@
"integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==", "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
"dev": true "dev": true
}, },
"@oceanprotocol/art": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/@oceanprotocol/art/-/art-2.2.0.tgz",
"integrity": "sha512-p2n505t2K0zD1ZvGPhI6EsSviEVLCB7BYowhf/ONmVaWED138PaG4Z9nY6YuHU383uOoIWT+Lq3dLkFzDzstXw=="
},
"@oceanprotocol/keeper-contracts": { "@oceanprotocol/keeper-contracts": {
"version": "0.13.2", "version": "0.13.2",
"resolved": "https://registry.npmjs.org/@oceanprotocol/keeper-contracts/-/keeper-contracts-0.13.2.tgz", "resolved": "https://registry.npmjs.org/@oceanprotocol/keeper-contracts/-/keeper-contracts-0.13.2.tgz",

View File

@ -18,6 +18,7 @@
"storybook:build": "build-storybook -c .storybook -o public/storybook" "storybook:build": "build-storybook -c .storybook -o public/storybook"
}, },
"dependencies": { "dependencies": {
"@oceanprotocol/art": "^2.2.0",
"@oceanprotocol/squid": "2.0.0-beta.4", "@oceanprotocol/squid": "2.0.0-beta.4",
"@oceanprotocol/typographies": "^0.1.0", "@oceanprotocol/typographies": "^0.1.0",
"axios": "^0.19.2", "axios": "^0.19.2",

View File

@ -1,9 +1,9 @@
module.exports = { module.exports = {
title: 'Logistics Data Marketplace', title: 'Data Marketplace',
description: `Easily buy and sell logistics data from around the world.`, description: `A marketplace to find and publish open data sets in the Ocean Network.`,
url: 'https://dexfreight.oceanprotocol.com', url: 'https://dexfreight.oceanprotocol.com',
copyright: copyright:
'All Rights Reserved. Powered by [dexFreight](https://dexfreight.io) & [Ocean Protocol](https://oceanprotocol.com)', 'All Rights Reserved. Powered by [Ocean Protocol](https://oceanprotocol.com)',
refundPolicy: [ refundPolicy: [
'Data can be challenged within 2 days after purchase.', 'Data can be challenged within 2 days after purchase.',
'The marketplace decides if you are eligible for refund.' 'The marketplace decides if you are eligible for refund.'

View File

@ -9,7 +9,7 @@
a.box:hover, a.box:hover,
a.box:focus { a.box:focus {
outline: 0; outline: 0;
border-color: var(--brand-grey); border-color: var(--brand-pink);
box-shadow: 0 10px 20px rgba(0, 0, 0, 0.1); box-shadow: 0 10px 20px rgba(0, 0, 0, 0.1);
transform: translate3d(0, -2px, 0); transform: translate3d(0, -2px, 0);
} }

View File

@ -0,0 +1,13 @@
.logo {
width: 4rem;
height: 4rem;
margin: 0;
}
.logo path {
fill: var(--brand-black);
}
a > .logo:hover path {
fill: var(--brand-pink);
}

View File

@ -0,0 +1,7 @@
import React, { ReactElement } from 'react'
import { ReactComponent as LogoAsset } from '@oceanprotocol/art/logo/logo.svg'
import styles from './Logo.module.css'
export default function Logo(): ReactElement {
return <LogoAsset className={styles.logo} />
}

View File

@ -11,7 +11,7 @@
font-weight: var(--font-weight-bold); font-weight: var(--font-weight-bold);
/* font-weight: var(--font-weight-bold); */ /* font-weight: var(--font-weight-bold); */
color: var(--brand-grey-dark); color: var(--brand-grey-dark);
border: 1px solid var(--brand-grey-light); border: 2px solid var(--brand-pink);
box-shadow: none; box-shadow: none;
width: 100%; width: 100%;
background: var(--brand-white); background: var(--brand-white);
@ -29,7 +29,7 @@
.row textarea:focus { .row textarea:focus {
box-shadow: none; box-shadow: none;
outline: 0; outline: 0;
border-color: var(--color-secondary); border-color: var(--brand-pink);
} }
.input::placeholder, .input::placeholder,

View File

@ -3,7 +3,7 @@
.link { .link {
display: inline-block; display: inline-block;
color: var(--color-secondary); color: var(--brand-grey);
font-weight: var(--font-weight-bold); font-weight: var(--font-weight-bold);
margin: calc(var(--spacer) / 4) var(--spacer); margin: calc(var(--spacer) / 4) var(--spacer);
} }
@ -11,11 +11,11 @@
.link:hover, .link:hover,
.link:focus, .link:focus,
.link:active { .link:active {
color: var(--brand-grey-dark); color: var(--brand-pink);
} }
.link.active { .link.active {
color: var(--color-primary); color: var(--brand-pink);
} }
.link:first-child { .link:first-child {

View File

@ -13,28 +13,30 @@
margin-top: -1px; margin-top: -1px;
width: 100%; width: 100%;
border-width: 1px; border-width: 1px;
background-color: var(--brand-grey-light); background-color: var(--brand-pink);
border-color: var(--brand-grey-light); border-color: var(--brand-pink);
color: var(--color-secondary); color: var(--brand-grey-lighter);
text-transform: uppercase;
} }
.inputGroup button:hover, .inputGroup button:hover,
.inputGroup button:focus, .inputGroup button:focus,
.inputGroup .input:focus + button { .inputGroup .input:focus + button {
color: var(--brand-white); color: var(--brand-white);
background-color: var(--brand-pink);
} }
.inputGroup button:hover, .inputGroup button:hover,
.inputGroup button:focus, .inputGroup button:focus,
.inputGroup .input:focus + button:hover, .inputGroup .input:focus + button:hover,
.inputGroup .input:focus + button:focus { .inputGroup .input:focus + button:focus {
background-color: var(--color-primary); background-color: var(--brand-pink);
border-color: var(--color-primary); border-color: var(--brand-pink);
} }
.inputGroup .input:focus + button { .inputGroup .input:focus + button {
border-color: var(--color-secondary); border-color: var(--brand-pink);
background-color: var(--color-secondary); background-color: var(--brand-pink);
} }
@media screen and (min-width: 30rem) { @media screen and (min-width: 30rem) {

View File

@ -1,5 +1,4 @@
.footer { .footer {
background-color: var(--brand-grey-dark);
color: var(--brand-grey-light); color: var(--brand-grey-light);
font-size: var(--font-size-small); font-size: var(--font-size-small);
text-align: center; text-align: center;

View File

@ -1,6 +1,5 @@
.header { .header {
background-color: var(--brand-white); background-color: var(--brand-white);
box-shadow: 0 2px 20px rgba(0, 0, 0, 0.1);
} }
.content { .content {
@ -20,11 +19,18 @@
.logoUnit svg { .logoUnit svg {
fill: var(--color-primary); fill: var(--color-primary);
width: 70px; width: 4rem;
height: 40px; height: 4rem;
margin-right: calc(var(--spacer) / 2); margin-right: calc(var(--spacer) / 2);
} }
.logoUnit path {
fill: var(--brand-black);
}
.logoUnit:hover path {
fill: var(--brand-pink);
}
.title { .title {
display: none; display: none;
} }

View File

@ -3,7 +3,7 @@ import Link from 'next/link'
import Menu from '../molecules/Menu' import Menu from '../molecules/Menu'
import styles from './Header.module.css' import styles from './Header.module.css'
import { title } from '../../../site.config' import { title } from '../../../site.config'
import Logo from '../../images/logo.svg' import Logo from '@oceanprotocol/art/logo/logo.svg'
export default function Header() { export default function Header() {
return ( return (

26
src/styles/_code.css Normal file
View File

@ -0,0 +1,26 @@
code {
font-family: var(--font-family-monospace);
font-size: var(--font-size-small);
color: var(--brand-grey-light);
text-shadow: none;
}
:not(pre) > code {
display: inline-block;
padding-left: 0.3rem;
padding-right: 0.3rem;
}
pre {
display: block;
margin: calc(var(--spacer) / 2) 0;
padding: 0;
border: 1px solid var(--brand-grey-dark);
border-radius: var(--border-radius);
}
pre code {
padding: calc(var(--spacer) / 2);
display: block;
white-space: pre-wrap;
}

View File

@ -1,5 +1,5 @@
:root { :root {
--color-primary: #ffffff; --color-primary: #ff4092;
--color-secondary: #141414; --color-secondary: #141414;
--brand-grey: #41474e; --brand-grey: #41474e;

View File

@ -20,18 +20,20 @@ html {
} }
body { body {
background-color: var(--brand-grey-lighter); color: var(--brand-grey);
color: var(--brand-grey-dark);
font-size: var(--font-size-base); font-size: var(--font-size-base);
font-family: var(--font-family-base); font-family: var(--font-family-base);
font-weight: var(--font-weight-base); font-weight: var(--font-weight-base);
line-height: var(--line-height); line-height: var(--line-height);
-webkit-tap-highlight-color: rgba(0, 0, 0, 0); -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
position: relative;
} }
a { a {
text-decoration: none; text-decoration: none;
color: var(--color-primary); color: var(--brand-pink);
transition: 0.2s ease-out; transition: 0.2s ease-out;
} }
@ -50,10 +52,9 @@ h3,
h4, h4,
h5 { h5 {
font-family: var(--font-family-title); font-family: var(--font-family-title);
color: var(--brand-grey-dark); color: var(--brand-black);
line-height: 1.2; line-height: 1.2;
font-weight: var(--font-weight-bold); font-weight: var(--font-weight-bold);
margin-top: 0;
} }
h1 { h1 {
@ -99,19 +100,6 @@ ul li {
display: block; display: block;
} }
code,
kbd,
pre,
samp {
font-family: var(--font-family-monospace);
font-size: var(--font-size-small);
color: var(--color-secondary);
text-shadow: none;
overflow-wrap: break-word;
word-wrap: break-word;
word-break: break-all;
}
form, form,
fieldset { fieldset {
border: 0; border: 0;
@ -131,3 +119,5 @@ input[type='radio']:checked,
input[type='checkbox']:checked { input[type='checkbox']:checked {
background: var(--color-primary); background: var(--color-primary);
} }
@import '_code.css';