Skip to content

hotfix(web): max-height card and scroll bar #50

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

Open
alexandrearaujoo wants to merge 4 commits into
base: main
Choose a base branch
from
Open

hotfix(web): max-height card and scroll bar #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ef61c4
hotfix(web): max-height card and scroll bar
alexandrearaujoo Feb 1, 2023
8513bed
fix(web): remove tailwind scroll bar lib
alexandrearaujoo Feb 1, 2023
10f247b
fix(web): changing background
alexandrearaujoo Feb 1, 2023
55bbcad
fix(web): add new background
alexandrearaujoo Feb 1, 2023
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 added web/public/aptomingos-background.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.
43 changes: 41 additions & 2 deletions web/src/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,45 @@

body {
@apply bg-color bg-cover bg-image h-screen;
font-family: 'Inter', sans-serif;
background-attachment: fixed;
background-repeat: no-repeat;
background-position: center;
background-position-y: bottom;
font-family: "Inter", sans-serif;
color: black;
}
}
.scroll-bar {
scrollbar-width: thin;
scrollbar-color: #757575 #dfe9eb;
}

/* Chrome, Edge and Safari */
.scroll-bar::-webkit-scrollbar {
width: 7px;
width: 7px;
}
.scroll-bar::-webkit-scrollbar-track {
border-radius: 5px;
background-color: #dfe9eb;
}

.scroll-bar::-webkit-scrollbar-track:hover {
background-color: #b8c0c2;
}

.scroll-bar::-webkit-scrollbar-track:active {
background-color: #b8c0c2;
}

.scroll-bar::-webkit-scrollbar-thumb {
border-radius: 5px;
background-color: #757575;
}

.scroll-bar::-webkit-scrollbar-thumb:hover {
background-color: #4f4f4f;
}

