refactor: change all round button to rect button

This commit is contained in:
07akioni 2020-05-31 00:58:18 +08:00
parent 8cd5abe766
commit c1c228ec75
9 changed files with 2 additions and 18 deletions

View File

@ -41,7 +41,6 @@
<div class="n-data-table-filter-menu__action"> <div class="n-data-table-filter-menu__action">
<n-button <n-button
size="tiny" size="tiny"
round
:theme="theme" :theme="theme"
@click="handleCancelClick" @click="handleCancelClick"
> >
@ -51,7 +50,6 @@
:theme="theme" :theme="theme"
type="primary" type="primary"
size="tiny" size="tiny"
round
@click="handleConfirmClick" @click="handleConfirmClick"
> >
{{ NDataTable.localeNamespace.confirm }} {{ NDataTable.localeNamespace.confirm }}

View File

@ -79,7 +79,6 @@
v-if="actions.includes('clear')" v-if="actions.includes('clear')"
:theme="theme" :theme="theme"
size="tiny" size="tiny"
round
@click="clearValue" @click="clearValue"
> >
{{ localeNamespace.clear }} {{ localeNamespace.clear }}
@ -88,7 +87,6 @@
v-if="actions.includes('now')" v-if="actions.includes('now')"
:theme="theme" :theme="theme"
size="tiny" size="tiny"
round
@click="setSelectedDateTimeToNow" @click="setSelectedDateTimeToNow"
> >
{{ localeNamespace.now }} {{ localeNamespace.now }}
@ -97,7 +95,6 @@
v-if="actions.includes('confirm')" v-if="actions.includes('confirm')"
:theme="theme" :theme="theme"
size="tiny" size="tiny"
round
type="primary" type="primary"
:disabled="isDateInvalid" :disabled="isDateInvalid"
@click="handleConfirmClick" @click="handleConfirmClick"

View File

@ -155,7 +155,6 @@
v-if="actions.includes('clear')" v-if="actions.includes('clear')"
:theme="theme" :theme="theme"
size="tiny" size="tiny"
round
@click="clearValue" @click="clearValue"
> >
{{ localeNamespace.clear }} {{ localeNamespace.clear }}
@ -164,7 +163,6 @@
v-if="actions.includes('confirm')" v-if="actions.includes('confirm')"
:theme="theme" :theme="theme"
size="tiny" size="tiny"
round
type="primary" type="primary"
:disabled="isRangeInvalid" :disabled="isRangeInvalid"
@click="handleConfirmClick" @click="handleConfirmClick"

View File

@ -110,7 +110,6 @@
v-if="actions.includes('clear')" v-if="actions.includes('clear')"
:theme="theme" :theme="theme"
size="tiny" size="tiny"
round
@click="clearValue" @click="clearValue"
> >
{{ localeNamespace.clear }} {{ localeNamespace.clear }}
@ -119,7 +118,6 @@
v-if="actions.includes('now')" v-if="actions.includes('now')"
:theme="theme" :theme="theme"
size="tiny" size="tiny"
round
@click="setSelectedDateTimeToNow" @click="setSelectedDateTimeToNow"
> >
{{ localeNamespace.now }} {{ localeNamespace.now }}
@ -128,7 +126,6 @@
v-if="actions.includes('confirm')" v-if="actions.includes('confirm')"
:theme="theme" :theme="theme"
size="tiny" size="tiny"
round
type="primary" type="primary"
:disabled="isDateTimeInvalid" :disabled="isDateTimeInvalid"
@click="handleConfirmClick" @click="handleConfirmClick"

View File

@ -235,7 +235,6 @@
v-if="actions.includes('clear')" v-if="actions.includes('clear')"
:theme="theme" :theme="theme"
size="tiny" size="tiny"
round
@click="clearValue" @click="clearValue"
> >
{{ localeNamespace.clear }} {{ localeNamespace.clear }}
@ -245,7 +244,6 @@
:theme="theme" :theme="theme"
:disabled="isRangeInvalid" :disabled="isRangeInvalid"
size="tiny" size="tiny"
round
type="primary" type="primary"
@click="handleConfirmClick" @click="handleConfirmClick"
> >

View File

@ -23,13 +23,11 @@
<slot name="action"> <slot name="action">
<n-button <n-button
size="tiny" size="tiny"
round
@click="handleNegativeClick" @click="handleNegativeClick"
> >
{{ localizedNegativeText }} {{ localizedNegativeText }}
</n-button> </n-button>
<n-button <n-button
round
size="tiny" size="tiny"
type="primary" type="primary"
@click="handlePositiveClick" @click="handlePositiveClick"

View File

@ -136,7 +136,6 @@
<div class="n-time-picker-selector-actions"> <div class="n-time-picker-selector-actions">
<n-button <n-button
size="tiny" size="tiny"
round
:theme="syntheticTheme" :theme="syntheticTheme"
@click="handleNowClick" @click="handleNowClick"
> >
@ -144,7 +143,6 @@
</n-button> </n-button>
<n-button <n-button
size="tiny" size="tiny"
round
type="primary" type="primary"
class="n-time-picker-selector-actions__confirm" class="n-time-picker-selector-actions__confirm"
:theme="syntheticTheme" :theme="syntheticTheme"

View File

@ -265,7 +265,7 @@
justify-content: flex-end; justify-content: flex-end;
@include b(button) { @include b(button) {
margin-bottom: 0; margin-bottom: 0;
margin-right: 12px; margin-right: 8px;
} }
} }
border-top: 1px solid $--date-picker-divider-color; border-top: 1px solid $--date-picker-divider-color;

View File

@ -24,7 +24,7 @@
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
@include b(button) { @include b(button) {
margin-right: 12px; margin-right: 8px;
&:last-child { &:last-child {
margin-right: 0; margin-right: 0;
} }