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

Merge branch 'feat/growi-bot' into 5862-multiple-accordions

Steven Fukase 4 лет назад
Родитель
Сommit
b207f283f3

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

@@ -204,6 +204,7 @@ const CustomBotWithProxySettingsAccordion = () => {
               <label className="mb-1"><p className="border-info slack-connection-log-title pl-2 m-0">Logs</p></label>
               <textarea
                 className="form-control card border-info slack-connection-log-body rounded-lg"
+                rows="5"
                 // TODO: Show test logs
                 value={value}
                 readOnly

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

@@ -191,6 +191,7 @@ const CustomBotWithoutProxySettingsAccordion = ({
               <label className="mb-1"><p className="border-info slack-connection-log-title pl-2 m-0">Logs</p></label>
               <textarea
                 className="form-control card border-info slack-connection-log-body rounded-lg"
+                rows="5"
                 value={value}
                 readOnly
               />

+ 0 - 1
src/client/styles/scss/_admin.scss

@@ -114,7 +114,6 @@ $slack-work-space-name-card-border: #efc1f6;
       border-left: 2px solid;
     }
     .slack-connection-log-body {
-      min-height: 7rem;
       border: 2px solid;
     }
   }