diff --git a/assets/src/less/admin.less b/assets/src/less/admin.less index c4514d2783..9135fdc0c1 100644 --- a/assets/src/less/admin.less +++ b/assets/src/less/admin.less @@ -103,7 +103,7 @@ cursor: context-menu; top: 80px; right: -10px; - z-index: 1; + z-index: 99999; background-color: #fff; padding: 20px; border-radius: 3px; diff --git a/assets/src/less/global-admin.less b/assets/src/less/global-admin.less index fb339a6a5a..671fb44012 100644 --- a/assets/src/less/global-admin.less +++ b/assets/src/less/global-admin.less @@ -255,12 +255,23 @@ @media only screen and (max-width: 375px) { .dokan-admin-notices { + .notice-content{ + flex-direction: column; + align-items: start !important; + gap: 1rem; + } .dokan-notice-slides { min-height: 245px; .dokan-admin-notice { + align-items: start; + padding: 10px 20px; .dokan-message { - margin: 0 0 0 23px; + div{ + max-height: 50px; + overflow: auto; + } + margin: 0; } } } @@ -276,21 +287,33 @@ @media screen and (min-width: 376px) and (max-width: 576px) { .dokan-admin-notices { + + .notice-content{ + flex-direction: column; + align-items: start !important; + gap: 1rem; + height: 195px; + } .dokan-notice-slides { min-height: 195px; .dokan-admin-notice { + align-items: start; + padding: 10px 20px; .dokan-message { - margin: 0 0 0 23px; + div{ + max-height: 50px; + overflow: scroll; + } + margin: 0; } } } .slide-notice { - bottom: 0; - right: 10px; + right: 3rem; padding: 3px 8px; - top: unset; + top: 2rem; } } } diff --git a/includes/Admin/Settings.php b/includes/Admin/Settings.php index 5ddaef5b95..c60ec94825 100644 --- a/includes/Admin/Settings.php +++ b/includes/Admin/Settings.php @@ -835,7 +835,7 @@ public function get_settings_fields() { 'type' => 'social', 'desc' => sprintf( /* translators: 1) Opening anchor tag, 2) Closing anchor tag, 3) Opening anchor tag, 4) Closing anchor tag */ - __( '%1$sreCAPTCHA%2$s credentials required to enable invisible captcha for contact forms. %3$sGet Help%4$s', 'dokan-lite' ), + __( '%1$sreCAPTCHA_v3%2$s credentials required to enable invisible captcha for contact forms. %3$sGet Help%4$s', 'dokan-lite' ), '', '', '', diff --git a/src/admin/components/AdminNotice.vue b/src/admin/components/AdminNotice.vue index 88fce3fee8..0859c3bdd9 100644 --- a/src/admin/components/AdminNotice.vue +++ b/src/admin/components/AdminNotice.vue @@ -13,10 +13,12 @@

{{ notice.title }}

diff --git a/src/admin/components/Settings/MobileSettingsList.vue b/src/admin/components/Settings/MobileSettingsList.vue new file mode 100644 index 0000000000..7a45a6a5b5 --- /dev/null +++ b/src/admin/components/Settings/MobileSettingsList.vue @@ -0,0 +1,83 @@ + + + diff --git a/src/admin/components/SettingsBanner.vue b/src/admin/components/SettingsBanner.vue index 8d3f3b941e..8e9f43033e 100644 --- a/src/admin/components/SettingsBanner.vue +++ b/src/admin/components/SettingsBanner.vue @@ -35,13 +35,12 @@ export default { background: #fff; display: flex; align-items: flex-start; - + flex-wrap: wrap; a { box-shadow: none; background: #FF5722; color: #fff; border-color: #FF5722; - &:hover { background: lighten(#FF5722, 5%); } diff --git a/src/admin/pages/ChangeLog.vue b/src/admin/pages/ChangeLog.vue index 12c9f316d9..645c2849df 100644 --- a/src/admin/pages/ChangeLog.vue +++ b/src/admin/pages/ChangeLog.vue @@ -321,7 +321,7 @@ ul { } .dokan-notice { - background: rgba(223, 0, 0, 0.05); + background: rgba(239, 234, 255, 1); margin: -15px -20px 0; padding: 15px 15px 0; } diff --git a/src/admin/pages/Settings.vue b/src/admin/pages/Settings.vue index 522f88d425..1c05a8368c 100644 --- a/src/admin/pages/Settings.vue +++ b/src/admin/pages/Settings.vue @@ -12,40 +12,131 @@ -
-
-
+
@@ -111,18 +202,23 @@