From 7e137d1776fac498042f56fd069e583a1a9b2445 Mon Sep 17 00:00:00 2001 From: vthinkxie Date: Sat, 22 Dec 2018 21:35:41 +0800 Subject: [PATCH] fix(module:tabs): fix tabs style error (#2673) --- components/tabs/nz-tabs-nav.component.html | 4 +- components/tabs/nz-tabs-nav.component.ts | 8 +- components/tabs/nz-tabs.spec.ts | 20 +- components/tabs/nz-tabset.component.html | 15 +- components/tabs/nz-tabset.component.ts | 15 - scripts/site/_site/src/theme.less | 475 ++++++++++++--------- 6 files changed, 297 insertions(+), 240 deletions(-) diff --git a/components/tabs/nz-tabs-nav.component.html b/components/tabs/nz-tabs-nav.component.html index 84681e728b6..2cd69e3fb36 100644 --- a/components/tabs/nz-tabs-nav.component.html +++ b/components/tabs/nz-tabs-nav.component.html @@ -19,8 +19,10 @@ [class.ant-tabs-nav-animated]="nzAnimated" #navListElement (cdkObserveContent)="onContentChanges()"> +
+ +
- diff --git a/components/tabs/nz-tabs-nav.component.ts b/components/tabs/nz-tabs-nav.component.ts index d76f4e20ffa..cab3c7e1ce2 100644 --- a/components/tabs/nz-tabs-nav.component.ts +++ b/components/tabs/nz-tabs-nav.component.ts @@ -77,7 +77,9 @@ export class NzTabsNavComponent implements AfterContentChecked, AfterContentInit this._tabPositionMode = value; this.alignInkBarToSelectedTab(); if (this.nzShowPagination) { - this.updatePagination(); + Promise.resolve().then(() => { + this.updatePagination(); + }); } } @@ -175,9 +177,7 @@ export class NzTabsNavComponent implements AfterContentChecked, AfterContentInit } checkPaginationEnabled(): void { - this.showPaginationControls = - this.tabListScrollWidthHeightPix > this.elementRefOffSetWidthHeight; - + this.showPaginationControls = this.tabListScrollWidthHeightPix > this.elementRefOffSetWidthHeight; if (!this.showPaginationControls) { this.scrollDistance = 0; } diff --git a/components/tabs/nz-tabs.spec.ts b/components/tabs/nz-tabs.spec.ts index 122e1b8d741..6cdabfd84d1 100644 --- a/components/tabs/nz-tabs.spec.ts +++ b/components/tabs/nz-tabs.spec.ts @@ -1,7 +1,6 @@ import { Component, TemplateRef, ViewChild, ViewEncapsulation } from '@angular/core'; -import { fakeAsync, flush, tick, TestBed } from '@angular/core/testing'; +import { fakeAsync, tick, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { dispatchFakeEvent } from '../core/testing'; import { NzTabsModule } from './nz-tabs.module'; import { NzTabSetComponent } from './nz-tabset.component'; @@ -449,26 +448,17 @@ describe('tabs', () => { expect(testComponent.select02).toHaveBeenCalledTimes(0); expect(testComponent.deselect02).toHaveBeenCalledTimes(0); })); - it('should prevent focus scroll', fakeAsync(() => { - fixture.detectChanges(); - expect(tabs.nativeElement.scrollLeft).toBe(0); - const input: HTMLInputElement = tabs.nativeElement.querySelector('button'); - input.focus(); - expect(tabs.nativeElement.scrollLeft > 0).toBe(true); - dispatchFakeEvent(tabs.nativeElement, 'scroll'); - flush(); - fixture.detectChanges(); - expect(tabs.nativeElement.scrollLeft).toBe(0); - })); }); describe('init nzTabPosition to left', () => { - it('should next and prev buttons display abnormal', () => { + it('should next and prev buttons display abnormal', fakeAsync(() => { const fixture = TestBed.createComponent(NzTestTabsTabPositionLeftComponent); fixture.detectChanges(); + tick(); + fixture.detectChanges(); const tabs = fixture.debugElement.query(By.directive(NzTabSetComponent)); expect(tabs.nativeElement.querySelector('.ant-tabs-nav-container').classList).not.toContain('ant-tabs-nav-container-scrolling'); - }); + })); }); }); diff --git a/components/tabs/nz-tabset.component.html b/components/tabs/nz-tabset.component.html index 5f793ad1a11..e4cee52f8b4 100644 --- a/components/tabs/nz-tabset.component.html +++ b/components/tabs/nz-tabset.component.html @@ -1,5 +1,13 @@
{{ tab.nzTitle }}
-
diff --git a/components/tabs/nz-tabset.component.ts b/components/tabs/nz-tabset.component.ts index c381b741002..30b52e7c312 100644 --- a/components/tabs/nz-tabset.component.ts +++ b/components/tabs/nz-tabset.component.ts @@ -47,9 +47,6 @@ export type NzTabType = 'line' | 'card'; encapsulation : ViewEncapsulation.None, providers : [ NzUpdateHostClassService ], templateUrl : './nz-tabset.component.html', - host : { - '(scroll)': 'onScroll($event)' - }, styles : [ ` nz-tabset { display: block; @@ -235,18 +232,6 @@ export class NzTabSetComponent implements AfterContentChecked, OnInit, AfterView this.listOfNzTabComponent.splice(this.listOfNzTabComponent.indexOf(value), 1); } - // From https://github.com/react-component/tabs/blob/master/src/Tabs.js - // Prevent focus to make the Tabs scroll offset - onScroll($event: Event): void { - const target: Element = $event.target as Element; - if (target.scrollLeft > 0) { - target.scrollLeft = 0; - if (this.document && this.document.activeElement) { - (this.document.activeElement as HTMLElement).blur(); - } - } - } - // tslint:disable-next-line:no-any constructor(private renderer: Renderer2, private nzUpdateHostClassService: NzUpdateHostClassService, private elementRef: ElementRef, @Optional() @Inject(DOCUMENT) private document: any) { } diff --git a/scripts/site/_site/src/theme.less b/scripts/site/_site/src/theme.less index c7db25198f8..1c3e9a254d3 100755 --- a/scripts/site/_site/src/theme.less +++ b/scripts/site/_site/src/theme.less @@ -1,57 +1,60 @@ // The prefix to use on all css classes from ant. -@ant-prefix : ant; +@ant-prefix : ant; // -------- Colors ----------- -@primary-color : @blue-6; -@info-color : @blue-6; -@success-color : @green-6; -@processing-color : @blue-6; -@error-color : @red-6; -@highlight-color : @red-6; -@warning-color : @gold-6; -@normal-color : #d9d9d9; +@primary-color : @blue-6; +@info-color : @blue-6; +@success-color : @green-6; +@processing-color : @blue-6; +@error-color : @red-6; +@highlight-color : @red-6; +@warning-color : @gold-6; +@normal-color : #d9d9d9; // Color used by default to control hover and active backgrounds and for // alert info backgrounds. -@primary-1: color(~`colorPalette("@{primary-color}", 1)`); // replace tint(@primary-color, 90%) -@primary-2: color(~`colorPalette("@{primary-color}", 2)`); // replace tint(@primary-color, 80%) -@primary-3: color(~`colorPalette("@{primary-color}", 3)`); // unused -@primary-4: color(~`colorPalette("@{primary-color}", 4)`); // unused -@primary-5: color(~`colorPalette("@{primary-color}", 5)`); // color used to control the text color in many active and hover states, replace tint(@primary-color, 20%) -@primary-6: @primary-color; // color used to control the text color of active buttons, don't use, use @primary-color -@primary-7: color(~`colorPalette("@{primary-color}", 7)`); // replace shade(@primary-color, 5%) -@primary-8: color(~`colorPalette("@{primary-color}", 8)`); // unused -@primary-9: color(~`colorPalette("@{primary-color}", 9)`); // unused -@primary-10: color(~`colorPalette("@{primary-color}", 10)`); // unused +@primary-1: color(~`colorPalette('@{primary-color}', 1) `); // replace tint(@primary-color, 90%) +@primary-2: color(~`colorPalette('@{primary-color}', 2) `); // replace tint(@primary-color, 80%) +@primary-3: color(~`colorPalette('@{primary-color}', 3) `); // unused +@primary-4: color(~`colorPalette('@{primary-color}', 4) `); // unused +@primary-5: color( + ~`colorPalette('@{primary-color}', 5) ` +); // color used to control the text color in many active and hover states, replace tint(@primary-color, 20%) +@primary-6: @primary-color; // color used to control the text color of active buttons, don't use, use @primary-color +@primary-7: color(~`colorPalette('@{primary-color}', 7) `); // replace shade(@primary-color, 5%) +@primary-8: color(~`colorPalette('@{primary-color}', 8) `); // unused +@primary-9: color(~`colorPalette('@{primary-color}', 9) `); // unused +@primary-10: color(~`colorPalette('@{primary-color}', 10) `); // unused // Base Scaffolding Variables // --- // Background color for `` -@body-background : #fff; +@body-background : #fff; // Base background color for most components -@component-background : #fff; -@font-family-no-number : "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif; -@font-family : "Monospaced Number", @font-family-no-number; -@code-family : Consolas, Menlo, Courier, monospace; -@heading-color : fade(#000, 85%); -@text-color : fade(#000, 65%); -@text-color-secondary : fade(#000, 45%); -@heading-color-dark : fade(#fff, 100%); -@text-color-dark : fade(#fff,85%); +@component-background : #fff; +@font-family : "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif, +"Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; +@code-family : "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace; +@heading-color : fade(#000, 85%); +@text-color : fade(#000, 65%); +@text-color-secondary : fade(#000, 45%); +@heading-color-dark : fade(#fff, 100%); +@text-color-dark : fade(#fff, 85%); @text-color-secondary-dark: fade(#fff, 65%); -@font-size-base : 14px; -@font-size-lg : @font-size-base + 2px; -@font-size-sm : 12px; -@line-height-base : 1.5; -@border-radius-base : 4px; -@border-radius-sm : 2px; +@font-variant-base : tabular-nums; +@font-size-base : 14px; +@font-size-lg : @font-size-base + 2px; +@font-size-sm : 12px; +@line-height-base : 1.5; +@border-radius-base : 4px; +@border-radius-sm : 2px; // vertical paddings -@padding-lg : 24px; // containers -@padding-md : 16px; // small containers and buttons -@padding-sm : 12px; // Form controls and items -@padding-xs : 8px; // small items +@padding-lg : 24px; // containers +@padding-md : 16px; // small containers and buttons +@padding-sm : 12px; // Form controls and items +@padding-xs : 8px; // small items // vertical padding for all form controls @control-padding-horizontal: @padding-sm; @@ -59,210 +62,215 @@ // The background colors for active and hover states for things like // list items or table cells. -@item-active-bg : @primary-1; -@item-hover-bg : @primary-1; +@item-active-bg : @primary-1; +@item-hover-bg : @primary-1; // ICONFONT -@iconfont-css-prefix : anticon; +@iconfont-css-prefix : anticon; // LINK -@link-color : @primary-color; -@link-hover-color : color(~`colorPalette("@{link-color}", 5)`); -@link-active-color : color(~`colorPalette("@{link-color}", 7)`); -@link-decoration : none; -@link-hover-decoration : none; +@link-color : @primary-color; +@link-hover-color : color(~`colorPalette("@{link-color}", 5)`); +@link-active-color : color(~`colorPalette("@{link-color}", 7)`); +@link-decoration : none; +@link-hover-decoration : none; // Animation -@ease-out : cubic-bezier(0.215, 0.61, 0.355, 1); -@ease-in : cubic-bezier(0.55, 0.055, 0.675, 0.19); -@ease-in-out : cubic-bezier(0.645, 0.045, 0.355, 1); -@ease-out-back : cubic-bezier(0.12, 0.4, 0.29, 1.46); -@ease-in-back : cubic-bezier(0.71, -0.46, 0.88, 0.6); -@ease-in-out-back : cubic-bezier(0.71, -0.46, 0.29, 1.46); -@ease-out-circ : cubic-bezier(0.08, 0.82, 0.17, 1); -@ease-in-circ : cubic-bezier(0.6, 0.04, 0.98, 0.34); -@ease-in-out-circ : cubic-bezier(0.78, 0.14, 0.15, 0.86); -@ease-out-quint : cubic-bezier(0.23, 1, 0.32, 1); -@ease-in-quint : cubic-bezier(0.755, 0.05, 0.855, 0.06); -@ease-in-out-quint : cubic-bezier(0.86, 0, 0.07, 1); +@ease-base-out : cubic-bezier(0.7, 0.3, 0.1, 1); +@ease-base-in : cubic-bezier(0.9, 0, 0.3, 0.7); +@ease-out : cubic-bezier(0.215, 0.61, 0.355, 1); +@ease-in : cubic-bezier(0.55, 0.055, 0.675, 0.19); +@ease-in-out : cubic-bezier(0.645, 0.045, 0.355, 1); +@ease-out-back : cubic-bezier(0.12, 0.4, 0.29, 1.46); +@ease-in-back : cubic-bezier(0.71, -0.46, 0.88, 0.6); +@ease-in-out-back : cubic-bezier(0.71, -0.46, 0.29, 1.46); +@ease-out-circ : cubic-bezier(0.08, 0.82, 0.17, 1); +@ease-in-circ : cubic-bezier(0.6, 0.04, 0.98, 0.34); +@ease-in-out-circ : cubic-bezier(0.78, 0.14, 0.15, 0.86); +@ease-out-quint : cubic-bezier(0.23, 1, 0.32, 1); +@ease-in-quint : cubic-bezier(0.755, 0.05, 0.855, 0.06); +@ease-in-out-quint : cubic-bezier(0.86, 0, 0.07, 1); // Border color -@border-color-base : hsv(0, 0, 85%); // base border outline a component -@border-color-split : hsv(0, 0, 91%); // split border inside a component -@border-width-base : 1px; // width of the border for a component -@border-style-base : solid; // style of a components border +@border-color-base : hsv(0, 0, 85%); // base border outline a component +@border-color-split : hsv(0, 0, 91%); // split border inside a component +@border-width-base : 1px; // width of the border for a component +@border-style-base : solid; // style of a components border // Outline -@outline-blur-size : 0; -@outline-width : 2px; -@outline-color : @primary-color; +@outline-blur-size : 0; +@outline-width : 2px; +@outline-color : @primary-color; -@background-color-light : hsv(0, 0, 98%); // background of header and selected item -@background-color-base : hsv(0, 0, 96%); // Default grey background color +@background-color-light : hsv(0, 0, 98%); // background of header and selected item +@background-color-base : hsv(0, 0, 96%); // Default grey background color // Disabled states -@disabled-color : fade(#000, 25%); -@disabled-bg : @background-color-base; -@disabled-color-dark : fade(#fff, 35%); +@disabled-color : fade(#000, 25%); +@disabled-bg : @background-color-base; +@disabled-color-dark : fade(#fff, 35%); // Shadow -@shadow-color : rgba(0, 0, 0, .15); -@box-shadow-base : @shadow-1-down; -@shadow-1-up : 0 2px 8px @shadow-color; -@shadow-1-down : 0 2px 8px @shadow-color; -@shadow-1-left : -2px 0 8px @shadow-color; -@shadow-1-right : 2px 0 8px @shadow-color; -@shadow-2 : 0 4px 12px @shadow-color; +@shadow-color : rgba(0, 0, 0, .15); +@box-shadow-base : @shadow-1-down; +@shadow-1-up : 0 -2px 8px @shadow-color; +@shadow-1-down : 0 2px 8px @shadow-color; +@shadow-1-left : -2px 0 8px @shadow-color; +@shadow-1-right : 2px 0 8px @shadow-color; +@shadow-2 : 0 4px 12px @shadow-color; // Buttons -@btn-font-weight : 400; +@btn-font-weight : 400; @btn-border-radius-base : @border-radius-base; -@btn-border-radius-sm : @border-radius-base; +@btn-border-radius-sm : @border-radius-base; -@btn-primary-color : #fff; -@btn-primary-bg : @primary-color; +@btn-primary-color : #fff; +@btn-primary-bg : @primary-color; -@btn-default-color : @text-color; -@btn-default-bg : #fff; -@btn-default-border : @border-color-base; +@btn-default-color : @text-color; +@btn-default-bg : #fff; +@btn-default-border : @border-color-base; -@btn-danger-color : @error-color; -@btn-danger-bg : @background-color-base; -@btn-danger-border : @border-color-base; +@btn-danger-color : @error-color; +@btn-danger-bg : @background-color-base; +@btn-danger-border : @border-color-base; -@btn-disable-color : @disabled-color; -@btn-disable-bg : @disabled-bg; -@btn-disable-border : @border-color-base; +@btn-disable-color : @disabled-color; +@btn-disable-bg : @disabled-bg; +@btn-disable-border : @border-color-base; -@btn-padding-base : 0 @padding-md - 1px; -@btn-font-size-lg : @font-size-lg; -@btn-font-size-sm : @font-size-base; -@btn-padding-lg : @btn-padding-base; -@btn-padding-sm : 0 @padding-xs - 1px; +@btn-padding-base : 0 @padding-md - 1px; +@btn-font-size-lg : @font-size-lg; +@btn-font-size-sm : @font-size-base; +@btn-padding-lg : @btn-padding-base; +@btn-padding-sm : 0 @padding-xs - 1px; -@btn-height-base : 32px; -@btn-height-lg : 40px; -@btn-height-sm : 24px; +@btn-height-base : 32px; +@btn-height-lg : 40px; +@btn-height-sm : 24px; -@btn-circle-size : @btn-height-base; -@btn-circle-size-lg : @btn-height-lg; -@btn-circle-size-sm : @btn-height-sm; +@btn-circle-size : @btn-height-base; +@btn-circle-size-lg : @btn-height-lg; +@btn-circle-size-sm : @btn-height-sm; -@btn-group-border : @primary-5; +@btn-group-border : @primary-5; // Checkbox -@checkbox-size : 16px; -@checkbox-color : @primary-color; +@checkbox-size : 16px; +@checkbox-color : @primary-color; +@checkbox-check-color : #fff; +@checkbox-border-width : @border-width-base; // Radio -@radio-size : 16px; -@radio-dot-color : @primary-color; +@radio-size : 16px; +@radio-dot-color : @primary-color; // Radio buttons -@radio-button-bg : @btn-default-bg; -@radio-button-color : @btn-default-color; -@radio-button-hover-color : @primary-5; +@radio-button-bg : @btn-default-bg; +@radio-button-color : @btn-default-color; +@radio-button-hover-color : @primary-5; @radio-button-active-color : @primary-7; // Media queries breakpoints // Extra small screen / phone -@screen-xs : 480px; -@screen-xs-min : @screen-xs; +@screen-xs : 480px; +@screen-xs-min : @screen-xs; // Small screen / tablet -@screen-sm : 576px; -@screen-sm-min : @screen-sm; +@screen-sm : 576px; +@screen-sm-min : @screen-sm; // Medium screen / desktop -@screen-md : 768px; -@screen-md-min : @screen-md; +@screen-md : 768px; +@screen-md-min : @screen-md; // Large screen / wide desktop -@screen-lg : 992px; -@screen-lg-min : @screen-lg; +@screen-lg : 992px; +@screen-lg-min : @screen-lg; // Extra large screen / full hd -@screen-xl : 1200px; -@screen-xl-min : @screen-xl; +@screen-xl : 1200px; +@screen-xl-min : @screen-xl; // Extra extra large screen / large descktop -@screen-xxl : 1600px; -@screen-xxl-min : @screen-xxl; +@screen-xxl : 1600px; +@screen-xxl-min : @screen-xxl; // provide a maximum -@screen-xs-max : (@screen-sm-min - 1px); -@screen-sm-max : (@screen-md-min - 1px); -@screen-md-max : (@screen-lg-min - 1px); -@screen-lg-max : (@screen-xl-min - 1px); -@screen-xl-max : (@screen-xxl-min - 1px); +@screen-xs-max : (@screen-sm-min - 1px); +@screen-sm-max : (@screen-md-min - 1px); +@screen-md-max : (@screen-lg-min - 1px); +@screen-lg-max : (@screen-xl-min - 1px); +@screen-xl-max : (@screen-xxl-min - 1px); // Grid system -@grid-columns : 24; -@grid-gutter-width : 0; +@grid-columns : 24; +@grid-gutter-width : 0; // Layout -@layout-body-background : #f0f2f5; -@layout-header-background : #001529; -@layout-footer-background : @layout-body-background; -@layout-header-height : 64px; -@layout-header-padding : 0 50px; -@layout-footer-padding : 24px 50px; -@layout-sider-background : @layout-header-background; -@layout-trigger-height : 48px; -@layout-trigger-background : #002140; -@layout-trigger-color : #fff; -@layout-zero-trigger-width : 36px; -@layout-zero-trigger-height : 42px; +@layout-body-background : #f0f2f5; +@layout-header-background : #001529; +@layout-footer-background : @layout-body-background; +@layout-header-height : 64px; +@layout-header-padding : 0 50px; +@layout-footer-padding : 24px 50px; +@layout-sider-background : @layout-header-background; +@layout-trigger-height : 48px; +@layout-trigger-background : #002140; +@layout-trigger-color : #fff; +@layout-zero-trigger-width : 36px; +@layout-zero-trigger-height : 42px; // Layout light theme -@layout-sider-background-light : #fff; +@layout-sider-background-light : #fff; @layout-trigger-background-light: #fff; -@layout-trigger-color-light : @text-color; +@layout-trigger-color-light : @text-color; // z-index list -@zindex-affix : 10; -@zindex-back-top : 10; -@zindex-modal-mask : 1000; -@zindex-modal : 1000; -@zindex-notification : 1010; -@zindex-message : 1010; -@zindex-popover : 1030; -@zindex-picker : 1050; -@zindex-dropdown : 1050; -@zindex-tooltip : 1060; +@zindex-affix : 10; +@zindex-back-top : 10; +@zindex-modal-mask : 1000; +@zindex-modal : 1000; +@zindex-notification : 1010; +@zindex-message : 1010; +@zindex-popover : 1030; +@zindex-picker : 1050; +@zindex-dropdown : 1050; +@zindex-tooltip : 1060; // Animation -@animation-duration-slow: .3s; // Modal -@animation-duration-base: .2s; -@animation-duration-fast: .1s; // Tooltip +@animation-duration-slow: 0.3s; // Modal +@animation-duration-base: 0.2s; +@animation-duration-fast: 0.1s; // Tooltip // Form // --- -@label-required-color : @highlight-color; -@label-color : @heading-color; -@form-item-margin-bottom : 24px; -@form-item-trailing-colon : true; +@label-required-color : @highlight-color; +@label-color : @heading-color; +@form-item-margin-bottom : 24px; +@form-item-trailing-colon : true; @form-vertical-label-padding : 0 0 8px; -@form-vertical-label-margin : 0; +@form-vertical-label-margin : 0; // Input // --- -@input-height-base : 32px; -@input-height-lg : 40px; -@input-height-sm : 24px; -@input-padding-horizontal : @control-padding-horizontal - 1px; +@input-height-base : 32px; +@input-height-lg : 40px; +@input-height-sm : 24px; +@input-padding-horizontal : @control-padding-horizontal - 1px; @input-padding-horizontal-base: @input-padding-horizontal; @input-padding-horizontal-sm : @control-padding-horizontal-sm - 1px; @input-padding-horizontal-lg : @input-padding-horizontal; @input-padding-vertical-base : 4px; -@input-padding-vertical-sm : 1px; -@input-padding-vertical-lg : 6px; -@input-placeholder-color : hsv(0, 0, 75%); -@input-color : @text-color; -@input-border-color : @border-color-base; -@input-bg : #fff; -@input-addon-bg : @background-color-light; -@input-hover-border-color : @primary-color; -@input-disabled-bg : @disabled-bg; +@input-padding-vertical-sm : 1px; +@input-padding-vertical-lg : 6px; +@input-placeholder-color : hsv(0, 0, 75%); +@input-color : @text-color; +@input-border-color : @border-color-base; +@input-bg : #fff; +@input-addon-bg : @background-color-light; +@input-hover-border-color : @primary-color; +@input-disabled-bg : @disabled-bg; +@input-outline-offset : 0 0; // Tooltip // --- @@ -271,7 +279,7 @@ //** Tooltip text color @tooltip-color: #fff; //** Tooltip background color -@tooltip-bg: rgba(0, 0, 0, .75); +@tooltip-bg: rgba(0, 0, 0, 0.75); //** Tooltip arrow width @tooltip-arrow-width: 5px; //** Tooltip distance with trigger @@ -299,12 +307,14 @@ // Modal // -- +@modal-header-bg: @component-background; @modal-mask-bg: rgba(0, 0, 0, 0.65); // Progress // -- @progress-default-color: @processing-color; @progress-remaining-color: @background-color-base; +@progress-text-color: @text-color; // Menu // --- @@ -312,9 +322,11 @@ @menu-item-height: 40px; @menu-collapsed-width: 80px; @menu-bg: @component-background; +@menu-popup-bg: @component-background; @menu-item-color: @text-color; @menu-highlight-color: @primary-color; @menu-item-active-bg: @item-active-bg; +@menu-item-active-border-width: 3px; @menu-item-group-title-color: @text-color-secondary; // dark theme @menu-dark-color: @text-color-secondary-dark; @@ -333,7 +345,9 @@ // Table // -- @table-header-bg: @background-color-light; +@table-header-color: @heading-color; @table-header-sort-bg: @background-color-base; +@table-body-sort-bg: rgba(0, 0, 0, 0.01); @table-row-hover-bg: @primary-1; @table-selected-row-bg: #fafafa; @table-expanded-row-bg: #fbfbfb; @@ -374,13 +388,22 @@ // Card // --- @card-head-color: @heading-color; -@card-head-background: @component-background; +@card-head-background: transparent; @card-head-padding: 16px; @card-inner-head-padding: 12px; @card-padding-base: 24px; @card-padding-wider: 32px; @card-actions-background: @background-color-light; -@card-shadow: 0 2px 8px rgba(0, 0, 0, .09); +@card-shadow: 0 2px 8px rgba(0, 0, 0, 0.09); + +// Comment +// --- +@comment-padding-base: 16px 0; +@comment-nest-indent: 44px; +@comment-author-name-color: @text-color-secondary; +@comment-author-time-color: #ccc; +@comment-action-color: @text-color-secondary; +@comment-action-hover-color: #595959; // Tabs // --- @@ -436,36 +459,82 @@ // Breadcrumb // --- -@breadcrumb-base-color: @text-color-secondary; -@breadcrumb-last-item-color: @text-color; -@breadcrumb-font-size: @font-size-base; -@breadcrumb-icon-font-size: @font-size-sm; -@breadcrumb-link-color: @text-color-secondary; -@breadcrumb-link-color-hover: @primary-5; -@breadcrumb-separator-color: @text-color-secondary; -@breadcrumb-separator-margin: 0 @padding-xs; +@breadcrumb-base-color: @text-color-secondary; +@breadcrumb-last-item-color: @text-color; +@breadcrumb-font-size: @font-size-base; +@breadcrumb-icon-font-size: @font-size-base; +@breadcrumb-link-color: @text-color-secondary; +@breadcrumb-link-color-hover: @primary-5; +@breadcrumb-separator-color: @text-color-secondary; +@breadcrumb-separator-margin: 0 @padding-xs; // Slider // --- -@slider-margin: 14px 6px 10px; -@slider-rail-background-color: @background-color-base; -@slider-rail-background-color-hover: #e1e1e1; -@slider-track-background-color: @primary-3; -@slider-track-background-color-hover: @primary-4; -@slider-handle-color: @primary-3; -@slider-handle-color-hover: @primary-4; -@slider-handle-color-focus: tint(@primary-color, 20%); -@slider-handle-color-focus-shadow: tint(@primary-color, 50%); -@slider-handle-color-tooltip-open: @primary-color; -@slider-dot-border-color: @border-color-split; -@slider-dot-border-color-active: tint(@primary-color, 50%); -@slider-disabled-color: @disabled-color; -@slider-disabled-background-color: @component-background; +@slider-margin: 14px 6px 10px; +@slider-rail-background-color: @background-color-base; +@slider-rail-background-color-hover: #e1e1e1; +@slider-track-background-color: @primary-5; +@slider-track-background-color-hover: @primary-6; +@slider-handle-color: @primary-5; +@slider-handle-color-hover: @primary-6; +@slider-handle-color-focus: tint(@primary-color, 20%); +@slider-handle-color-focus-shadow: fade(@primary-color, 20%); +@slider-handle-color-tooltip-open: @primary-color; +@slider-dot-border-color: @border-color-split; +@slider-dot-border-color-active: @primary-5; +@slider-disabled-color: @disabled-color; +@slider-disabled-background-color: @component-background; + +// Tree +// --- +@tree-title-height: 24px; +@tree-child-padding: 18px; +@tree-directory-selected-color: #fff; +@tree-directory-selected-bg: @primary-color; // Collapse // --- -@collapse-header-padding: 12px 0 12px 40px; -@collapse-header-bg: @background-color-light; -@collapse-content-padding: @padding-md; -@collapse-content-bg: @component-background; +@collapse-header-padding: 12px 0 12px 40px; +@collapse-header-bg: @background-color-light; +@collapse-content-padding: @padding-md; +@collapse-content-bg: @component-background; + +// Skeleton +// --- +@skeleton-color: #f2f2f2; + +// Transfer +// --- +@transfer-disabled-bg: @disabled-bg; +// Message +// --- +@message-notice-content-padding: 10px 16px; + +// Motion +// --- +@wave-animation-width: 6px; + +// Alert +// --- +@alert-success-border-color: ~`colorPalette('@{success-color}', 3) `; +@alert-success-bg-color: ~`colorPalette('@{success-color}', 1) `; +@alert-success-icon-color: @success-color; +@alert-info-border-color: ~`colorPalette('@{info-color}', 3) `; +@alert-info-bg-color: ~`colorPalette('@{info-color}', 1) `; +@alert-info-icon-color: @info-color; +@alert-warning-border-color: ~`colorPalette('@{warning-color}', 3) `; +@alert-warning-bg-color: ~`colorPalette('@{warning-color}', 1) `; +@alert-warning-icon-color: @warning-color; +@alert-error-border-color: ~`colorPalette('@{error-color}', 3) `; +@alert-error-bg-color: ~`colorPalette('@{error-color}', 1) `; +@alert-error-icon-color: @error-color; + +// List +// --- +@list-empty-text-padding: @padding-md; +@list-item-padding: @padding-sm 0; +@list-item-content-margin: 0 0 @padding-md 0; +@list-item-meta-margin-bottom: @padding-md; +@list-item-meta-avatar-margin-right: @padding-md; +@list-item-meta-title-margin-bottom: @padding-sm;