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

Use tw theme for in config #2583 #2805

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
+6 −8
Open

Use tw theme for in config #2583 #2805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
24e9291
Use tw theme for in config #2583
VarunVAshrit Feb 4, 2025
ee53f30
Merge branch 'main' into vaash/2583
VarunVAshrit Feb 5, 2025
1f71613
Merge branch 'main' into vaash/2583
VarunVAshrit Feb 7, 2025
382d216
Updated image card carousel env and updated where they are used as we…
VarunVAshrit Feb 7, 2025
a0d8efa
Resolved merge conflict
VarunVAshrit Feb 10, 2025
f28d05c
Resolve merge conflict
VarunVAshrit Feb 10, 2025
c06959f
Final resolve merge conflicts
VarunVAshrit Feb 10, 2025
83dcdaa
Merge branch 'main' into vaash/2583
VarunVAshrit Feb 12, 2025
3f352ee
Merge branch 'main' into vaash/2583
VarunVAshrit Feb 17, 2025
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
2 changes: 1 addition & 1 deletion web/core/Carousel/Carousel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ export const Carousel = forwardRef<HTMLElement, CarouselProps>(function Carousel
aria-labelledby={controlsId}
className={`${
variant === 'image' && displayMode === 'single'
? 'w-[var(--image-carousel-card-w-sm)] md:w-[var(--image-carousel-card-w-md)] lg:w-[var(--image-carousel-card-w-lg)] mx-auto col-start-1 col-end-1 row-start-2 row-end-2'
? 'w-image-carousel-card-w-sm md:w-image-carousel-card-w-md lg:w-image-carousel-card-w-lg mx-auto col-start-1 col-end-1 row-start-2 row-end-2'
: ''
} pt-6 pb-2 ${items.length === 3 ? 'lg:hidden' : ''} flex ${
internalAutoRotation ? 'justify-between' : 'justify-end'
Expand Down
2 changes: 1 addition & 1 deletion web/core/Carousel/CarouselImageItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export const CarouselImageItem = forwardRef<HTMLLIElement, CarouselImageItemProp
${
displayMode === 'scroll'
? 'w-[80%] snap-center scroll-ml-6'
: 'w-[var(--image-carousel-card-w-sm)] md:w-[var(--image-carousel-card-w-md)] lg:w-[var(--image-carousel-card-w-lg)] ms-2 me-2 col-start-1 col-end-1 row-start-1 row-end-1'
: 'w-image-carousel-card-w-sm md:w-image-carousel-card-w-md lg:w-image-carousel-card-w-lg ms-2 me-2 col-start-1 col-end-1 row-start-1 row-end-1'
}
`,
className,
Expand Down
5 changes: 0 additions & 5 deletions web/styles/tailwind.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@

@layer base {
:root {
/* Image carousel card withs */
--image-carousel-card-w-sm: 275px;
--image-carousel-card-w-md: 692px;
--image-carousel-card-w-lg: 980px;

/* Modal */
--modal-transition-duration: 0.4s;
--modal-transition-easing: cubic-bezier(0.45, 0, 0.55, 1);
Expand Down
5 changes: 4 additions & 1 deletion web/tailwind.config.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,9 @@ module.exports = {
'2xl': 'calc((40 / 16) * theme(fontSize.base))',
'3xl': 'calc((56 / 16) * theme(fontSize.base))',
'4xl': 'calc((96 / 16) * theme(fontSize.base))',
'image-carousel-card-w-sm': '275px',
'image-carousel-card-w-md': '692px',
'image-carousel-card-w-lg': '980px',
topbar: '85px',
}),
fontSize: {
Expand Down Expand Up @@ -264,7 +267,7 @@ module.exports = {
viewport: '1920px',
//When large font, prose(65ch) might not be the best
text: '760px',
menuText: 'calc(35 * var(--space-medium))',
menuText: 'calc(35 * theme(spacing.6))',
},
minWidth: {
viewport: '375',
Expand Down
Loading