.scroll-bar::-webkit-scrollbar-thumb:active {
background-color: #4f4f4f;
}
11 changes: 4 additions & 7 deletions web/src/pages/Auction/Auction.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ function AuctionComponent(props: AuctionProps) {
</h3>
</div>
{allbids.length > 0 ? (
<div className="p-6 flex flex-col justify-between xl:w-[575px] xl:pr-0">
<div className="p-6 flex flex-col justify-between max-h-[500px] overflow-y-auto scroll-bar mb-[1rem] xl:pr-[10rem]">
<div className="flex justify-between w-full mb-1">
<p className="text-md font-medium tracking-tight mb-7">Price</p>
<p className="text-md font-medium tracking-tight mb-7 w-[140px]">
Expand Down Expand Up @@ -200,7 +200,7 @@ function AuctionComponent(props: AuctionProps) {
</h3>
</div>
{allbids.length > 0 ? (
<div className="p-6 flex flex-col justify-between xl:w-[575px] xl:pr-0">
<div className="p-6 flex flex-col justify-between max-h-[500px] overflow-y-auto scroll-bar mb-[1rem] xl:pr-[10rem]">
<div className="flex justify-between w-full mb-1">
<p className="text-md font-medium tracking-tight mb-7">Price</p>
<p className="text-md font-medium tracking-tight mb-7 w-[140px]">
Expand Down Expand Up @@ -248,7 +248,7 @@ function AuctionComponent(props: AuctionProps) {
</h3>
</div>
{allbids.length > 0 ? (
<div className="p-6 flex flex-col justify-between xl:w-[575px] xl:pr-0">
<div className="p-6 flex flex-col justify-between max-h-[500px] overflow-y-auto scroll-bar mb-[1rem] xl:pr-[10rem]">
<div className="flex justify-between w-full mb-1">
<p className="text-md font-medium tracking-tight mb-7">Price</p>
<p className="text-md font-medium tracking-tight mb-7 w-[140px]">
Expand Down Expand Up @@ -285,10 +285,7 @@ function AuctionComponent(props: AuctionProps) {
<p className="md:text-xl font-semibold tracking-tight text-black h-[3.75rem]">
{formatDecimals(bid, coinInfo?.decimals || 0).toFixed(2)}
</p>
<p
className="md:text-xl font-semibold h-[3.75rem] tracking-tight text-black w-[140px] truncate leading-6"
title={account}
>
<p className="md:text-xl font-semibold h-[3.75rem] tracking-tight text-black w-[140px] truncate leading-6">
{account}
</p>
</>
Expand Down
165 changes: 85 additions & 80 deletions web/tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,87 +1,90 @@
const env = require('dotenv').config({ path: `./.env` }).parsed;
const env = require("dotenv").config({ path: `./.env` }).parsed;

module.exports = {
content: ['./src/**/*.{html,js,jsx,ts,tsx}'],
content: ["./src/**/*.{html,js,jsx,ts,tsx}"],
theme: {
extend: {
colors: {
'sw-navbar': envColor('AUCTION_COLOR_SHADOW_NAVBAR'),
'sw-tab': envColor('AUCTION_COLOR_SHADOW_TAB'),
'sw-sm': envColor('AUCTION_COLOR_SHADOW_SMALLER'),
'sw-md': envColor('AUCTION_COLOR_SHADOW_SMALL'),
'sw': envColor('AUCTION_COLOR_SHADOW_MEDIUM'),
'sw-lg': envColor('AUCTION_COLOR_SHADOW_LARGE'),
tab: envColor('AUCTION_COLOR_TAB'),
button: envColor('AUCTION_COLOR_BUTTON'),
disabled: envColor('AUCTION_COLOR_DISABLED'),
highlight: envColor('AUCTION_COLOR_HIGHLIGHT'),
success: envColor('AUCTION_COLOR_SUCCESS'),
line: envColor('AUCTION_COLOR_LINE'),
error: envColor('AUCTION_COLOR_ERROR'),
paragraph: envColor('AUCTION_COLOR_PARAGRAPH'),
title: envColor('AUCTION_COLOR_TITLE'),
text: envColor('AUCTION_COLOR_TEXT'),
caption: envColor('AUCTION_COLOR_CAPTION'),
outline: envColor('AUCTION_COLOR_OUTLINE'),
skeleton: envColor('AUCTION_COLOR_SKELETON'),
bid: envColor('AUCTION_COLOR_BID'),
input: envColor('AUCTION_COLOR_INPUT'),
placeholder: envColor('AUCTION_COLOR_PLACEHOLDER'),
'search-token': envColor('AUCTION_COLOR_SEARCH_TOKEN'),
"sw-navbar": envColor("AUCTION_COLOR_SHADOW_NAVBAR"),
"sw-tab": envColor("AUCTION_COLOR_SHADOW_TAB"),
"sw-sm": envColor("AUCTION_COLOR_SHADOW_SMALLER"),
"sw-md": envColor("AUCTION_COLOR_SHADOW_SMALL"),
sw: envColor("AUCTION_COLOR_SHADOW_MEDIUM"),
"sw-lg": envColor("AUCTION_COLOR_SHADOW_LARGE"),
tab: envColor("AUCTION_COLOR_TAB"),
button: envColor("AUCTION_COLOR_BUTTON"),
disabled: envColor("AUCTION_COLOR_DISABLED"),
highlight: envColor("AUCTION_COLOR_HIGHLIGHT"),
success: envColor("AUCTION_COLOR_SUCCESS"),
line: envColor("AUCTION_COLOR_LINE"),
error: envColor("AUCTION_COLOR_ERROR"),
paragraph: envColor("AUCTION_COLOR_PARAGRAPH"),
title: envColor("AUCTION_COLOR_TITLE"),
text: envColor("AUCTION_COLOR_TEXT"),
caption: envColor("AUCTION_COLOR_CAPTION"),
outline: envColor("AUCTION_COLOR_OUTLINE"),
skeleton: envColor("AUCTION_COLOR_SKELETON"),
bid: envColor("AUCTION_COLOR_BID"),
input: envColor("AUCTION_COLOR_INPUT"),
placeholder: envColor("AUCTION_COLOR_PLACEHOLDER"),
"search-token": envColor("AUCTION_COLOR_SEARCH_TOKEN"),
},
backgroundColor: {
color: envColor('AUCTION_BACKGROUND_COLOR'),
shield: envColor('AUCTION_BACKGROUND_COVER'),
color: envColor("AUCTION_BACKGROUND_COLOR"),
shield: envColor("AUCTION_BACKGROUND_COVER"),
},
backgroundImage: {
image: useEnv('AUCTION_BACKGROUND_IMAGE'),
space: useEnv('AUCTION_COLOR_GRADIENT'),
'gd-button': useEnv('AUCTION_COLOR_BUTTON_GRADIENT')
image: useEnv("AUCTION_BACKGROUND_IMAGE"),
space: useEnv("AUCTION_COLOR_GRADIENT"),
"gd-button": useEnv("AUCTION_COLOR_BUTTON_GRADIENT"),
},
backdropBlur: {
cover: useEnv('AUCTION_BACKGROUND_BLUR'),
cover: useEnv("AUCTION_BACKGROUND_BLUR"),
},
lineHeight: {
3.5: '.875rem',
4.5: '1.125rem',
3.5: ".875rem",
4.5: "1.125rem",
},
letterSpacing: {
tighter: '-.06rem',
tight: '-.04rem',
DEFAULT: '-.027rem',
normal: '0',
tighter: "-.06rem",
tight: "-.04rem",
DEFAULT: "-.027rem",
normal: "0",
},
fontSize: {
title: ['1.25rem', {
lineHeight: '1em',
letterSpacing: '.2em',
fontWeight: '700',
fontFamily: ['Poppins', 'sans-serif'],
fontcolor: envColor('AUCTION_COLOR_TITLE'),
}],
3: '.75rem',
3.5: '.875rem',
4: '1rem',
4.5: '1.125rem',
5: '1.25rem',
6: '1.5rem',
title: [
"1.25rem",
{
lineHeight: "1em",
letterSpacing: ".2em",
fontWeight: "700",
fontFamily: ["Poppins", "sans-serif"],
fontcolor: envColor("AUCTION_COLOR_TITLE"),
},
],
3: ".75rem",
3.5: ".875rem",
4: "1rem",
4.5: "1.125rem",
5: "1.25rem",
6: "1.5rem",
},
fontWeight: {
semibold: 600,
bold: 700,
bolder: 800,
},
spacing: {
4.5: '1.125rem',
17: '4.25rem',
4.5: "1.125rem",
17: "4.25rem",
},
borderRadius: {
none: 0,
sm: '.625rem', // 10px
DEFAULT: '.75rem', // 12px
md: '.9375rem', // 15px
lg: '1.25rem', // 20px
large: '1.5rem', // 24px
sm: ".625rem", // 10px
DEFAULT: ".75rem", // 12px
md: ".9375rem", // 15px
lg: "1.25rem", // 20px
large: "1.5rem", // 24px
},
boxShadow: {
navbar: `0px 4px 15px #000`,
Expand All @@ -92,31 +95,29 @@ module.exports = {
lg: `0px 4px 30px #000`,
},
animation: {
'skeleton-body': 'shimmer 5s infinite linear',
'skeleton-img': 'shimmer 2s infinite linear',
'skeleton-text': 'shimmer 1.5s infinite linear',
"skeleton-body": "shimmer 5s infinite linear",
"skeleton-img": "shimmer 2s infinite linear",
"skeleton-text": "shimmer 1.5s infinite linear",
},
keyframes: {
shimmer: {
'0%': {
mask: 'linear-gradient(-60deg,#000 30%,#0009,#000 70%) right/600% 100%',
"0%": {
mask: "linear-gradient(-60deg,#000 30%,#0009,#000 70%) right/600% 100%",
},
'100%': {
mask: 'linear-gradient(-60deg,#000 30%,#0009,#000 70%) left/600% 100%',
"100%": {
mask: "linear-gradient(-60deg,#000 30%,#0009,#000 70%) left/600% 100%",
},
}
},
},
screens: {
smaller: '360px'
smaller: "360px",
},
gridTemplateColumns: {
'auto-fit': 'repeat(auto-fit, minmax(10rem, 1fr))',
"auto-fit": "repeat(auto-fit, minmax(10rem, 1fr))",
},
},
},
plugins: [
require('tailwind-scrollbar-hide')
],
plugins: [require("tailwind-scrollbar-hide")],
};

function hexToRgb(hex) {
Expand All @@ -134,18 +135,22 @@ function hexToRgb(hex) {

function colorParse(color) {
return ({ opacityValue: opacity }) => {
if(typeof color === 'object')
return `rgba(${color.r},${color.g},${color.b},${color.a ? color.a/255 : opacity ? opacity : 1})`;
if(color.startsWith('rgba'))
return color;
else if(color.startsWith('rgb'))
return color.replaceAll('rgb', 'rgba')
.replaceAll(')', `,${opacity ? opacity : 1})`)
else if(color.startsWith('#')) {
if (typeof color === "object")
return `rgba(${color.r},${color.g},${color.b},${
color.a ? color.a / 255 : opacity ? opacity : 1
})`;
if (color.startsWith("rgba")) return color;
else if (color.startsWith("rgb"))
return color
.replaceAll("rgb", "rgba")
.replaceAll(")", `,${opacity ? opacity : 1})`);
else if (color.startsWith("#")) {
color = hexToRgb(color);
return `rgba(${color.r},${color.g},${color.b},${color.a ? color.a/255 : opacity ? opacity : 1})`;
return `rgba(${color.r},${color.g},${color.b},${
color.a ? color.a / 255 : opacity ? opacity : 1
})`;
}
return 'transparent';
return "transparent";
};
}

Expand Down