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

fix: improve the style priority of overwriting tinyvue #848

Merged
merged 1 commit into from
Oct 10, 2024
Merged

fix: improve the style priority of overwriting tinyvue #848

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 26 additions & 26 deletions packages/theme/base/src/component-common.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// 1、select 下拉框组件
.tiny-select {
.tiny-select.tiny-select {
.tiny-input {
// 输入框
&.is-focus .tiny-input__inner {
Expand Down Expand Up @@ -28,7 +28,7 @@
}
}

.tiny-select-dropdown {
.tiny-select-dropdown.tiny-select-dropdown {
// 下拉新增列
.tiny-select__top-create {
margin: 8px 12px 4px 12px;
Expand Down Expand Up @@ -75,7 +75,7 @@
}

// 2、input框
.tiny-input {
.tiny-input.tiny-input {
&.tiny-input-prefix .tiny-input__inner {
padding: 0 8px 0 30px;
}
Expand All @@ -101,7 +101,7 @@
}

// 3、折叠框
.tiny-collapse {
.tiny-collapse.tiny-collapse {
border-top: 0;
.tiny-collapse-item__header {
flex-direction: row-reverse;
Expand Down Expand Up @@ -150,7 +150,7 @@
}

// 4、树-tree
.tiny-tree {
.tiny-tree.tiny-tree {
.tiny-tree-node__wrapper {
cursor: pointer;
color: var(--te-common-text-primary);
Expand Down Expand Up @@ -178,7 +178,7 @@
}

// 5、页签tabs
.tiny-tabs {
.tiny-tabs.tiny-tabs {
.tiny-tabs__header {
.tiny-tabs__item__title {
padding: 0 12px;
Expand Down Expand Up @@ -207,7 +207,7 @@
}

// 6、search组件
.tiny-search {
.tiny-search.tiny-search {
.tiny-search__line {
height: 24px;
border-radius: var(--te-base-border-radius-1);
Expand All @@ -230,7 +230,7 @@
}

// 7、dialog组件
.tiny-dialog-box {
.tiny-dialog-box.tiny-dialog-box {
padding: 20px;
.tiny-dialog-box__header {
font-size: var(--te-base-font-size-1);
Expand Down Expand Up @@ -261,7 +261,7 @@
}

// 8、button按钮
.tiny-button {
.tiny-button.tiny-button {
font-size: var(--te-base-font-size-base);
border-radius: var(--te-base-border-radius-1);
padding: 0 8px;
Expand Down Expand Up @@ -309,7 +309,7 @@
}
}

.tiny-button-group {
.tiny-button-group.tiny-button-group {
ul.tiny-group-item {
border-radius: var(--te-base-border-radius-normal);
li {
Expand Down Expand Up @@ -346,7 +346,7 @@
}

// 9、modal模态框
.tiny-modal__box {
.tiny-modal__box.tiny-modal__box {
padding: 20px;
border-radius: var(--te-base-border-radius-1);
box-shadow: 0 0 10px 0 var(--te-base-rgba-23);
Expand Down Expand Up @@ -378,7 +378,7 @@
}

//10、modal的消息提示框
.tiny-modal.tiny-modal__wrapper.type__message {
.tiny-modal.tiny-modal.tiny-modal__wrapper.type__message {
.tiny-modal__box {
border-radius: var(--te-base-border-radius-2);
box-shadow: 0 2px 12px 0 var(--te-base-rgba-24);
Expand All @@ -401,7 +401,7 @@
}

// 11、numeric 组件
.tiny-numeric {
.tiny-numeric.tiny-numeric {
.tiny-numeric__input-inner {
height: 24px;
border-radius: var(--te-base-border-radius-1);
Expand Down Expand Up @@ -441,7 +441,7 @@
}

// 12、popover气泡卡片
.tiny-popover.tiny-popper[x-placement] {
.tiny-popover.tiny-popover.tiny-popper[x-placement] {
padding: 0px 8px;
font-size: var(--te-base-font-size-base);
color: var(--te-common-text-primary);
Expand All @@ -452,7 +452,7 @@
}

// 13、tag标签
.tiny-tag {
.tiny-tag.tiny-tag {
font-size: var(--te-base-font-size-base);
color: var(--te-common-text-secondary);
background: var(--te-common-bg-disabled);
Expand All @@ -464,7 +464,7 @@
}

// 14、radio 单选
.tiny-radio {
.tiny-radio.tiny-radio {
margin-right: 20px;
.tiny-radio__inner {
border: 1px solid var(--te-common-border-hover);
Expand All @@ -479,7 +479,7 @@
}
}

.tiny-radio-group {
.tiny-radio-group.tiny-radio-group {
.tiny-radio-button {
&:first-child {
.tiny-radio-button__inner {
Expand All @@ -504,7 +504,7 @@
}

// 15、checkbox 复选框适配
.tiny-checkbox {
.tiny-checkbox.tiny-checkbox {
.tiny-checkbox__input {
&.is-checked .tiny-checkbox__inner {
background-color: var(--te-common-bg-primary-checked);
Expand All @@ -523,7 +523,7 @@
}

// 16、notify通知
.tiny-notify {
.tiny-notify.tiny-notify {
border-radius: var(--te-base-border-radius-2);
padding: 12px;
background-color: var(--te-common-bg-default);
Expand Down Expand Up @@ -582,7 +582,7 @@
}

// 17、tooltip文字提示
.tiny-tooltip {
.tiny-tooltip.tiny-tooltip {
&.tiny-tooltip__popper {
box-shadow: 0 4px 16px 0 var(--te-base-rgba-23);
&[class*='is-'] {
Expand Down Expand Up @@ -624,7 +624,7 @@
}

// 18、表单
.tiny-form {
.tiny-form.tiny-form {
.tiny-form-item {
.tiny-form-item__label {
color: var(--te-common-text-secondary);
Expand All @@ -647,7 +647,7 @@
}

// 19、表格
.tiny-grid__wrapper {
.tiny-grid__wrapper.tiny-grid__wrapper {
.tiny-grid {
font-size: var(--te-base-font-size-base);
background-color: var(--te-common-bg-default);
Expand Down Expand Up @@ -715,7 +715,7 @@
}

// 20、loading组件
.tiny-loading {
.tiny-loading.tiny-loading {
.tiny-loading__spinner {
margin-top: 0;
transform: translateY(-50%);
Expand All @@ -729,7 +729,7 @@
}

// 21、progress进度条
.tiny-progress.tiny-progress--line.progress-first {
.tiny-progress.tiny-progress.tiny-progress--line.progress-first {
&.tiny-progress-bar__outer {
background-color: var(--te-common-border-divider);
}
Expand All @@ -740,7 +740,7 @@
}

// 22、开关
.tiny-switch {
.tiny-switch.tiny-switch {
background-color: var(--te-common-bg-switch);
border: none;
&.tiny-switch-checked {
Expand All @@ -752,7 +752,7 @@
}

// 23、下拉菜单
.tiny-dropdown {
.tiny-dropdown.tiny-dropdown {
&__trigger {
color: var(--te-common-text-primary);
&:not(&__caret-button):hover {
Expand Down