From 458f7fed791b6e7c64096d810c961cea441bd772 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 02 十一月 2021 17:44:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
PAMapp/assets/scss/_common.scss | 42 ++++++++----------------------------------
1 files changed, 8 insertions(+), 34 deletions(-)
diff --git a/PAMapp/assets/scss/_common.scss b/PAMapp/assets/scss/_common.scss
index c13dbf9..c9a46e6 100644
--- a/PAMapp/assets/scss/_common.scss
+++ b/PAMapp/assets/scss/_common.scss
@@ -2,8 +2,9 @@
// reset
html,body {
margin: 0;
- color: $black;
+ color: $PRIMARY_BLACK;
font-family: Segoe UI;
+ overflow-x: hidden;
}
h5 {
@@ -24,46 +25,19 @@
.outline_btn {
padding: 10px 20px;
border-radius: 30px;
- color: $primaryRed;
+ color: $PRIMARY_RED;
border: solid 2px;
&:hover {
- color: $primaryRed;
- background-color: $white;
+ color: $PRIMARY_RED;
+ background-color: $PRIMARY_WHITE;
}
&:focus {
- background-color: $coral;
+ background-color: $CORAL;
}
&:disabled {
- background-color: $lightGrey;
+ background-color: $LIGHT_GREY;
}
-}
-
-
-
-// el-carousel
-.el-carousel__indicators--outside {
- .el-carousel__indicator--horizontal {
- .el-carousel__button {
- width: 9px;
- height: 9px;
- border-radius: 50px;
- border: solid 1px $lightGrey;
- background-color: $white;
- }
-
- &.is-active {
- .el-carousel__button {
- background-color: $primaryRed;
- }
- }
- }
-
- .el-carousel__indicator--horizontal:nth-child(2) {
- .el-carousel__button {
- margin: 0 20px;
- }
- }
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0