Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const image = ref(`${import.meta.env.VITE_APP_BUILD_BASE_URL}static/images/dsj.p

<style scoped>
.card-wrap {
background: #f5f5f5;
background: var(--tv-color-bg-gray-1);
padding: 16px;
}
</style>
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/card/basic-usage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default {

<style scoped>
.card-wrap {
background: #f5f5f5;
background: var(--tv-color-bg-gray-1);
padding: 16px;
}
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const options = ref([

<style scoped>
.card-wrap {
background: #f5f5f5;
background: var(--tv-color-bg-gray-1);
padding: 16px;
}
</style>
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/card/card-disabled.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default {

<style scoped>
.card-wrap {
background: #f5f5f5;
background: var(--tv-color-bg-gray-1);
padding: 16px;
}
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function iconClick(item, index) {

<style scoped>
.card-wrap {
background: #f5f5f5;
background: var(--tv-color-bg-gray-1);
padding: 16px;
}
</style>
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/card/card-events.vue
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export default {

<style scoped>
.card-wrap {
background: #f5f5f5;
background: var(--tv-color-bg-gray-1);
padding: 16px;
}
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ function change(val) {

<style scoped>
.card-wrap {
background: #f5f5f5;
background: var(--tv-color-bg-gray-1);
padding: 16px;
}
</style>
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/card/card-group.vue
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export default {

<style scoped>
.card-wrap {
background: #f5f5f5;
background: var(--tv-color-bg-gray-1);
padding: 16px;
}
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ const dataArr = ref([
<style scoped>
.card-wrap {
width: 100%;
background: #f5f5f5;
background: var(--tv-color-bg-gray-1);
padding: 16px;
display: flex;
justify-content: space-between;
Expand Down
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/card/card-select.vue
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export default {
<style scoped>
.card-wrap {
width: 100%;
background: #f5f5f5;
background: var(--tv-color-bg-gray-1);
padding: 16px;
display: flex;
justify-content: space-between;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const options = ref([

<style scoped>
.card-wrap {
background: #f5f5f5;
background: var(--tv-color-bg-gray-1);
padding: 16px;
}
</style>
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/card/card-size.vue
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export default {

<style scoped>
.card-wrap {
background: #f5f5f5;
background: var(--tv-color-bg-gray-1);
padding: 16px;
}
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import { TinyCard } from '@opentiny/vue'

<style scoped>
.card-wrap {
background: #f5f5f5;
background: var(--tv-color-bg-gray-1);
padding: 16px;
}
</style>
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/card/card-status.vue
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export default {

<style scoped>
.card-wrap {
background: #f5f5f5;
background: var(--tv-color-bg-gray-1);
padding: 16px;
}
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const userHead = ref(`${import.meta.env.VITE_APP_BUILD_BASE_URL}static/images/us

<style scoped>
.card-wrap {
background: #f5f5f5;
background: var(--tv-color-bg-gray-1);
padding: 16px;
}
</style>
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/card/card-type.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export default {

<style scoped>
.card-wrap {
background: #f5f5f5;
background: var(--tv-color-bg-gray-1);
padding: 16px;
}
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ const dataArr = ref([
<style scoped>
.card-wrap {
width: 100%;
background: #f5f5f5;
background: var(--tv-color-bg-gray-1);
padding: 16px;
}
.card-wrap :deep(.tiny-card-group) {
Expand Down
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/card/check-mode.vue
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export default {
<style scoped>
.card-wrap {
width: 100%;
background: #f5f5f5;
background: var(--tv-color-bg-gray-1);
padding: 16px;
}
.card-wrap :deep(.tiny-card-group) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const radioValue = ref(false)

<style scoped>
.card-wrap {
background: #f5f5f5;
background: var(--tv-color-bg-gray-1);
padding: 16px;
}
</style>
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/card/check-type-checkbox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export default {

<style scoped>
.card-wrap {
background: #f5f5f5;
background: var(--tv-color-bg-gray-1);
padding: 16px;
}
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const value = ref('1')

<style scoped>
.card-wrap {
background: #f5f5f5;
background: var(--tv-color-bg-gray-1);
padding: 16px;
}
</style>
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/card/check-type-radio.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export default {

<style scoped>
.card-wrap {
background: #f5f5f5;
background: var(--tv-color-bg-gray-1);
padding: 16px;
}
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ import { TinyCard } from '@opentiny/vue'
<style scoped>
.demo-card-custom-class {
padding: 20px;
background-color: #f0f0f0;
background-color: #f5f5f5;
}
</style>
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/card/custom-class.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ export default {
<style scoped>
.demo-card-custom-class {
padding: 20px;
background-color: #f0f0f0;
background-color: #f5f5f5;
}
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const options = ref([

<style scoped>
.card-wrap {
background: #f5f5f5;
background: var(--tv-color-bg-gray-1);
padding: 16px;
}
</style>
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/card/operate-bar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export default {

<style scoped>
.card-wrap {
background: #f5f5f5;
background: var(--tv-color-bg-gray-1);
padding: 16px;
}
</style>
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/card/slot-composition-api.vue
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const isOpen = ref(true)

<style scoped>
.card-wrap {
background: #f5f5f5;
background: var(--tv-color-bg-gray-1);
padding: 16px;
}
</style>
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/card/slot.vue
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export default {

<style scoped>
.card-wrap {
background: #f5f5f5;
background: var(--tv-color-bg-gray-1);
padding: 16px;
}
</style>
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/qr-code/basic-usage.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ test('基本用法', async ({ page }) => {
page.on('pageerror', (exception) => expect(exception).toBeNull())
await page.goto('qr-code#basic-usage')

const canvas = page.locator('.tiny-qr-code-container canvas')
const canvas = page.locator('.tiny-qr-code canvas')
await expect(canvas).toBeVisible()
})
4 changes: 2 additions & 2 deletions examples/sites/demos/pc/app/qr-code/icon.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ test('自定义 icon', async ({ page }) => {
page.on('pageerror', (exception) => expect(exception).toBeNull())
await page.goto('qr-code#icon')

const canvas = page.locator('.tiny-qr-code-container canvas')
const canvasImg = page.locator('.tiny-qr-code-container .mask-icon img')
const canvas = page.locator('.tiny-qr-code canvas')
const canvasImg = page.locator('.tiny-qr-code .mask-icon img')
await expect(canvas).toBeVisible()
await expect(canvasImg).toBeVisible()
})
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/qr-code/level.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ test('二维码纠错等级', async ({ page }) => {
page.on('pageerror', (exception) => expect(exception).toBeNull())
await page.goto('qr-code#level')

const canvas = page.locator('.tiny-qr-code-container canvas')
const canvas = page.locator('.tiny-qr-code canvas')
await expect(canvas).toBeVisible()

const button = page.locator('.tiny-radio-button--small')
Expand Down
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/qr-code/style.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ test('自定义样式', async ({ page }) => {
page.on('pageerror', (exception) => expect(exception).toBeNull())
await page.goto('qr-code#style')

const canvas = page.locator('.tiny-qr-code-container canvas')
const canvas = page.locator('.tiny-qr-code canvas')
await expect(canvas).toBeVisible()
})
80 changes: 40 additions & 40 deletions packages/theme/src/qr-code/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -10,59 +10,59 @@
*
*/
@import '../custom.less';

@import './vars.less';
@qr-code-prefix-cls: ~'@{css-prefix}qr-code';

.@{qr-code-prefix-cls} {
&-container {
position: relative;
padding: 12px;
.inject-QrCode-vars();
position: relative;
padding: 12px;
background-color: var(--tv-QrCode-container-bg-color);

&.border {
border: 1px solid rgb(5 5 5 / 6%);
border-radius: 8px;
}
&.border {
border: 1px solid rgba(231, 220, 220, 0.06);
border-radius: 8px;
}

.qrcode-border {
padding: 2px;
border: 1px solid rgb(5 5 5 / 6%);
border-radius: 8px;
.qrcode-border {
padding: 2px;
border: 1px solid rgb(5 5 5 / 6%);
border-radius: 8px;
}

.qrcode-expried {
font-size: 14px;
}

.mask {
position: absolute;
display: flex;
align-items: center;
justify-content: center;
width: 100%;
height: 100%;
text-align: center;
color: rgb(0 0 0 / 88%);
inset-block-start: 0;
inset-inline-start: 0;
flex-direction: column;

&-icon {
z-index: 10;
}

.qrcode-expried {
font-size: 14px;
&-status {
z-index: 20;
background: rgb(255 255 255 / 96%);
}

.mask {
.icon {
position: absolute;
display: flex;
align-items: center;
justify-content: center;
width: 100%;
height: 100%;
text-align: center;
color: rgb(0 0 0 / 88%);
inset-block-start: 0;
inset-inline-start: 0;
flex-direction: column;

&-icon {
z-index: 10;
}

&-status {
z-index: 20;
background: rgb(255 255 255 / 96%);
}

.icon {
position: absolute;
display: flex;
align-items: center;
justify-content: center;
border: none;
background: white;
}
border: none;
background: white;
}
}
}
4 changes: 4 additions & 0 deletions packages/theme/src/qr-code/vars.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.inject-QrCode-vars() {
// 二维码背景色
--tv-QrCode-container-bg-color: var(--tv-color-bg-inverse-tint-1);
}
2 changes: 1 addition & 1 deletion packages/theme/src/skeleton-item/vars.less
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@
// 大图片宽度设置
--tv-SkeletonItem-image-large-size-width: 200px;
// 渐变颜色设置(hide)
--tv-SkeletonItem-linear-gradient: linear-gradient(to right, #fafafa, #ebebeb, #fafafa);
--tv-SkeletonItem-linear-gradient: linear-gradient(to right, var(--tv-color-bg-hover), var(--tv-color-border-container), var(--tv-color-bg-hover));
}
Loading