diff --git a/nezha-fronted/src/assets/stylus/index.scss b/nezha-fronted/src/assets/stylus/index.scss index b10348368..be2e3c2a2 100644 --- a/nezha-fronted/src/assets/stylus/index.scss +++ b/nezha-fronted/src/assets/stylus/index.scss @@ -16,6 +16,16 @@ $btn-light-background-color-hover: linear-gradient(180deg, #F0F0F0 0%, #D8D8D8 9 $btn-light-txt-color: #666; //灰色按钮字体颜色 $btn-light-shadow: 0 0 1px 1px rgba(162,162,162,0.50); //灰色按钮边框阴影 +$btn-normal-background-color-new:#FA901C;//新橙色按钮背景颜色 +$btn-normal-background-color-hover-new:#FE9F37;//新橙色按钮hover背景颜色 +$btn-normal-background-color-active-new:#F37F00;//新橙色按钮active背景颜色 +$btn-normal-txt-color-new: #fff; //新橙色按钮字体颜色 + +$btn-light-border-color-new:rgba(0,0,0,0.15);//新灰色按钮背景颜色 +$btn-light-border-color-hover-new:rgba(250,144,28,0.3);//新灰色按钮hover背景颜色 +$btn-light-border-color-active-new:#FA901C;//新灰色按钮active背景颜色 +$btn-light-txt-color-new: #333;//新灰色色按钮字体颜色 + $pop-box-shadow: 0 0 12px 0 rgba(0,0,0,0.2); $box-title-color: #333; //弹框标题字体颜色 diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index 1b7a9f80a..274bcc4b6 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -249,6 +249,57 @@ li{ .nz-btn.nz-btn-style-pure-white:hover:not(.nz-btn-disabled) { background-color: #dedede; } + +.nz-btn.nz-btn-size-normal-new{ + height: 30px; + line-height: 30px; + text-align: center; + width: 74px; +} +.nz-btn.nz-btn-size-small-new{ + height: 24px; + line-height: 24px; + text-align: center; + width: 60px; +} +.nz-btn.nz-btn-style-normal-new { /* 新版橙色按钮 */ + background: $btn-normal-background-color-new; + color: $btn-normal-txt-color-new; + //box-shadow: $btn-normal-shadow; + border: 0px; +} +.nz-btn.nz-btn-style-light-new { /* 新版浅色按钮 */ + background: #fff; + border: 1px solid $btn-light-border-color-new; + color: $btn-light-txt-color-new; + //box-shadow: $btn-light-shadow; + letter-spacing: 0; +} +.nz-btn.nz-btn-style-normal-new:hover:not(.nz-btn-disabled) { /* 新版橙色按钮hover */ + background: $btn-normal-background-color-hover-new; + color: $btn-normal-txt-color-new; + //box-shadow: $btn-normal-shadow; + border: 0px; +} +.nz-btn.nz-btn-style-light-new:hover:not(.nz-btn-disabled) { /* 新版浅色按钮hover */ + border: 1px solid $btn-light-border-color-hover-new; + color: $btn-light-border-color-hover-new; + //box-shadow: $btn-light-shadow; + letter-spacing: 0; +} +.nz-btn.nz-btn-style-normal-new:active:not(.nz-btn-disabled) { /* 新版橙色按钮active' */ + background: $btn-normal-background-color-active-new; + color: $btn-normal-txt-color-new; + //box-shadow: $btn-normal-shadow; + border: 0px; +} +.nz-btn.nz-btn-style-light-new:active:not(.nz-btn-disabled) { /* 新版浅色按钮active*/ + border: 1px solid $btn-light-border-color-active-new; + color: $btn-light-border-color-active-new; + //box-shadow: $btn-light-shadow; + letter-spacing: 0; +} + .nz-btn:focus { outline: 0; } diff --git a/nezha-fronted/src/components/common/rightBox/accountBox.vue b/nezha-fronted/src/components/common/rightBox/accountBox.vue index 28c741800..8900890f5 100644 --- a/nezha-fronted/src/components/common/rightBox/accountBox.vue +++ b/nezha-fronted/src/components/common/rightBox/accountBox.vue @@ -47,11 +47,11 @@
diff --git a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue index 4729282c9..62b97bbb2 100644 --- a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue +++ b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue @@ -183,7 +183,7 @@
{{$t('validate.required')}}
- + All: {{this.endpointList.length}}
@@ -195,10 +195,10 @@
- -
diff --git a/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue b/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue index d895adadf..22fbe3ec9 100644 --- a/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue +++ b/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue @@ -98,10 +98,10 @@
- -
diff --git a/nezha-fronted/src/components/common/rightBox/assetBox.vue b/nezha-fronted/src/components/common/rightBox/assetBox.vue index b41e79ef6..e78a832f2 100644 --- a/nezha-fronted/src/components/common/rightBox/assetBox.vue +++ b/nezha-fronted/src/components/common/rightBox/assetBox.vue @@ -151,10 +151,10 @@
- -
diff --git a/nezha-fronted/src/components/common/rightBox/moduleBox.vue b/nezha-fronted/src/components/common/rightBox/moduleBox.vue index f9185239e..a878da331 100644 --- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue @@ -280,10 +280,10 @@
- -
diff --git a/nezha-fronted/src/components/common/rightBox/projectBox.vue b/nezha-fronted/src/components/common/rightBox/projectBox.vue index 39a2d1560..c6fa4cbe3 100644 --- a/nezha-fronted/src/components/common/rightBox/projectBox.vue +++ b/nezha-fronted/src/components/common/rightBox/projectBox.vue @@ -25,10 +25,10 @@
- -