From 3fa74c15650589cb02e90635870e9c4e7d5d068b Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期五, 05 十一月 2021 17:01:11 +0800
Subject: [PATCH] update: 更新共用樣式
---
PAMapp/assets/scss/vendors/_elementUI.scss | 16 ++++----
PAMapp/assets/scss/vendors/elementUI/_dialog.scss | 34 ++++++++--------
PAMapp/assets/scss/vendors/elementUI/_button.scss | 30 ++++++++++++++
PAMapp/assets/scss/utilities/_heading.scss | 10 ++++
4 files changed, 63 insertions(+), 27 deletions(-)
diff --git a/PAMapp/assets/scss/utilities/_heading.scss b/PAMapp/assets/scss/utilities/_heading.scss
index 0e3bf2f..89daea3 100644
--- a/PAMapp/assets/scss/utilities/_heading.scss
+++ b/PAMapp/assets/scss/utilities/_heading.scss
@@ -40,7 +40,11 @@
}
.text--bold {
- font-weight: bold;
+ font-weight: bold !important;
+}
+
+.text--regular {
+ font-weight: normal !important;
}
.text--center {
@@ -66,3 +70,7 @@
.text--mid_grey {
color: $MID_GREY;
}
+.text--middle {
+ font-size: 20px;
+}
+
diff --git a/PAMapp/assets/scss/vendors/_elementUI.scss b/PAMapp/assets/scss/vendors/_elementUI.scss
index 28acb25..3e05d7e 100644
--- a/PAMapp/assets/scss/vendors/_elementUI.scss
+++ b/PAMapp/assets/scss/vendors/_elementUI.scss
@@ -2,11 +2,11 @@
@import './elementUI/button';
@import './elementUI/progress';
@import './elementUI/dropdown';
-@import './elementUI/_checkbox';
-@import './elementUI/_radio';
-@import './elementUI/_drawer';
-@import './elementUI/_carousel';
-@import './elementUI/_rate';
-@import './elementUI/_tag';
-@import './elementUI/_pagination';
-@import './elementUI/_dialog';
\ No newline at end of file
+@import './elementUI/checkbox';
+@import './elementUI/radio';
+@import './elementUI/drawer';
+@import './elementUI/carousel';
+@import './elementUI/rate';
+@import './elementUI/tag';
+@import './elementUI/pagination';
+@import './elementUI/dialog';
diff --git a/PAMapp/assets/scss/vendors/elementUI/_button.scss b/PAMapp/assets/scss/vendors/elementUI/_button.scss
index c87c9f3..782f511 100644
--- a/PAMapp/assets/scss/vendors/elementUI/_button.scss
+++ b/PAMapp/assets/scss/vendors/elementUI/_button.scss
@@ -1,4 +1,3 @@
-
.el-button {
border-width: 2px;
border-radius: 30px;
@@ -12,6 +11,35 @@
&.el-button--primary {
background-color: $PRIMARY_RED;
border-color: $PRIMARY_RED;
+
+ }
+ &+.el-button {
+ margin-left: 20px;
+ }
+ &.is-disabled {
+ color: $PRIMARY_WHITE;
+ background-color: $MID_GREY;
+ border-color: $MID_GREY;
+ }
+}
+
+.pam-tags {
+ .el-button {
+ @extend .text--middle;
+ @extend .text--regular;
+ &.el-button--default {
+ color: $PRIMARY_BLACK;
+ background-color: $PRIMARY_WHITE;
+ border-color: $LIGHT_GREY;
+ }
+ &.el-button--primary {
+ background-color: $PRIMARY_RED;
+ border-color: $PRIMARY_RED;
+ }
+ &.active {
+ background-color: $CORAL;
+ color: $PRIMARY_WHITE;
+ }
}
}
.pam-tags {
diff --git a/PAMapp/assets/scss/vendors/elementUI/_dialog.scss b/PAMapp/assets/scss/vendors/elementUI/_dialog.scss
index 1610f91..e7fd77d 100644
--- a/PAMapp/assets/scss/vendors/elementUI/_dialog.scss
+++ b/PAMapp/assets/scss/vendors/elementUI/_dialog.scss
@@ -1,22 +1,22 @@
.el-dialog {
- border-radius: 10px;
+ border-radius: 10px;
- .el-dialog__header {
- padding: 0;
- }
+ .el-dialog__header {
+ padding: 0;
+ }
- .el-dialog__headerbtn {
- top: -55px;
- background-color: $PRIMARY_WHITE;
- border-radius: 50px;
- width: 45px;
- height: 45px;
- right: 0;
+ .el-dialog__headerbtn {
+ top: -55px;
+ background-color: $PRIMARY_WHITE;
+ border-radius: 50px;
+ width: 45px;
+ height: 45px;
+ right: 0;
- .el-icon-close {
- @extend .subTitle;
- color: $PRIMARY_RED;
- }
+ .el-icon-close {
+ @extend .subTitle;
+ color: $PRIMARY_RED;
+ }
- }
-}
\ No newline at end of file
+ }
+}
--
Gitblit v1.8.0