From 2f8fd5b666fe7c72324cfea4f482c6f3a33b05f9 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期日, 31 十月 2021 18:05:40 +0800
Subject: [PATCH] update: 調整 SCSS 結構 - vendors
---
/dev/null | 3 ---
PAMapp/assets/scss/utilities/_icon.scss | 4 ++--
PAMapp/assets/scss/vendors/_elementUI.scss | 3 +++
PAMapp/assets/scss/main.scss | 4 ++--
PAMapp/assets/scss/utilities/_heading.scss | 2 +-
PAMapp/assets/scss/utilities/_utilities.scss | 4 ++++
6 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/PAMapp/assets/scss/main.scss b/PAMapp/assets/scss/main.scss
index 51b74ac..ae69a6e 100644
--- a/PAMapp/assets/scss/main.scss
+++ b/PAMapp/assets/scss/main.scss
@@ -1,8 +1,8 @@
@import './reset/reset';
+@import '_variable.scss';
@import '~/assets/icon/style.css';
@import '_mixin.scss';
-@import '_variable.scss';
@import './utilities/utilities';
-@import './vendors/elementUI/elementUI';
+@import './vendors/elementUI';
@import '_common.scss';
diff --git a/PAMapp/assets/scss/utilities/_heading.scss b/PAMapp/assets/scss/utilities/_heading.scss
index 01d7ba4..48235d9 100644
--- a/PAMapp/assets/scss/utilities/_heading.scss
+++ b/PAMapp/assets/scss/utilities/_heading.scss
@@ -35,7 +35,7 @@
font-size: 14px;
}
-.font-bold {
+.text--bold {
font-weight: bold;
}
diff --git a/PAMapp/assets/scss/utilities/_icon.scss b/PAMapp/assets/scss/utilities/_icon.scss
index fc73e1b..11f254d 100644
--- a/PAMapp/assets/scss/utilities/_icon.scss
+++ b/PAMapp/assets/scss/utilities/_icon.scss
@@ -2,7 +2,7 @@
font-size: 15px;
padding-right: 8px;
color: #68737A;
- &.icon-primary {
- color: #ED1B2E;
+ &.icon--primary {
+ color: $PRIMARY;
}
}
diff --git a/PAMapp/assets/scss/utilities/_utilities.scss b/PAMapp/assets/scss/utilities/_utilities.scss
index 63bffd1..24d7ddd 100644
--- a/PAMapp/assets/scss/utilities/_utilities.scss
+++ b/PAMapp/assets/scss/utilities/_utilities.scss
@@ -36,3 +36,7 @@
.pr-10 {
padding-right: 10px;
}
+
+.pam-paragraph {
+ margin: 30px 0;
+}
diff --git a/PAMapp/assets/scss/vendors/_elementUI.scss b/PAMapp/assets/scss/vendors/_elementUI.scss
new file mode 100644
index 0000000..69d71c9
--- /dev/null
+++ b/PAMapp/assets/scss/vendors/_elementUI.scss
@@ -0,0 +1,3 @@
+@import './elementUI/avatar';
+@import './elementUI/button';
+@import './elementUI/progress';
diff --git a/PAMapp/assets/scss/vendors/elementUI/_elementUI.scss b/PAMapp/assets/scss/vendors/elementUI/_elementUI.scss
deleted file mode 100644
index 585cc22..0000000
--- a/PAMapp/assets/scss/vendors/elementUI/_elementUI.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-@import '_avatar';
-@import '_progress';
-@import '_button';
--
Gitblit v1.8.0