Merge remote-tracking branch 'origin/master'

bc0c8b11 · 盖献康 · 167880c5 · 30d02e97 · bc0c8b11 · bc0c8b11
Commit bc0c8b11 authored Aug 21, 2023 by 盖献康
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

element-ui.scss src/assets/styles/element-ui.scss +2 -1

banner_add.vue src/views/banner_management/banner_add.vue +3 -0

No files found.
--- a/src/assets/styles/element-ui.scss
+++ b/src/assets/styles/element-ui.scss
@@ -593,5 +593,6 @@ input::-webkit-input-placeholder {
 }
 // 多行文本不覆盖计数文字
 .el-textarea__inner {
-  padding: 4px 50px 4px 4px !important;
+  //padding: 4px 50px 4px 4px !important;
+  padding-right: 50px !important;
 }
--- a/src/views/banner_management/banner_add.vue
+++ b/src/views/banner_management/banner_add.vue
@@ -265,4 +265,7 @@ export default {
  height: 10px !important;
  margin-top: 0 !important;
 }
+::v-deep .el-textarea__inner {
+  //padding-left: 12px !important;
+}
 </style>