From 88e29ed5854ed9e62b719e4804958206c5fd9db1 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 22 十一月 2024 19:30:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/assets/styles/btn.scss | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/assets/styles/btn.scss b/src/assets/styles/btn.scss
index e6ba1a8..6ceb1e6 100644
--- a/src/assets/styles/btn.scss
+++ b/src/assets/styles/btn.scss
@@ -1,4 +1,4 @@
-@import './variables.scss';
+@import './variables.module.scss';
@mixin colorBtn($color) {
background: $color;
@@ -14,35 +14,35 @@
}
.blue-btn {
- @include colorBtn($blue)
+ @include colorBtn($blue);
}
.light-blue-btn {
- @include colorBtn($light-blue)
+ @include colorBtn($light-blue);
}
.red-btn {
- @include colorBtn($red)
+ @include colorBtn($red);
}
.pink-btn {
- @include colorBtn($pink)
+ @include colorBtn($pink);
}
.green-btn {
- @include colorBtn($green)
+ @include colorBtn($green);
}
.tiffany-btn {
- @include colorBtn($tiffany)
+ @include colorBtn($tiffany);
}
.yellow-btn {
- @include colorBtn($yellow)
+ @include colorBtn($yellow);
}
.pan-btn {
- font-size: 14px;
+ font-size: 12px;
color: #fff;
padding: 14px 36px;
border-radius: 8px;
@@ -94,6 +94,6 @@
outline: 0;
margin: 0;
padding: 10px 15px;
- font-size: 14px;
+ font-size: 12px;
border-radius: 4px;
}
--
Gitblit v1.8.0