Skip to content

Commit c1c86e3

Browse files
authored
fix: advanced rendering toggle in app barely worked (#6056)
1 parent c760260 commit c1c86e3

2 files changed

Lines changed: 29 additions & 1 deletion

File tree

apps/app-frontend/src/App.vue

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1647,6 +1647,12 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
16471647
&.app-contents::before {
16481648
box-shadow: none;
16491649
}
1650+
1651+
*,
1652+
:deep(*) {
1653+
box-shadow: none !important;
1654+
--tw-drop-shadow:;
1655+
}
16501656
}
16511657
16521658
.app-sidebar::before {

packages/ui/src/components/base/ButtonStyled.vue

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,10 @@ const fontSize = computed(() => {
241241
<template>
242242
<div
243243
class="btn-wrapper"
244-
:class="[{ outline: type === 'outlined', chip: type === 'chip' }, fontSize]"
244+
:class="[
245+
{ outline: type === 'outlined', transparent: type === 'transparent', chip: type === 'chip' },
246+
fontSize,
247+
]"
245248
:style="`${colorVariables}--_height:${height};--_width:${width};--_radius: ${radius};--_padding-x:${paddingX};--_padding-y:${paddingY};--_gap:${gap};--_font-weight:${fontWeight};--_icon-size:${iconSize};--_outline-color:${color === 'standard' && type === 'outlined' ? 'var(--surface-5)' : 'currentColor'}`"
246249
>
247250
<slot />
@@ -314,6 +317,25 @@ const fontSize = computed(() => {
314317
}
315318
}
316319
320+
.disable-advanced-rendering {
321+
.btn-wrapper:not(.outline):not(.transparent) :deep(:is(button, a, .button-like):first-child),
322+
.btn-wrapper:not(.outline):not(.transparent) :slotted(:is(button, a, .button-like):first-child),
323+
.btn-wrapper:not(.outline):not(.transparent)
324+
:slotted(*)
325+
> :is(button, a, .button-like):first-child,
326+
.btn-wrapper:not(.outline):not(.transparent)
327+
:slotted(*)
328+
> *:first-child
329+
> :is(button, a, .button-like):first-child,
330+
.btn-wrapper
331+
:slotted(*)
332+
> *:first-child
333+
> *:first-child
334+
> :is(button, a, .button-like):first-child {
335+
@apply border border-[rgba(0,0,0,0.2)];
336+
}
337+
}
338+
317339
.btn-wrapper.outline :deep(:is(button, a, .button-like):first-child),
318340
.btn-wrapper.outline :slotted(:is(button, a, .button-like):first-child),
319341
.btn-wrapper.outline :slotted(*) > :is(button, a, .button-like):first-child,

0 commit comments

Comments
 (0)