\ No newline at end of file
diff --git a/packages/toolkits/pro/template/tinyng/src/app/@shared/components/personalize/personalize.component.scss b/packages/toolkits/pro/template/tinyng/src/app/@shared/components/personalize/personalize.component.scss
index 0715abd4..b6e34fe8 100644
--- a/packages/toolkits/pro/template/tinyng/src/app/@shared/components/personalize/personalize.component.scss
+++ b/packages/toolkits/pro/template/tinyng/src/app/@shared/components/personalize/personalize.component.scss
@@ -1,101 +1,113 @@
+.t-pro-personalize-title {
+ .t-pro-title {
+ color: var(--ti-base-color-common-7);
+ font-weight: normal;
+ font-size: 18px;
+ line-height: 25px;
+ font-weight: 500;
+ }
+}
+
.t-pro-personalize-config {
- padding: 0 12px;
+ padding: 8px 48px 0;
- .t-pro-personalize-title {
- display: flex;
- flex-direction: column;
- width: 100%;
- align-items: center;
- justify-content: center;
-
- .t-pro-title {
- color: var(--ti-base-color-common-7);
- transform: translateY(-5px);
- font-size: var(--ti-common-font-size-5);
- font-weight: 500;
- }
+ .t-pro-list-title {
+ font-size: 16px;
+ font-weight: normal;
+ color: var(--ti-base-color-common-7);
+ line-height: 22px;
+ }
+
+ .content-space {
+ margin: 40px 0 20px 0;
}
+
.t-pro-item {
- color: var(--ti-base-color-common-7);
- text-align: center;
- background-color: var(--ti-common-color-bg-white-normal);
- box-shadow: var(--ti-common-shadow-1-down);
- border-radius: var(--ti-common-border-radius-normal);
- padding: 24px 16px 20px;
- margin-bottom: 12px;
- height: 100%;
-
- &:last-child {
- margin-right: 0;
- }
+ width: 436px;
+ height: 64px;
+ border-radius: 8px;
+ box-shadow: 2px 2px 15px 3px rgba(85 ,105 ,173 ,.06);
+ margin: 20px 0;
+ font-size: 14px;
+ line-height: 20px;
+ color: var(--ti-base-color-white);
+ position: relative;
.t-pro-item-title {
+ padding: 10px 0 0 20px;
+ }
+
+ .t-pro-item-content {
+ padding: 3px 0 0 20px;
+ }
+
+ .t-pro-item-icon {
+ width: 24px;
+ height: 24px;
+ border-radius: 50%;
+ background-color: var(--ti-base-color-white);
display: flex;
justify-content: center;
- flex-direction: column;
align-items: center;
- font-size: var(--ti-common-font-size-base);
-
- .t-pro-icon-content {
- display: flex;
- align-items: center;
- justify-content: center;
- width: 46px;
- height: 46px;
- border-radius: var(--ti-common-border-radius-1);
- background-color: var(--ti-base-color-brand-2);
- color: var(--ti-base-color-white);
+ position: absolute;
+ right: 20px;
+ bottom: 20px;
+
+ .icon-green {
+ color: #7bd06c;
}
- .t-pro-item-title-text {
- margin-top: 12px;
- font-size: var(--ti-common-font-size-base);
- font-weight: 500;
+ > ti-icon {
+ padding-top: 3px;
+ font-size: 20px;
+ color: #dfe1e6;
}
}
- .t-pro-radio-row {
- text-align: left;
- margin-left: 16px;
- margin-bottom: 16px;
- width: 100%;
- }
}
-}
-
-.t-pro-theme-name {
- display: flex;
- align-items: center;
- justify-content: center;
- color: var(--ti-base-color-common-7);
- font-size: var(--ti-common-font-size-2);
- font-weight: 600;
- margin-bottom: 12px;
- margin-top: 24px;
-}
-.t-pro-theme-colors {
- .t-pro-theme-color {
- text-align: center;
- }
+ .t-pro-theme-box {
+ display: flex;
+ justify-content: space-between;
+ width: 588px;
+ .t-pro-theme-item {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin: 10px 0 30px 0;
+ width: 56px;
+ height: 56px;
+ border-radius: 8px;
+ box-shadow: 2px 2px 15px 3px rgba(85 ,105 ,173 ,.06);
+ .t-pro-color {
+ border-radius: 50%;
+ width: 26px;
+ height: 26px;
- .t-pro-color-avatar {
- display: inline-flex;
- align-items: center;
- justify-content: center;
- width: 30px;
- height: 30px;
- border-radius: var(--ti-common-border-radius-normal);
- cursor: pointer;
- margin-left: 12px;
- transition: box-shadow 0.3s cubic-bezier(0.645, 0.045, 0.355, 1), transform 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
- &:hover {
- box-shadow: var(--ti-common-shadow-3-down);
+ > ti-icon {
+ padding: 3px 0 0 3px;
+ font-size: 20px;
+ color: var(--ti-base-color-white);
+ }
+ }
}
- &:first-child {
- margin-left: 0;
+ .t-pro-dark {
+ background: #676868;
}
}
+
+}
+
+::ng-deep ti-modal-wrapper .modal-class-personalize {
+ width: 748px;
+ height: 922px;
+ margin-top: 60px;
+}
+
+::ng-deep .ti3-modal-body {
+ max-height: none !important;
+}
+::ng-deep .ti3-modal-close {
+ color: #8a8e99 !important;
}
@media only screen and (max-width: 1024px) {
diff --git a/packages/toolkits/pro/template/tinyng/src/app/@shared/components/personalize/personalize.component.ts b/packages/toolkits/pro/template/tinyng/src/app/@shared/components/personalize/personalize.component.ts
index 689fd7c1..a2c432ed 100644
--- a/packages/toolkits/pro/template/tinyng/src/app/@shared/components/personalize/personalize.component.ts
+++ b/packages/toolkits/pro/template/tinyng/src/app/@shared/components/personalize/personalize.component.ts
@@ -1,7 +1,7 @@
import { Component, OnInit } from '@angular/core';
import { PersonalizeService } from 'src/app/@core/services/personalize.service';
import { CustomThemeService } from 'src/app/@core/services/custom-theme.service';
-import { ThemeType, ThemeColors, DefaultTheme } from '../../models/theme';
+import { ThemeType, ThemeColors, DefaultTheme, LightTheme, ThemeDarkColor } from '../../models/theme';
@Component({
selector: 't-pro-personalize',
@@ -15,22 +15,36 @@ export class PersonalizeComponent implements OnInit {
public currentTheme: any;
public configs: any[] = [];
public themeColors: any = ThemeColors;
+ public LightTheme:any = LightTheme;
+ public ThemeDarkColor:any = ThemeDarkColor;
public currentValue: any = {
- themes: localStorage.getItem('t-pro-theme') ? JSON.parse(localStorage.getItem('t-pro-theme')!) : DefaultTheme,
+ themes: localStorage.getItem('t-pro-theme')
+ ? JSON.parse(localStorage.getItem('t-pro-theme')!)
+ : DefaultTheme,
};
- constructor(private personalizeService: PersonalizeService, private customThemeService: CustomThemeService) {
+ constructor(
+ private personalizeService: PersonalizeService,
+ private customThemeService: CustomThemeService
+ ) {
this.customColor = DefaultTheme.brand;
this.customDark = DefaultTheme.isDark;
}
ngOnInit() {
+ this.ThemeDarkColor.forEach((item: { isDark: boolean; }) => {
+ item.isDark = true;
+ });
+ this.LightTheme.forEach((item: { isDark: boolean; }) => {
+ item.isDark = false;
+ });
this.configs = this.personalizeService.configs;
+ this.currentTheme = this.currentValue?.themes.id;
this.getCustomColor();
}
- onChange(type: string, value: any) {
+ changeTheme(type: string, value: any) {
if (type === 'themes') {
this.currentTheme = value;
this.personalizeService.changeTheme(value);
@@ -49,12 +63,19 @@ export class PersonalizeComponent implements OnInit {
}
}
- selectColor(color: string, theme: any) {
+ selectColor(type: string, value: any) {
+ if (type === 'themes') {
+ this.currentTheme = value.id;
+ this.personalizeService.changeTheme(value.id);
+ }
+ }
+
+ selectDarkColor(color: string, theme: any) {
this.customColor = color;
this.customDark = theme.isDark;
this.currentValue.themes.id = ThemeType.Custom;
this.currentTheme = ThemeType.Custom;
-
- this.customThemeService.changeCustomTheme(color, theme.isDark);
+
+ this.customThemeService.changeCustomTheme(color, theme.isDark, theme.id);
}
}
diff --git a/packages/toolkits/pro/template/tinyng/src/app/@shared/components/register/register.component.html b/packages/toolkits/pro/template/tinyng/src/app/@shared/components/register/register.component.html
index 1f47ee5c..8ce026fa 100644
--- a/packages/toolkits/pro/template/tinyng/src/app/@shared/components/register/register.component.html
+++ b/packages/toolkits/pro/template/tinyng/src/app/@shared/components/register/register.component.html
@@ -4,7 +4,7 @@
-
+
TinyPro of Ng
diff --git a/packages/toolkits/pro/template/tinyng/src/app/@shared/components/side-menu/side-menu.component.scss b/packages/toolkits/pro/template/tinyng/src/app/@shared/components/side-menu/side-menu.component.scss
index 2ab8a11a..93695bea 100644
--- a/packages/toolkits/pro/template/tinyng/src/app/@shared/components/side-menu/side-menu.component.scss
+++ b/packages/toolkits/pro/template/tinyng/src/app/@shared/components/side-menu/side-menu.component.scss
@@ -6,9 +6,8 @@
margin: 3px 0;
}
- .ti3-leftmenu-level1-active-item:before,
- .ti3-leftmenu-level2-active:before {
- background-color: var(--ti-base-color-brand-6);
+ .ti3-leftmenu-level1-active-item:before, .ti3-leftmenu-level2-active:before {
+ background-color: #fff;
}
::ng-deep .ti3-leftmenu-panel {
@@ -18,10 +17,10 @@
::ng-deep .ti3-leftmenu-level1-item.ti3-leftmenu-level1-active-item {
background-color: var(--ti-common-color-bg-light-normal);
-
+ color: #fff;
&:hover {
background-color: var(--ti-common-color-bg-light-normal);
- color: var(--ti-common-color-text-highlight);
+ color: #fff !important;
}
}
@@ -36,10 +35,10 @@
::ng-deep .ti3-leftmenu-level2.ti3-leftmenu-level2-active {
background-color: var(--ti-common-color-bg-light-normal);
-
+ color: #fff !important;
&:hover {
- background-color: var(--ti-common-color-bg-light-normal);
- color: var(--ti-common-color-text-highlight);
+ background-color: var(--ti-common-color-bg-light-normal) !important;
+ color: #fff !important;
}
}
@@ -52,8 +51,8 @@
width: 28px;
height: 28px;
border-radius: 50%;
- background-color: #fff;
- box-shadow: 0px 4px 12px 0px rgba(0, 0, 0, 0.1);
+ background-color: var(--ti-base-collapse-bg-color);
+ box-shadow: 0px 4px 12px 0px rgba(0 ,0 ,0 ,.10);
}
.menu-item {
diff --git a/packages/toolkits/pro/template/tinyng/src/app/@shared/models/theme.ts b/packages/toolkits/pro/template/tinyng/src/app/@shared/models/theme.ts
index e5bb58ab..00e43cc2 100644
--- a/packages/toolkits/pro/template/tinyng/src/app/@shared/models/theme.ts
+++ b/packages/toolkits/pro/template/tinyng/src/app/@shared/models/theme.ts
@@ -13,50 +13,128 @@ export const TinyThemeConfigItems = [
cnName: '默认主题',
id: 'tiny-hws-theme',
isDark: undefined,
- name: '默认主题',
+ name: 'personalize.tiny-hws-theme',
+ feature: 'personalize.tiny-hws-theme-feature',
+ show: 'linear-gradient(225deg,#97b3f2 1%, #5e7ce0)'
},
{
cnName: '蜜糖主题',
id: 'tiny-sweet-theme',
isDark: undefined,
- name: '蜜糖主题',
+ name: 'personalize.tiny-sweet-theme',
+ feature: 'personalize.tiny-sweet-theme-feature',
+ show: 'linear-gradient(229deg,#f79fd5, #ed66ab 94%)'
},
{
cnName: '紫罗兰主题',
id: 'tiny-provence-theme',
isDark: undefined,
- name: '紫罗兰主题',
+ name: 'personalize.tiny-provence-theme',
+ feature: 'personalize.tiny-provence-theme-feature',
+ show: 'linear-gradient(225deg,#b3a3f8, #7c6aee)'
},
{
cnName: '深邃夜空主题',
id: 'tiny-deep-theme',
isDark: undefined,
- name: '深邃夜空主题',
+ name: 'personalize.tiny-deep-theme',
+ feature: 'personalize.tiny-deep-theme-feature',
+ show: 'linear-gradient(228deg,#4a566c, #242b3a 96%)'
},
{
cnName: '深色主题',
id: 'tiny-dark-theme',
isDark: true,
- name: '深色主题',
+ name: 'personalize.tiny-dark-theme',
+ feature: 'personalize.tiny-dark-theme-feature',
+ show: 'linear-gradient(228deg,#464747 5%, #000000)'
+ }
+];
+export const LightTheme = [
+ {
+ id: 'tiny-light-theme-1',
+ color : '#343a40',
},
{
- cnName: '自定义主题',
- id: 'tiny-customize-theme',
- isDark: false,
- name: '自定义主题',
+ id: 'tiny-light-theme-2',
+ color : '#25316C',
},
-];
+ {
+ id: 'tiny-light-theme-3',
+ color : '#673AB7',
+ },
+ {
+ id: 'tiny-light-theme-4',
+ color : '#4f7dff',
+ },
+ {
+ id: 'tiny-light-theme-5',
+ color : '#4DAF77',
+ },
+ {
+ id: 'tiny-light-theme-6',
+ color : '#5faa15',
+ },
+ {
+ id: 'tiny-light-theme-7',
+ color : '#FF6A0B',
+ },
+ {
+ id: 'tiny-light-theme-8',
+ color : '#F36B7F',
+ }
+]
-export const ThemeColors = [
+export const ThemeDarkColor = [
+ {
+ id: 'tiny-dark-theme',
+ color : '#343a40',
+ },
+ {
+ id: 'tiny-dark-theme-1',
+ color : '#25316C',
+ },
+ {
+ id: 'tiny-dark-theme-2',
+ color : '#673AB7',
+ },
+ {
+ id: 'tiny-dark-theme-3',
+ color : '#4f7dff',
+ },
{
- name: 'Light',
- isDark: false,
- colors: ['#343a40', '#24316c', '#673AB7', '#4f7dff', '#4caf78', '#5faa15', '#ff6a0d', '#f36b7f'],
+ id: 'tiny-dark-theme-4',
+ color : '#4DAF77',
},
+ {
+ id: 'tiny-dark-theme-5',
+ color : '#5faa15',
+ },
+ {
+ id: 'tiny-dark-theme-6',
+ color : '#FF6A0B',
+ },
+ {
+ id: 'tiny-dark-theme-7',
+ color : '#F36B7F',
+ },
+]
+
+export const ThemeColors = [
{
name: 'Dark',
+ title: 'personalize.tiny-dark-theme',
isDark: true,
- colors: ['#343a40', '#24316c', '#673AB7', '#4f7dff', '#4caf78', '#5faa15', '#ff6a0d', '#f36b7f'],
+ colors: [
+ '#343a40',
+ '#24316c',
+ '#292332',
+ '#4f7dff',
+ '#4caf78',
+ '#5faa15',
+ '#ff6a0d',
+ '#f36b7f',
+ ],
},
];
@@ -67,4 +145,4 @@ export const DefaultTheme = {
custome: {},
};
-export const ThemeAddrPrefix = '/assets/styles/theme/';
+export const ThemeAddrPrefix = '/assets/styles/theme';
diff --git a/packages/toolkits/pro/template/tinyng/src/app/@shared/modules/dropdown/dropdown.component.scss b/packages/toolkits/pro/template/tinyng/src/app/@shared/modules/dropdown/dropdown.component.scss
index b70801b6..706b085e 100644
--- a/packages/toolkits/pro/template/tinyng/src/app/@shared/modules/dropdown/dropdown.component.scss
+++ b/packages/toolkits/pro/template/tinyng/src/app/@shared/modules/dropdown/dropdown.component.scss
@@ -1,3 +1,5 @@
+
+
.cdk-overlay-container,
.cdk-global-overlay-wrapper {
pointer-events: none;
@@ -145,15 +147,15 @@
outline: none;
}
-.open > .t-pro-base-dropdown-menu {
+.open>.t-pro-base-dropdown-menu {
display: block;
}
-.t-pro-base-dropdown-menu > li {
+.t-pro-base-dropdown-menu>li {
position: relative;
}
-.t-pro-base-dropdown-menu > li > a {
+.t-pro-base-dropdown-menu>li>a {
height: 36px;
padding: 0 10px;
cursor: pointer;
@@ -162,41 +164,41 @@
text-decoration: none;
}
-.t-pro-base-dropdown-menu li > input {
+.t-pro-base-dropdown-menu li>input {
margin: 0 10px;
}
-.t-pro-base-dropdown-menu > .disabled > a {
+.t-pro-base-dropdown-menu>.disabled>a {
color: #adb0b8;
cursor: not-allowed;
}
-.t-pro-base-dropdown-menu > .disabled > a:hover,
-.t-pro-base-dropdown-menu > .disabled > a:focus {
+.t-pro-base-dropdown-menu>.disabled>a:hover,
+.t-pro-base-dropdown-menu>.disabled>a:focus {
cursor: not-allowed;
}
.t-pro-base-dropdown-menu .t-pro-base-dropdown-item:not(.disabled):hover:not(:active):not(.selected):not(.active) {
- background-color: var(--ti-base-color-brand-1);
- color: var(--ti-base-color-brand-7);
+ background-color: var(--ti-base-color-brand-2);
+ color: var(--ti-base-color-common);
}
.t-pro-base-dropdown-menu .t-pro-base-dropdown-item:not(.disabled):active:hover {
- background-color: var(--ti-base-color-brand-1);
- color: var(--ti-base-color-brand-7);
+ background-color: var(--ti-base-color-brand-2);
+ color: var(--ti-base-color-common);
}
.t-pro-base-dropdown-menu .t-pro-base-dropdown-item:not(.disabled).t-pro-base-dropdown-bg {
- background-color: var(--ti-base-color-brand-1);
- color: var(--ti-base-color-brand-7);
+ background-color: var(--ti-base-color-brand-2);
+ color: var(--ti-base-color-common);
}
.t-pro-base-dropdown-menu .t-pro-base-dropdown-item:not(.disabled).active {
- background-color: var(--ti-base-color-brand-1);
- color: var(--ti-base-color-brand-7);
+ background-color: var(--ti-base-color-brand-2);
+ color: var(--ti-base-color-common);
}
-.cdk-overlay-pane > div > .t-pro-base-dropdown-menu {
+.cdk-overlay-pane>div>.t-pro-base-dropdown-menu {
position: relative;
top: 0; // initial; ie11不认识initial
left: 0; //initial;
@@ -204,6 +206,7 @@
}
.t-pro-base-dropdown span {
+
&.icon-chevron-down,
&.icon-select-arrow {
display: inline-block;
@@ -212,6 +215,7 @@
}
.t-pro-base-dropdown-animation span {
+
&.icon-chevron-down,
&.icon-select-arrow {
transition: transform 300ms cubic-bezier(0.645, 0.045, 0.355, 1);
@@ -219,6 +223,7 @@
}
.t-pro-base-dropdown.open span {
+
&.icon-chevron-down,
&.icon-select-arrow {
transform: rotate(180deg);
diff --git a/packages/toolkits/pro/template/tinyng/src/app/@shared/styles/common.scss b/packages/toolkits/pro/template/tinyng/src/app/@shared/styles/common.scss
index f14392f9..57e91d4a 100644
--- a/packages/toolkits/pro/template/tinyng/src/app/@shared/styles/common.scss
+++ b/packages/toolkits/pro/template/tinyng/src/app/@shared/styles/common.scss
@@ -6,7 +6,7 @@
font-family: PingFang SC, PingFang SC-PingFang SC;
font-weight: normal;
text-align: left;
- color: #4e5969;
+ color: var(--ti-common-color-text-primary);
line-height: 14px;
}
}
@@ -26,7 +26,6 @@
@mixin t-pro-product-card {
padding: 20px 20px;
- box-shadow: 0px 0px 8px 8px rgba(169, 174, 184, 0.05);
border-radius: 8px;
background: var(--ti-common-color-bg-white-normal);
}
@@ -52,3 +51,22 @@
background-color: var(--ti-common-color-line-normal);
}
}
+::ng-deep .ti3-leftmenu-level2:after {
+ border: none !important;
+}
+
+::ng-deep .ti3-btn-danger {
+ background-color: var(--ti-common-color-bg-light-normal) !important;
+}
+
+::ng-deep .ti3-leftmenu-panel {
+ font-size: 14px;
+ color:var(--ti-base-menu-text) !important;
+}
+
+a {
+ color: var(--ti-base-link-a-color) !important;
+ &:hover{
+ text-decoration: underline;
+ }
+}
\ No newline at end of file
diff --git a/packages/toolkits/pro/template/tinyng/src/app/app-routing.module.ts b/packages/toolkits/pro/template/tinyng/src/app/app-routing.module.ts
index 4566c8de..2db038ed 100644
--- a/packages/toolkits/pro/template/tinyng/src/app/app-routing.module.ts
+++ b/packages/toolkits/pro/template/tinyng/src/app/app-routing.module.ts
@@ -2,12 +2,12 @@ import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { AuthGuardService } from './@core/services/auth-guard-service.guard';
import { LoginComponent, RegisterComponent } from '@shared/tiny-pro';
-import { MarketplaceComponent } from './pages/console-home/widgets/marketplace/marketplace.component';
const routes: Routes = [
{
path: 'pages',
- loadChildren: () => import('./pages/pages.module').then((m) => m.PagesModule),
+ loadChildren: () =>
+ import('./pages/pages.module').then((m) => m.PagesModule),
canActivate: [AuthGuardService],
},
{
@@ -18,10 +18,6 @@ const routes: Routes = [
path: 'pages/register',
component: RegisterComponent,
},
- {
- path: 'pages/platform-demo',
- component: MarketplaceComponent,
- },
{
path: '',
redirectTo: 'pages',
@@ -31,6 +27,7 @@ const routes: Routes = [
path: '**',
redirectTo: 'pages',
},
+
];
@NgModule({
diff --git a/packages/toolkits/pro/template/tinyng/src/app/pages/console-home/console-home.component.scss b/packages/toolkits/pro/template/tinyng/src/app/pages/console-home/console-home.component.scss
index 986f697c..79666665 100644
--- a/packages/toolkits/pro/template/tinyng/src/app/pages/console-home/console-home.component.scss
+++ b/packages/toolkits/pro/template/tinyng/src/app/pages/console-home/console-home.component.scss
@@ -2,18 +2,17 @@
.resource-groups {
border-radius: 8px;
- box-shadow: 0px 0px 8px 8px rgba(169, 174, 184, 0.05);
- background: var(--ti-common-color-bg-white-normal);
+ background: var(--ti-base-card-bg-color);
}
.marketplace-content {
border-radius: 8px;
- box-shadow: 0px 0px 8px 8px rgba(169, 174, 184, 0.05);
- background: var(--ti-common-color-bg-white-normal);
+ background: var(--ti-base-card-bg-color);
}
.recommendation-ad {
border-radius: 8px;
- box-shadow: 0px 0px 8px 8px rgba(169, 174, 184, 0.05);
- background: var(--ti-common-color-bg-white-normal);
+ background: var(--ti-base-card-bg-color);
}
+
+
diff --git a/packages/toolkits/pro/template/tinyng/src/app/pages/console-home/widgets/beginner-guide/beginner-guide.component.scss b/packages/toolkits/pro/template/tinyng/src/app/pages/console-home/widgets/beginner-guide/beginner-guide.component.scss
index a105d9ae..d4dac6d7 100644
--- a/packages/toolkits/pro/template/tinyng/src/app/pages/console-home/widgets/beginner-guide/beginner-guide.component.scss
+++ b/packages/toolkits/pro/template/tinyng/src/app/pages/console-home/widgets/beginner-guide/beginner-guide.component.scss
@@ -2,12 +2,14 @@
padding: 20px 20px;
margin-top: 20px;
border-radius: 8px;
- box-shadow: 0px 0px 8px 8px rgba(169, 174, 184, 0.05);
- background: var(--ti-common-color-bg-white-normal);
+ background: var(--ti-base-card-bg-color);
width: 100%;
-
a {
text-decoration: none;
+ color: var(--ti-base-notice-content-color);
+ &:hover {
+ font-weight: 600;
+ }
}
.beginner-title {
@@ -18,7 +20,7 @@
.title {
font-size: 16px;
- color: var(--ti-common-color-text-primary);
+ color: var(--ti-base-notice-content-color);
font-weight: bold;
}
@@ -29,6 +31,11 @@
a {
font-size: 14px;
+ &:hover {
+ color: var(--ti-common-color-text-primary);
+ text-decoration: underline;
+ font-weight: 600;
+ }
}
}
}
@@ -36,11 +43,11 @@
.beginner-content {
a {
font-size: 12px;
- color: var(--ti-common-color-text-primary);
+ color: var(--ti-base-notice-content-color);
}
a span:last-of-type:hover {
- color: var(--ti-common-color-bg-hover);
+ font-weight: 600;
}
> li:not(:last-of-type) {
diff --git a/packages/toolkits/pro/template/tinyng/src/app/pages/console-home/widgets/marketplace/marketplace-all-svg/marketplace-all-svg.component.html b/packages/toolkits/pro/template/tinyng/src/app/pages/console-home/widgets/marketplace/marketplace-all-svg/marketplace-all-svg.component.html
index afdf6eba..ea5d5e02 100644
--- a/packages/toolkits/pro/template/tinyng/src/app/pages/console-home/widgets/marketplace/marketplace-all-svg/marketplace-all-svg.component.html
+++ b/packages/toolkits/pro/template/tinyng/src/app/pages/console-home/widgets/marketplace/marketplace-all-svg/marketplace-all-svg.component.html
@@ -6,10 +6,10 @@
+ fill="#AAA" p-id="808">
+ fill="#AAA" p-id="809">
@@ -17,7 +17,7 @@