Просмотр исходного кода

Merge pull request #3774 from weseek/fix/GW-6050-design-fix

design fix
itizawa 4 лет назад
Родитель
Сommit
f43bc754a4

+ 1 - 1
resource/locales/en_US/admin/admin.json

@@ -296,8 +296,8 @@
     },
     "delete": "Delete",
     "integration_procedure": "Integration Procedure",
-    "official_bot_settings": "Official bot Settings",
     "custom_bot_without_proxy_settings": "Custom Bot without proxy Settings",
+    "official_bot_settings": "Official bot Settings",
     "reset": "Reset",
     "reset_all_settings": "Reset all settings",
     "delete_slackbot_settings": "Reset Slack Bot settings",

+ 1 - 1
resource/locales/ja_JP/admin/admin.json

@@ -301,7 +301,7 @@
     "slackbot_settings_notice": "リセットします",
     "accordion": {
       "create_bot": "Bot を作成する",
-      "how_to_create_a_bot": "作成方法はこちら",
+      "how_to_create_a_bot": "作成手順はこちら",
       "how_to_install": "インストール方法はこちら",
       "install_bot_to_slack": "Bot を Slack にインストールする",
       "install_now": "今すぐインストール",

+ 2 - 2
src/client/js/components/Admin/SlackIntegration/CustomBotWithoutProxyIntegrationCard.jsx

@@ -26,8 +26,8 @@ const CustomBotWithoutProxyIntegrationCard = (props) => {
         {/* TODO apply correct condition GW-5895 */}
         <div className="mt-4">
           <small
-            className="text-secondary m-0"
-                // eslint-disable-next-line react/no-danger
+            className="text-warning m-0"
+            // eslint-disable-next-line react/no-danger
             dangerouslySetInnerHTML={{ __html: t('admin:slack_integration.integration_sentence.integration_is_not_complete') }}
           />
           <hr className="align-self-center admin-border-danger border-danger"></hr>

+ 1 - 1
src/client/js/components/Admin/SlackIntegration/CustomBotWithoutProxySettings.jsx

@@ -36,7 +36,7 @@ const CustomBotWithoutProxySettings = (props) => {
         slackWSNameInWithoutProxy={props.slackWSNameInWithoutProxy}
       />
 
-      <h2 className="admin-setting-header">{t('admin:slack_integration.custom_bot_without_proxy_settings')}</h2>
+      <h2 className="admin-setting-header">{t('admin:slack_integration.integration_procedure')}</h2>
 
       {(props.slackSigningSecret || props.slackBotToken) && (
       <button