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

logo, color , theme changed #32

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

logo, color , theme changed #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file modified public/favicon.ico
View file
Open in desktop
Binary file not shown.
58 changes: 26 additions & 32 deletions public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Decentralized exchange on Alephium"
/>
<!--

<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="Decentralized exchange on Alephium" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.
Expand All @@ -23,24 +21,19 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=Sora:wght@200;300;400;500;700&display=swap"
rel="stylesheet"
/>
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=Roboto+Mono:wght@500&display=swap"
rel="stylesheet"
/>
<title>Alephium DEX</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link href="https://fonts.googleapis.com/css2?family=Sora:wght@200;300;400;500;700&display=swap" rel="stylesheet" />
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link href="https://fonts.googleapis.com/css2?family=Roboto+Mono:wght@500&display=swap" rel="stylesheet" />
<title>Test Dex</title>
</head>

<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.

Expand All @@ -50,5 +43,6 @@
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</html>
</body>

</html>
95 changes: 47 additions & 48 deletions src/muiTheme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,92 +1,91 @@
import { createTheme, responsiveFontSizes } from "@material-ui/core";

export const COLORS = {
blue: "#1975e6",
blueWithTransparency: "rgba(25, 117, 230, 0.8)",
gray: "#4e4e54",
green: "#0ac2af",
greenWithTransparency: "rgba(10, 194, 175, 0.8)",
lightGreen: "rgba(51, 242, 223, 1)",
lightBlue: "#83b9fc",
nearBlack: "#000008",
nearBlackWithMinorTransparency: "rgba(0,0,0,.70)",
red: "#aa0818",
darkRed: "#810612",
primary: "#ff5722",
primaryWithTransparency: "rgba(255, 87, 34, 0.8)",
secondary: "#4caf50",
secondaryWithTransparency: "rgba(76, 175, 80, 0.8)",
background: "#fafafa",
divider: "#bdbdbd",
text: "#212121",
error: "#e91e63",
};

export const theme = responsiveFontSizes(
createTheme({
palette: {
type: "dark",
type: "light",
background: {
default: COLORS.nearBlack,
paper: COLORS.nearBlack,
default: COLORS.background,
paper: COLORS.background,
},
divider: COLORS.gray,
divider: COLORS.divider,
text: {
primary: "rgba(255,255,255,0.98)",
primary: COLORS.text,
},
primary: {
main: COLORS.blueWithTransparency, // #0074FF
light: COLORS.lightBlue,
main: COLORS.primaryWithTransparency,
light: COLORS.primary,
},
secondary: {
main: COLORS.greenWithTransparency, // #00EFD8
light: COLORS.lightGreen,
main: COLORS.secondaryWithTransparency,
light: COLORS.secondary,
},
error: {
main: COLORS.red,
main: COLORS.error,
},
},
typography: {
fontFamily: "'Sora', sans-serif",
fontFamily: "'Roboto', sans-serif",
h1: {
fontWeight: "200",
fontWeight: "bold",
fontSize: "2.5rem",
},
h2: {
fontWeight: "200",
fontWeight: "bold",
fontSize: "2rem",
},
h4: {
fontWeight: "500",
fontWeight: "600",
fontSize: "1.5rem",
},
},
overrides: {
MuiCssBaseline: {
"@global": {
"*": {
scrollbarWidth: "thin",
scrollbarColor: `${COLORS.gray} ${COLORS.nearBlackWithMinorTransparency}`,
scrollbarColor: `${COLORS.divider} ${COLORS.background}`,
},
"*::-webkit-scrollbar": {
width: "8px",
height: "8px",
backgroundColor: COLORS.nearBlackWithMinorTransparency,
backgroundColor: COLORS.background,
},
"*::-webkit-scrollbar-thumb": {
backgroundColor: COLORS.gray,
backgroundColor: COLORS.divider,
borderRadius: "4px",
},
"*::-webkit-scrollbar-corner": {
// this hides an annoying white box which appears when both scrollbars are present
backgroundColor: "transparent",
},
},
},
MuiAccordion: {
root: {
backgroundColor: COLORS.nearBlackWithMinorTransparency,
backgroundColor: COLORS.background,
"&:before": {
display: "none",
},
},
rounded: {
"&:first-child": {
borderTopLeftRadius: "16px",
borderTopRightRadius: "16px",
borderTopLeftRadius: "8px",
borderTopRightRadius: "8px",
},
"&:last-child": {
borderBottomLeftRadius: "16px",
borderBottomRightRadius: "16px",
borderBottomLeftRadius: "8px",
borderBottomRightRadius: "8px",
},
},
},
Expand All @@ -98,18 +97,18 @@ export const theme = responsiveFontSizes(
},
MuiButton: {
root: {
borderRadius: "5px",
textTransform: "none",
borderRadius: "8px",
textTransform: "uppercase",
},
},
MuiLink: {
root: {
color: COLORS.lightBlue,
color: COLORS.primary,
},
},
MuiPaper: {
rounded: {
borderRadius: "16px",
borderRadius: "8px",
},
},
MuiStepper: {
Expand All @@ -120,8 +119,8 @@ export const theme = responsiveFontSizes(
},
MuiStep: {
root: {
backgroundColor: COLORS.nearBlackWithMinorTransparency,
borderRadius: "16px",
backgroundColor: COLORS.background,
borderRadius: "8px",
padding: 16,
},
},
Expand All @@ -137,22 +136,22 @@ export const theme = responsiveFontSizes(
},
MuiStepLabel: {
label: {
fontSize: 16,
fontWeight: "300",
fontSize: 18,
fontWeight: "500",
"&.MuiStepLabel-active": {
fontWeight: "300",
fontWeight: "600",
},
"&.MuiStepLabel-completed": {
fontWeight: "300",
fontWeight: "600",
},
},
},
MuiTab: {
root: {
fontSize: 18,
fontWeight: "300",
padding: 12,
textTransform: "none",
fontSize: 20,
fontWeight: "500",
padding: 16,
textTransform: "uppercase",
},
},
},
Expand Down