熊谷洸介(Kousuke Kumagai) 6 лет назад
Родитель
Сommit
99c052017c

+ 3 - 3
src/client/js/components/Admin/MarkdownSetting/PresentationForm.jsx

@@ -57,7 +57,7 @@ class PresentationForm extends React.Component {
                   checked={pageBreakSeparator === 1}
                   checked={pageBreakSeparator === 1}
                   onChange={() => adminMarkDownContainer.switchPageBreakSeparator(1)}
                   onChange={() => adminMarkDownContainer.switchPageBreakSeparator(1)}
                 />
                 />
-                <label className="custom-control-label" htmlFor="pageBreakOption1">
+                <label className="custom-control-label w-100" htmlFor="pageBreakOption1">
                   <p className="font-weight-bold">{ t('admin:markdown_setting.presentation_options.preset_one_separator') }</p>
                   <p className="font-weight-bold">{ t('admin:markdown_setting.presentation_options.preset_one_separator') }</p>
                   <div className="mt-3">
                   <div className="mt-3">
                     { t('admin:markdown_setting.presentation_options.preset_one_separator_desc') }
                     { t('admin:markdown_setting.presentation_options.preset_one_separator_desc') }
@@ -81,7 +81,7 @@ class PresentationForm extends React.Component {
                   checked={pageBreakSeparator === 2}
                   checked={pageBreakSeparator === 2}
                   onChange={() => adminMarkDownContainer.switchPageBreakSeparator(2)}
                   onChange={() => adminMarkDownContainer.switchPageBreakSeparator(2)}
                 />
                 />
-                <label className="custom-control-label" htmlFor="pageBreakOption2">
+                <label className="custom-control-label w-100" htmlFor="pageBreakOption2">
                   <p className="font-weight-bold">{ t('admin:markdown_setting.presentation_options.preset_two_separator') }</p>
                   <p className="font-weight-bold">{ t('admin:markdown_setting.presentation_options.preset_two_separator') }</p>
                   <div className="mt-3">
                   <div className="mt-3">
                     { t('admin:markdown_setting.presentation_options.preset_two_separator_desc') }
                     { t('admin:markdown_setting.presentation_options.preset_two_separator_desc') }
@@ -104,7 +104,7 @@ class PresentationForm extends React.Component {
                   checked={pageBreakSeparator === 3}
                   checked={pageBreakSeparator === 3}
                   onChange={() => adminMarkDownContainer.switchPageBreakSeparator(3)}
                   onChange={() => adminMarkDownContainer.switchPageBreakSeparator(3)}
                 />
                 />
-                <label className="custom-control-label" htmlFor="pageBreakOption3">
+                <label className="custom-control-label w-100" htmlFor="pageBreakOption3">
                   <p className="font-weight-bold">{ t('admin:markdown_setting.presentation_options.custom_separator') }</p>
                   <p className="font-weight-bold">{ t('admin:markdown_setting.presentation_options.custom_separator') }</p>
                   <div className="mt-3">
                   <div className="mt-3">
                     { t('admin:markdown_setting.presentation_options.custom_separator_desc') }
                     { t('admin:markdown_setting.presentation_options.custom_separator_desc') }

+ 4 - 4
src/client/js/components/Admin/MarkdownSetting/XssForm.jsx

@@ -54,7 +54,7 @@ class XssForm extends React.Component {
                 checked={xssOption === 1}
                 checked={xssOption === 1}
                 onChange={() => { adminMarkDownContainer.setState({ xssOption: 1 }) }}
                 onChange={() => { adminMarkDownContainer.setState({ xssOption: 1 }) }}
               />
               />
-              <label className="custom-control-label" htmlFor="xssOption1">
+              <label className="custom-control-label w-100" htmlFor="xssOption1">
                 <p className="font-weight-bold">{t('admin:markdown_setting.xss_options.ignore_all_tags')}</p>
                 <p className="font-weight-bold">{t('admin:markdown_setting.xss_options.ignore_all_tags')}</p>
                 <div className="mt-4">
                 <div className="mt-4">
                   {t('admin:markdown_setting.xss_options.ignore_all_tags_desc')}
                   {t('admin:markdown_setting.xss_options.ignore_all_tags_desc')}
@@ -73,7 +73,7 @@ class XssForm extends React.Component {
                 checked={xssOption === 2}
                 checked={xssOption === 2}
                 onChange={() => { adminMarkDownContainer.setState({ xssOption: 2 }) }}
                 onChange={() => { adminMarkDownContainer.setState({ xssOption: 2 }) }}
               />
               />
-              <label className="custom-control-label" htmlFor="xssOption2">
+              <label className="custom-control-label w-100" htmlFor="xssOption2">
                 <p className="font-weight-bold">{t('admin:markdown_setting.xss_options.recommended_setting')}</p>
                 <p className="font-weight-bold">{t('admin:markdown_setting.xss_options.recommended_setting')}</p>
                 <div className="m-t-15">
                 <div className="m-t-15">
                   <div className="d-flex justify-content-between">
                   <div className="d-flex justify-content-between">
@@ -115,7 +115,7 @@ class XssForm extends React.Component {
                 checked={xssOption === 3}
                 checked={xssOption === 3}
                 onChange={() => { adminMarkDownContainer.setState({ xssOption: 3 }) }}
                 onChange={() => { adminMarkDownContainer.setState({ xssOption: 3 }) }}
               />
               />
-              <label className="custom-control-label" htmlFor="xssOption3">
+              <label className="custom-control-label w-100" htmlFor="xssOption3">
                 <p className="font-weight-bold">{t('admin:markdown_setting.xss_options.custom_whitelist')}</p>
                 <p className="font-weight-bold">{t('admin:markdown_setting.xss_options.custom_whitelist')}</p>
                 <WhiteListInput customizable />
                 <WhiteListInput customizable />
               </label>
               </label>
@@ -144,7 +144,7 @@ class XssForm extends React.Component {
                   checked={isEnabledXss}
                   checked={isEnabledXss}
                   onChange={adminMarkDownContainer.switchEnableXss}
                   onChange={adminMarkDownContainer.switchEnableXss}
                 />
                 />
-                <label className="custom-control-label" htmlFor="XssEnable">
+                <label className="custom-control-label w-100" htmlFor="XssEnable">
                   {t('admin:markdown_setting.xss_options.enable_xss_prevention')}
                   {t('admin:markdown_setting.xss_options.enable_xss_prevention')}
                 </label>
                 </label>
               </div>
               </div>

+ 0 - 1
src/client/styles/scss/atoms/_custom_control.scss

@@ -1,4 +1,3 @@
 label.custom-control-label {
 label.custom-control-label {
-  width: 100%;
   font-weight: normal;
   font-weight: normal;
 }
 }