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

Jump to bottom

feat: APP-324 Tebu Banner #2485

Merged
merged 8 commits into from
Oct 1, 2024
Merged

feat: APP-324 Tebu Banner #2485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d67079d
feat: add TebuBanner component
flagrede Sep 25, 2024
995c8d3
feat: wire Tebu Banner
flagrede Sep 25, 2024
e5b8fca
fix: only display tebu banner for terrasos
flagrede Sep 26, 2024
43c1614
feat: use local storage to save banner state
flagrede Sep 30, 2024
d63dfa3
fix: spacing and font size
flagrede Sep 30, 2024
22b1af4
feat: make every fields customizable
flagrede Oct 1, 2024
0f9b4f9
fix: build
flagrede Oct 1, 2024
b480b0f
fix: default values usage
flagrede Oct 1, 2024
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
7 changes: 5 additions & 2 deletions tailwind.common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
/* eslint-disable lingui/no-unlocalized-strings */
// This file defines the common tailwind configuration to be used as the basis
// of each project's tailwind.config.js file.
module.exports = {
theme: {
fontFamily: {
sans: ['"Lato"', '-apple-system', 'sans-serif'],
muli: ['"Muli"', '-apple-system', 'sans-serif'],
montserrat: ['"Montserrat"', '-apple-system', 'sans-serif'],
},
colors: {
// Make sure these guidelines are followed when adding new colors: https://tailwindcss.com/docs/customizing-colors#using-css-variables
Expand Down Expand Up @@ -77,14 +79,15 @@ module.exports = {
'linear-gradient(24deg, rgba(81, 93, 137, 0.10) 2.82%, rgba(125, 201, 191, 0.10) 23.42%, rgba(250, 235, 209, 0.10) 79.07%)',
'purple-gradient':
'linear-gradient(179deg,#515D89 19.77%,#7DC9BF 114.05%,#FAEBD1 200.67%)',
'blue-green-gradient': 'linear-gradient(197deg, #7D9AA2 8.02%, #9AD3BE 43.42%, #D1E2C7 78.83%)'
'blue-green-gradient':
'linear-gradient(197deg, #7D9AA2 8.02%, #9AD3BE 43.42%, #D1E2C7 78.83%)',
},
boxShadow: {
sm: '0px 4px 10px 0px rgba(0, 0, 0, 0.05)',
md: '0px 4px 10px 0px rgba(0, 0, 0, 0.05), 0px 0px 10px 0px rgba(250, 250, 216, 0.80)',
},
fontWeight: {
inherit: "inherit",
inherit: 'inherit',
},
backgroundColor: {
transparent: 'transparent',
Expand Down
2 changes: 0 additions & 2 deletions tailwind.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
--purple-300: 128 142 171;
--purple-200: 187 195 210;
--purple-100: 221 225 233;

}

.dark {
Expand Down Expand Up @@ -91,5 +90,4 @@
.bg-transparent {
background-color: transparent;
}

}
1 change: 1 addition & 0 deletions web-components/src/theme/fonts.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@import url('https://fonts.googleapis.com/css?family=Muli:500,800,900&display=swap');
@import url('https://fonts.googleapis.com/css?family=Lato:100,300,400,700,800&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,100..900;1,100..900&display=swap');

@font-face {
font-family: 'FoxesInLove';
Expand Down
1 change: 0 additions & 1 deletion web-marketplace/netlify.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ VITE_BRIDGE = "true"
VITE_SKIPPED_CLASS_ID = ""

[context.deploy-preview.environment]
VITE_SANITY_TAG = "default"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have moved this variable to Netlify so we can override it in Netlify for a specific branch.

VITE_SANITY_DATASET = "staging"
VITE_RECAPTCHA_SITE_KEY = "6LchxlAaAAAAANjtO3w4b5ihVCL87tYfbe0ltzp9"
VITE_API_URI = "https://api-staging.regen.network"
Expand Down
Binary file added web-marketplace/public/png/logo/tebu.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.
Loading