From 6fa4bba623713c396432ba8b863846883d6a1906 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期三, 26 一月 2022 10:52:23 +0800
Subject: [PATCH] Merge branch 'pollex-dev' into sit
---
PAMapp/assets/scss/_common.scss | 119 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 94 insertions(+), 25 deletions(-)
diff --git a/PAMapp/assets/scss/_common.scss b/PAMapp/assets/scss/_common.scss
index fd5e44c..1898ed7 100644
--- a/PAMapp/assets/scss/_common.scss
+++ b/PAMapp/assets/scss/_common.scss
@@ -4,10 +4,9 @@
margin: 0;
color: $PRIMARY_BLACK;
font-family: Segoe UI;
-}
-
-h5 {
- margin: 0;
+ scroll-behavior: smooth;
+ height: 100%;
+ overflow-x: hidden;
}
// btn
@@ -41,29 +40,99 @@
}
}
+.pam-cus-tabs {
+ display: flex;
+ width: 100%;
+ height: 45px;
-
-// el-carousel
-.el-carousel__indicators--outside {
- .el-carousel__indicator--horizontal {
- .el-carousel__button {
- width: 9px;
- height: 9px;
- border-radius: 50px;
- border: solid 1px $LIGHT_GREY;
- background-color: $PRIMARY_WHITE;
- }
-
- &.is-active {
- .el-carousel__button {
- background-color: $PRIMARY_RED;
- }
- }
+ .cus-tab-item {
+ @extend .fix-chrome-click--issue;
+ width: 50%;
+ text-align: center;
+ font-size: 24px;
+ border-bottom: solid 3px $LIGHT_GREY;
+ cursor: pointer;
}
- .el-carousel__indicator--horizontal:nth-child(2) {
- .el-carousel__button {
- margin: 0 20px;
- }
+ .is-active {
+ font-weight: bold;
+ border-bottom: solid 3px $PRIMARY_BLACK;
+
}
}
+
+.vue-scroll-picker {
+ height: 250px;
+
+ .vue-scroll-picker-list-rotator {
+ .vue-scroll-picker-item {
+ font-size: 20px;
+ padding: 5px 0;
+ }
+ }
+
+ .vue-scroll-picker-layer {
+ .top {
+ height: calc(50% - 1.2em);
+ }
+ .bottom {
+ height: calc(50% - 1.2em);
+ }
+ }
+
+}
+
+.pam-clientReserved-input.el-input--suffix {
+ .el-input__inner {
+ border-radius: 30px;
+ }
+
+ .search {
+ line-height: 40px;
+ padding-right: 10px;
+ }
+}
+
+.remind-container{
+ margin-top: 13px;
+ margin-bottom: 20px;
+ display: flex;
+ .remind-date{
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ font-weight: bold;
+ width: 70px;
+ border-radius: 6px;
+ border-bottom: 1px solid #CCCCCC;
+ border-right: 1px solid #CCCCCC;
+ border-left: 1px solid #CCCCCC;
+ }
+ .remind-content-txt{
+ display: flex;
+ flex-direction: column;
+ border: 1px solid #CCCCCC;
+ flex:1;
+ border-radius: 5px;
+ padding: 10px;
+ }
+ .mb-3{
+ margin-bottom: 3px;
+ }
+ .mt-2{
+ margin-top:2px;
+ }
+ .date-year{
+ color: #fff;
+ align-items: center;
+ display: flex;
+ justify-content: center;
+ }
+ .bgc-primary-red{
+ background-color:$PRIMARY_RED;
+ width: 70.5px;
+ border-top-left-radius:6px;
+ border-top-right-radius:6px;
+ border: 1px solid #CCCCCC;
+ }
+}
--
Gitblit v1.8.0