Compare commits

..

No commits in common. "15d901ad6aace3826881cb3c6e0499f75b71df80" and "3214b1dd80d094bcf8c197d8c5ac72d58b0d740d" have entirely different histories.

7 changed files with 36 additions and 38 deletions

View File

@ -9,7 +9,7 @@ jobs:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- uses: actions/setup-node@v1 - uses: actions/setup-node@v1
with: with:
node-version: '14.x' node-version: '12.x'
- name: Install dependencies - name: Install dependencies
uses: bahmutov/npm-install@v1 uses: bahmutov/npm-install@v1
@ -23,7 +23,7 @@ jobs:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- uses: actions/setup-node@v1 - uses: actions/setup-node@v1
with: with:
node-version: '14.x' node-version: '12.x'
- name: Install dependencies - name: Install dependencies
uses: bahmutov/npm-install@v1 uses: bahmutov/npm-install@v1
@ -42,7 +42,7 @@ jobs:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- uses: actions/setup-node@v1 - uses: actions/setup-node@v1
with: with:
node-version: '14.x' node-version: '12.x'
- name: Install dependencies - name: Install dependencies
uses: bahmutov/npm-install@v1 uses: bahmutov/npm-install@v1

View File

@ -10,7 +10,7 @@
font-size: @action-bar-icon-font-size; font-size: @action-bar-icon-font-size;
line-height: 1; line-height: 1;
text-align: center; text-align: center;
background-color: @action-bar-icon-background-color; background-color: @white;
cursor: pointer; cursor: pointer;
&:active { &:active {
@ -18,7 +18,8 @@
} }
&__icon { &__icon {
margin: 0 auto @padding-base; width: 1em;
margin: 0 auto 5px;
color: @action-bar-icon-color; color: @action-bar-icon-color;
font-size: @action-bar-icon-size; font-size: @action-bar-icon-size;
} }

View File

@ -7,4 +7,3 @@
@action-bar-icon-font-size: @font-size-xs; @action-bar-icon-font-size: @font-size-xs;
@action-bar-icon-active-color: @active-color; @action-bar-icon-active-color: @active-color;
@action-bar-icon-text-color: @gray-7; @action-bar-icon-text-color: @gray-7;
@action-bar-icon-background-color: @white;

View File

@ -136,18 +136,17 @@ Use `badge` prop to show badge in icon.
How to use: [Custom Theme](#/en-US/theme). How to use: [Custom Theme](#/en-US/theme).
| Name | Default Value | Description | | Name | Default Value | Description |
| --------------------------------- | ------------------ | ----------- | | -------------------------------- | ------------------ | ----------- |
| @action-bar-background-color | `@white` | - | | @action-bar-background-color | `@white` | - |
| @action-bar-height | `50px` | - | | @action-bar-height | `50px` | - |
| @action-bar-icon-width | `48px` | - | | @action-bar-icon-width | `48px` | - |
| @action-bar-icon-height | `100%` | - | | @action-bar-icon-height | `100%` | - |
| @action-bar-icon-color | `@text-color` | - | | @action-bar-icon-color | `@text-color` | - |
| @action-bar-icon-size | `18px` | - | | @action-bar-icon-size | `18px` | - |
| @action-bar-icon-font-size | `@font-size-xs` | - | | @action-bar-icon-font-size | `@font-size-xs` | - |
| @action-bar-icon-active-color | `@active-color` | - | | @action-bar-icon-active-color | `@active-color` | - |
| @action-bar-icon-text-color | `@gray-7` | - | | @action-bar-icon-text-color | `@gray-7` | - |
| @action-bar-icon-background-color | `@white` | - | | @action-bar-button-height | `40px` | - |
| @action-bar-button-height | `40px` | - | | @action-bar-button-warning-color | `@gradient-orange` | - |
| @action-bar-button-warning-color | `@gradient-orange` | - | | @action-bar-button-danger-color | `@gradient-red` | - |
| @action-bar-button-danger-color | `@gradient-red` | - |

View File

@ -140,18 +140,17 @@ export default {
组件提供了下列 Less 变量,可用于自定义样式,使用方法请参考[主题定制](#/zh-CN/theme)。 组件提供了下列 Less 变量,可用于自定义样式,使用方法请参考[主题定制](#/zh-CN/theme)。
| 名称 | 默认值 | 描述 | | 名称 | 默认值 | 描述 |
| --------------------------------- | ------------------ | ---- | | -------------------------------- | ------------------ | ---- |
| @action-bar-background-color | `@white` | - | | @action-bar-background-color | `@white` | - |
| @action-bar-height | `50px` | - | | @action-bar-height | `50px` | - |
| @action-bar-icon-width | `48px` | - | | @action-bar-icon-width | `48px` | - |
| @action-bar-icon-height | `100%` | - | | @action-bar-icon-height | `100%` | - |
| @action-bar-icon-color | `@text-color` | - | | @action-bar-icon-color | `@text-color` | - |
| @action-bar-icon-size | `18px` | - | | @action-bar-icon-size | `18px` | - |
| @action-bar-icon-font-size | `@font-size-xs` | - | | @action-bar-icon-font-size | `@font-size-xs` | - |
| @action-bar-icon-active-color | `@active-color` | - | | @action-bar-icon-active-color | `@active-color` | - |
| @action-bar-icon-text-color | `@gray-7` | - | | @action-bar-icon-text-color | `@gray-7` | - |
| @action-bar-icon-background-color | `@white` | - | | @action-bar-button-height | `40px` | - |
| @action-bar-button-height | `40px` | - | | @action-bar-button-warning-color | `@gradient-orange` | - |
| @action-bar-button-warning-color | `@gradient-orange` | - | | @action-bar-button-danger-color | `@gradient-red` | - |
| @action-bar-button-danger-color | `@gradient-red` | - |

View File

@ -59,7 +59,7 @@ function Notify(options: NotifyMessage | NotifyOptions) {
clearTimeout(timer); clearTimeout(timer);
if (options.duration! > 0) { if (options.duration! > 0) {
timer = window.setTimeout(Notify.clear, options.duration); timer = setTimeout(Notify.clear, options.duration);
} }
return instance; return instance;

View File

@ -31,7 +31,7 @@ export type PopupPosition = 'top' | 'left' | 'bottom' | 'right' | 'center' | '';
export type PopupCloseIconPosition = export type PopupCloseIconPosition =
| 'top-left' | 'top-left'
| 'top-right' | 'top-right'
| 'bottom-left' | 'botttom-left'
| 'bottom-right'; | 'bottom-right';
const [name, bem] = createNamespace('popup'); const [name, bem] = createNamespace('popup');