Merge branch 'dev/1.10.2' into enterprise

emqx · Oct 29, 2024 · 88c36ba · 88c36ba
2 parents f765e58 + 36edc54
commit 88c36ba
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/views/Auth/AuthnCreate.vue b/src/views/Auth/AuthnCreate.vue
@@ -4,7 +4,11 @@
       :item="{ name: $t('Auth.createAuth'), path: '/authentication' }"
       v-if="!gateway"
     />
-    <el-card :shadow="!gateway ? 'always' : 'never'" class="app-card">
+    <el-card
+      class="app-card"
+      :class="{ 'no-border': !!gateway }"
+      :shadow="!gateway ? 'always' : 'never'"
+    >
       <guide-bar
         :guide-list="getGuideList()"
         :active-guide-index-list="activeGuidesIndex"
@@ -459,6 +463,9 @@ const isAddedBadgeHidden = (value: AuthnMechanismType) => {
 
 <style lang="scss">
 @import './style/auth.scss';
+.app-card.no-border {
+  border: none;
+}
 .no-database-placeholder {
   color: var(--el-text-color-secondary);
 }

diff --git a/src/views/Auth/style/auth.scss b/src/views/Auth/style/auth.scss
@@ -13,7 +13,6 @@
   }
   .create-form {
     width: 75%;
-    margin-bottom: 24px;
     .el-radio.is-bordered {
       text-align: center;
       &.mechanism {

diff --git a/src/views/Gateway/components/auth.vue b/src/views/Gateway/components/auth.vue
@@ -183,6 +183,9 @@ getAuthInfo()
 
 <style lang="scss">
 .gateway-auth-dialog {
+  .el-card.app-card {
+    margin-bottom: 0;
+  }
   .el-dialog__body {
     padding-bottom: 12px;
     .authn-create {