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(time-picker): [time-picker] fixed a button style issue in the Sass theme #2330

Merged
merged 2 commits into from
Oct 21, 2024
Merged

fix(time-picker): [time-picker] fixed a button style issue in the Sass theme #2330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ca0257
fix(time-picker): [time-picker] updata tag sass
wuyiping0628 Oct 21, 2024
857f7d8
Merge branch 'dev' of github.com:opentiny/tiny-vue into wyp/time-pick…
wuyiping0628 Oct 21, 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
40 changes: 40 additions & 0 deletions packages/theme-saas/src/time-range/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,44 @@
&__body {
@apply border-r border-r-color-bg-3;
}

&__footer {
@apply border-t border-t-color-bg-3;
@apply py-3 px-4;
@apply h-14;
@apply leading-8;
@apply box-border;
@apply flex;
@apply justify-between;
}

&__btn {
@apply border-none;
@apply leading-7;
min-width: 72px;
@apply h-7;
@apply cursor-pointer;
@apply bg-transparent;
@apply outline-0;
@apply p-0;
@apply m-0;
@apply rounded;
@apply text-xs;

&.cancel {
@apply text-color-brand;
@apply text-left;
@apply rounded;
}

&.confirm {
@apply text-color-text-inverse;
@apply bg-color-brand;
@apply rounded;

&:hover {
@apply bg-color-brand-hover;
}
}
}
}
2 changes: 1 addition & 1 deletion packages/vue/src/time-range/src/pc.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<div class="tiny-time-range-picker__footer">
<tiny-button
v-if="!state.showTimePickerRangeButton"
class="tiny-time-range-picker__btn"
class="tiny-time-range-picker__btn cancel"
@click="handleCancel()"
>
{{ t('ui.datepicker.cancel') }}
Expand Down
2 changes: 1 addition & 1 deletion packages/vue/src/time/src/pc.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</time-spinner>
</div>
<div class="tiny-time-panel__footer">
<tiny-button v-if="!state.showTimePickerButton" class="tiny-time-panel__btn" @click="handleCancel()">
<tiny-button v-if="!state.showTimePickerButton" class="tiny-time-panel__btn cancel" @click="handleCancel()">
{{ t('ui.datepicker.cancel') }}
</tiny-button>
<tiny-button
Expand Down
Loading