Merge branch 'dev/7.0.x' into imprv/131762-131770-limit-file-type

apps/app/public/static/locales/en_US/admin.json

@@ -912,6 +912,7 @@
     "USER_API_TOKEN_UPDATE": "API Token update",
     "USER_EDITOR_SETTINGS_UPDATE": "Editor settings update",
     "USER_IN_APP_NOTIFICATION_SETTINGS_UPDATE": "In-App Notification settings update",
+    "USER_REGISTRATION_APPROVAL_REQUEST": "User registration request for ID/Password authentication",
     "PAGE_VIEW": "Page view",
     "PAGE_USER_HOME_VIEW": "Page view (User home)",
     "PAGE_FORBIDDEN": "Page view (Fobidden page)",

apps/app/public/static/locales/ja_JP/admin.json

@@ -921,6 +921,7 @@
     "USER_API_TOKEN_UPDATE": "API トークンの更新",
     "USER_EDITOR_SETTINGS_UPDATE": "エディター設定の更新",
     "USER_IN_APP_NOTIFICATION_SETTINGS_UPDATE": "アプリ内通知設定の更新",
+    "USER_REGISTRATION_APPROVAL_REQUEST": "ID/Password 認証のユーザー登録リクエスト",
     "PAGE_VIEW": "ページ閲覧",
     "PAGE_USER_HOME_VIEW": "ページ閲覧（ユーザーホーム）",
     "PAGE_FORBIDDEN": "ページ閲覧（fobiddenページ）",

apps/app/public/static/locales/zh_CN/admin.json

@@ -920,6 +920,7 @@
     "USER_API_TOKEN_UPDATE": "API 令牌更新",
     "USER_EDITOR_SETTINGS_UPDATE": "编辑器设置更新",
     "USER_IN_APP_NOTIFICATION_SETTINGS_UPDATE": "应用内通知设置更新",
+    "USER_REGISTRATION_APPROVAL_REQUEST": "用户注册 ID/密码验证请求",
     "PAGE_VIEW": "页面浏览量",
     "PAGE_USER_HOME_VIEW": "页面浏览量（用户主页）",
     "PAGE_FORBIDDEN": "页面浏览量（禁止页面）",

apps/app/src/components/Sidebar/PageTree/Item.module.scss

@@ -7,8 +7,8 @@
     .list-group-item-action {
       .btn-page-item-control {
         --bs-btn-bg: transparent;
-        --bs-btn-hover-bg: var(--grw-primary-300);
-        --bs-btn-active-bg: var(--grw-primary-400);
+        --bs-btn-hover-bg: var(--grw-primary-200);
+        --bs-btn-active-bg: var(--grw-primary-300);
       }
     }
   }
@@ -18,8 +18,8 @@
     .list-group-item-action {
       .btn-page-item-control {
         --bs-btn-bg: transparent;
-        --bs-btn-hover-bg: var(--grw-primary-700);
-        --bs-btn-active-bg: var(--grw-primary-800);
+        --bs-btn-hover-bg: var(--grw-primary-600);
+        --bs-btn-active-bg: var(--grw-primary-700);
       }
     }
   }

apps/app/src/styles/molecules/_list-group-item.scss

@@ -2,13 +2,13 @@
 
 @include bs.color-mode(light) {
   .list-group-item-action {
-    --bs-list-group-action-hover-bg: var(--grw-primary-200);
-    --bs-list-group-action-active-bg: var(--grw-primary-400);
+    --bs-list-group-action-hover-bg: var(--grw-primary-100);
+    --bs-list-group-action-active-bg: var(--grw-primary-200);
   }
 }
 @include bs.color-mode(dark) {
   .list-group-item-action {
     --bs-list-group-action-hover-bg: var(--grw-primary-800);
-    --bs-list-group-action-active-bg: var(--grw-primary-800);
+    --bs-list-group-action-active-bg: var(--grw-primary-700);
   }
 }