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/utilities/_heading.scss | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/PAMapp/assets/scss/utilities/_heading.scss b/PAMapp/assets/scss/utilities/_heading.scss
index e73182d..9ec9f55 100644
--- a/PAMapp/assets/scss/utilities/_heading.scss
+++ b/PAMapp/assets/scss/utilities/_heading.scss
@@ -22,10 +22,6 @@
font-weight: bold;
}
-.lighter {
- font-weight: lighter;
-}
-
.smTxt_bold {
font-size: 16px;
font-weight: bold;
@@ -39,12 +35,21 @@
font-size: 14px;
}
+.xxsTxt {
+ font-size: 12px;
+}
+
.text--bold {
font-weight: bold !important;
}
.text--regular {
font-weight: normal !important;
+ font-weight: lighter;
+}
+
+.text--lighter {
+ font-weight: lighter;
}
.text--center {
@@ -55,12 +60,24 @@
text-align: left;
}
+.text--right {
+ text-align: right;
+}
+
.text--primary {
color: $PRIMARY_RED;
}
+.text--black{
+ color: $PRIMARY_BLACK;
+}
+
.text--orange {
color: $ORANGE;
+}
+
+.text--black{
+ color: $PRIMARY_BLACK;
}
.text--dark-blue {
@@ -98,10 +115,22 @@
cursor: pointer;
}
-.text--center {
- text-align: center;
-}
-
.text--underline {
text-decoration: underline;
}
+
+.pam-link-button {
+ @extend .fix-chrome-click--issue;
+ @extend .smTxt;
+ @extend .text--bold;
+ @extend .text--primary;
+ @extend .cursor--pointer;
+}
+
+.pam-link-button--lg {
+ @extend .fix-chrome-click--issue;
+ @extend .mdTxt;
+ @extend .text--bold;
+ @extend .text--primary;
+ @extend .cursor--pointer;
+}
--
Gitblit v1.8.0