From b9dcc9ee10d1c61f994dca78d75dde93ff304ad0 Mon Sep 17 00:00:00 2001 From: chencc Date: Wed, 2 Aug 2023 17:03:19 +0800 Subject: [PATCH 1/2] feat: back top style #ASM-14132 --- src/back-top/back-top.component.html | 17 ++++++++++++----- src/back-top/back-top.component.scss | 18 +----------------- src/back-top/back-top.component.ts | 2 +- src/back-top/back-top.module.ts | 3 ++- stories/back-top/inscroll.stories.ts | 3 ++- 5 files changed, 18 insertions(+), 25 deletions(-) diff --git a/src/back-top/back-top.component.html b/src/back-top/back-top.component.html index 1050d44f6..07c58350c 100644 --- a/src/back-top/back-top.component.html +++ b/src/back-top/back-top.component.html @@ -1,10 +1,17 @@
- +
diff --git a/src/back-top/back-top.component.scss b/src/back-top/back-top.component.scss index 1feb54fa1..8aa63f058 100644 --- a/src/back-top/back-top.component.scss +++ b/src/back-top/back-top.component.scss @@ -11,31 +11,15 @@ $block: 'aui-back-top'; height: use-var(inline-height-m); width: use-var(inline-height-m); - color: use-rgb(n-4); - font-size: use-var(font-size-l); - border: 1px solid transparent; border-radius: use-var(border-radius-m); overflow: hidden; visibility: hidden; cursor: pointer; @include popper-shadow; - @include transition; - @include theme-light { - background-color: use-rgb(n-10); - } - @include theme-dark { - background-color: use-rgb(n-8); - } + background-color: use-rgb(n-10); &.show { visibility: visible; } - - &:hover { - color: use-rgb(primary); - border-color: use-rgb(primary); - background-color: use-rgb(p-6); - box-shadow: none; - } } diff --git a/src/back-top/back-top.component.ts b/src/back-top/back-top.component.ts index 38c0f52a1..3392a18ed 100644 --- a/src/back-top/back-top.component.ts +++ b/src/back-top/back-top.component.ts @@ -88,7 +88,7 @@ export class BackTopComponent { } handleClick(event: Event) { - this.scrollToTop(300); + this.scrollToTop(200); this.click.emit(event); } diff --git a/src/back-top/back-top.module.ts b/src/back-top/back-top.module.ts index 53b269afb..b592d390b 100644 --- a/src/back-top/back-top.module.ts +++ b/src/back-top/back-top.module.ts @@ -4,9 +4,10 @@ import { NgModule } from '@angular/core'; import { IconModule } from '../icon/icon.module'; import { BackTopComponent } from './back-top.component'; +import { ButtonModule } from '../button/button.module'; @NgModule({ - imports: [CommonModule, IconModule], + imports: [CommonModule, IconModule, ButtonModule], declarations: [BackTopComponent], exports: [BackTopComponent], }) diff --git a/stories/back-top/inscroll.stories.ts b/stories/back-top/inscroll.stories.ts index 2f7e1d856..b56fb642d 100644 --- a/stories/back-top/inscroll.stories.ts +++ b/stories/back-top/inscroll.stories.ts @@ -3,6 +3,7 @@ import { Meta, StoryObj, moduleMetadata } from '@storybook/angular'; import InscrollComponent from './inscroll.component'; import { BackTopModule, ScrollingModule } from '@alauda/ui'; +import { CdkScrollableModule } from '@angular/cdk/scrolling'; const meta: Meta = { title: 'Example/Back Top', @@ -10,7 +11,7 @@ const meta: Meta = { decorators: [ moduleMetadata({ declarations: [InscrollComponent], - imports: [BackTopModule, ScrollingModule], + imports: [BackTopModule, ScrollingModule, CdkScrollableModule], }), ], }; From 1eaf59da423f7ae8f1f9f2002195741e19e3217a Mon Sep 17 00:00:00 2001 From: Tianze Feng Date: Thu, 10 Aug 2023 14:47:17 +0800 Subject: [PATCH 2/2] Create thirty-knives-refuse.md --- .changeset/thirty-knives-refuse.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/thirty-knives-refuse.md diff --git a/.changeset/thirty-knives-refuse.md b/.changeset/thirty-knives-refuse.md new file mode 100644 index 000000000..9171755ce --- /dev/null +++ b/.changeset/thirty-knives-refuse.md @@ -0,0 +1,5 @@ +--- +"@alauda/ui": patch +--- + +feat: optimizing back-to-top style