Merge branch 'support/apply-bootstrap4' into fix/like-bookmark-crushed

resource/locales/en-US/translation.json

@@ -294,7 +294,7 @@
   "modal_shortcuts": {
     "global": {
       "title": "Global shortcuts",
-      "Open/Close shortcut help": "Open/Close shortcut help",
+      "Open/Close shortcut help": "Open/Close<br>shortcut help",
       "Edit Page": "Edit Page",
       "Create Page": "Create Page",
       "Show Contributors": "Show Contributors",

resource/locales/ja/translation.json

@@ -292,10 +292,10 @@
   "modal_shortcuts": {
     "global": {
       "title": "グローバルショートカット",
-      "Open/Close shortcut help": "ショートカットヘルプの表示/非表示",
+      "Open/Close shortcut help": "ショートカットヘルプ<br>の表示/非表示",
       "Edit Page": "ページ編集",
       "Create Page": "ページ作成",
-      "Show Contributors": "コントリビューターを表示",
+      "Show Contributors": "コントリビューター<br>を表示",
       "Konami Code": "コナミコマンド",
       "konami_code_url": "https://ja.wikipedia.org/wiki/コナミコマンド"
     },

src/client/js/components/Admin/App/MailSetting.jsx

@@ -40,8 +40,8 @@ class MailSetting extends React.Component {
       <React.Fragment>
         <p className="card well">{t('admin:app_setting.smtp_used')} {t('admin:app_setting.smtp_but_aws')}<br />{t('admin:app_setting.neihter_of')}</p>
         <div className="row form-group mb-5">
-          <label className="col-3 col-form-label">{t('admin:app_setting.from_e-mail_address')}</label>
-          <div className="col-6">
+          <label className="col-md-3 col-form-label text-left">{t('admin:app_setting.from_e-mail_address')}</label>
+          <div className="col-md-9 col-md-6">
             <input
               className="form-control"
               type="text"
@@ -53,8 +53,8 @@ class MailSetting extends React.Component {
         </div>
 
         <div className="row form-group mb-5">
-          <label className="col-3 col-form-label">{t('admin:app_setting.smtp_settings')}</label>
-          <div className="col-4">
+          <label className="col-md-3 col-form-label text-left">{t('admin:app_setting.smtp_settings')}</label>
+          <div className="col-md-4">
             <label>{t('admin:app_setting.host')}</label>
             <input
               className="form-control"
@@ -63,7 +63,7 @@ class MailSetting extends React.Component {
               onChange={(e) => { adminAppContainer.changeSmtpHost(e.target.value) }}
             />
           </div>
-          <div className="col-2">
+          <div className="col-md-2">
             <label>{t('admin:app_setting.port')}</label>
             <input
               className="form-control"
@@ -74,7 +74,7 @@ class MailSetting extends React.Component {
         </div>
 
         <div className="row form-group mb-5">
-          <div className="col-3 offset-3">
+          <div className="col-md-3 offset-md-3">
             <label>{t('admin:app_setting.user')}</label>
             <input
               className="form-control"
@@ -83,7 +83,7 @@ class MailSetting extends React.Component {
               onChange={(e) => { adminAppContainer.changeSmtpUser(e.target.value) }}
             />
           </div>
-          <div className="col-3">
+          <div className="col-md-3">
             <label>{t('Password')}</label>
             <input
               className="form-control"

src/client/js/components/Me/AssociateModal.jsx

@@ -70,7 +70,7 @@ class AssociateModal extends React.Component {
     const { t } = this.props;
 
     return (
-      <Modal isOpen={this.props.isOpen} toggle={this.props.onClose} className="mw-100 m-4">
+      <Modal isOpen={this.props.isOpen} toggle={this.props.onClose} size="lg">
         <ModalHeader className="bg-info" toggle={this.props.onClose}>
           { t('Create External Account') }
         </ModalHeader>

src/client/js/components/Me/PasswordSettings.jsx

@@ -76,8 +76,8 @@ class PasswordSettings extends React.Component {
         {(personalContainer.state.isPasswordSet)
         && (
           <div className="row mb-3">
-            <label htmlFor="oldPassword" className="col-3 text-right">{ t('personal_settings.current_password') }</label>
-            <div className="col-6">
+            <label htmlFor="oldPassword" className="col-md-3 text-md-right">{ t('personal_settings.current_password') }</label>
+            <div className="col-md-5">
               <input
                 className="form-control"
                 type="password"
@@ -89,8 +89,8 @@ class PasswordSettings extends React.Component {
           </div>
         )}
         <div className="row mb-3">
-          <label htmlFor="newPassword" className="col-3 text-right">{t('personal_settings.new_password') }</label>
-          <div className="col-6">
+          <label htmlFor="newPassword" className="col-md-3 text-md-right">{t('personal_settings.new_password') }</label>
+          <div className="col-md-5">
             <input
               className="form-control"
               type="password"
@@ -101,8 +101,8 @@ class PasswordSettings extends React.Component {
           </div>
         </div>
         <div className={`row mb-3 ${isIncorrectConfirmPassword && 'has-error'}`}>
-          <label htmlFor="newPasswordConfirm" className="col-3 text-right">{t('personal_settings.new_password_confirm') }</label>
-          <div className="col-6">
+          <label htmlFor="newPasswordConfirm" className="col-md-3 text-md-right">{t('personal_settings.new_password_confirm') }</label>
+          <div className="col-md-5">
             <input
               className="form-control"
               type="password"
@@ -115,15 +115,17 @@ class PasswordSettings extends React.Component {
           </div>
         </div>
 
-        <div className="my-3 text-center">
-          <button
-            type="button"
-            className="btn btn-primary"
-            onClick={this.onClickSubmit}
-            disabled={this.state.retrieveError != null || isIncorrectConfirmPassword}
-          >
-            {t('Update')}
-          </button>
+        <div className="row my-3">
+          <div className="offset-5">
+            <button
+              type="button"
+              className="btn btn-primary"
+              onClick={this.onClickSubmit}
+              disabled={this.state.retrieveError != null || isIncorrectConfirmPassword}
+            >
+              {t('Update')}
+            </button>
+          </div>
         </div>
       </React.Fragment>
     );

src/server/views/modal/shortcuts.html

@@ -8,86 +8,89 @@
       </div>
 
       <div class="modal-body">
+        <div class="container">
+          <div class="row">
+            <div class="col-lg-6">
+              <h3><strong>{{ t('modal_shortcuts.global.title') }}</strong></h3>
 
-        <div class="row">
-          <div class="col-lg-6">
-            <h3><strong>{{ t('modal_shortcuts.global.title') }}</strong></h3>
+                <table class="table table-responsive">
+                  <tr>
+                    <th>{{ t('modal_shortcuts.global.Open/Close shortcut help') }}:</th>
+                    <td><span class="key cmd-key"></span> + <span class="key">/</span></td>
+                  </tr>
+                  <tr>
+                    <th>{{ t('modal_shortcuts.global.Create Page') }}:</th>
+                    <td><span class="key">C</span></td>
+                  </tr>
+                  <tr>
+                    <th>{{ t('modal_shortcuts.global.Edit Page') }}:</th>
+                    <td><span class="key">E</span></td>
+                  </tr>
+                  <tr>
+                    <th>{{ t('modal_shortcuts.global.Show Contributors') }}:</th>
+                    <td>
+                      <a href="{{ t('modal_shortcuts.global.konami_code_url') }}" target="_blank">{{ t('modal_shortcuts.global.Konami Code') }}</a><br>
+                      <span class="key key-small">↑</span>&nbsp;<span class="key key-small">↑</span>
+                      <span class="key key-small">↓</span>&nbsp;<span class="key key-small">↓</span>
+                      <span class="key key-small">←</span><br><span class="key key-small">→</span>
+                      <span class="key key-small">←</span>&nbsp;<span class="key key-small">→</span>
+                      <span class="key key-small">B</span>&nbsp;<span class="key key-small">A</span>
+                    </td>
+                  </tr>
+                </table>
+            </div><!-- /.col-lg-6 -->
 
-            <table class="table">
-              <tr>
-                <th>{{ t('modal_shortcuts.global.Open/Close shortcut help') }}:</th>
-                <td><span class="key cmd-key"></span> + <span class="key">/</span></td>
-              </tr>
-              <tr>
-                <th>{{ t('modal_shortcuts.global.Create Page') }}:</th>
-                <td><span class="key">C</span></td>
-              </tr>
-              <tr>
-                <th>{{ t('modal_shortcuts.global.Edit Page') }}:</th>
-                <td><span class="key">E</span></td>
-              </tr>
-              <tr>
-                <th>{{ t('modal_shortcuts.global.Show Contributors') }}:</th>
-                <td>
-                  <a href="{{ t('modal_shortcuts.global.konami_code_url') }}" target="_blank">{{ t('modal_shortcuts.global.Konami Code') }}</a><br>
-                  <span class="key key-small">↑</span>&nbsp;<span class="key key-small">↑</span>
-                  <span class="key key-small">↓</span>&nbsp;<span class="key key-small">↓</span>
-                  <span class="key key-small">←</span>&nbsp;<span class="key key-small">→</span>
-                  <span class="key key-small">←</span>&nbsp;<span class="key key-small">→</span>
-                  <span class="key key-small">B</span>&nbsp;<span class="key key-small">A</span>
-                </td>
-              </tr>
-            </table>
-          </div><!-- /.col-lg-6 -->
 
-          <div class="col-lg-6">
-            <h3><strong>{{ t('modal_shortcuts.editor.title') }}</strong></h3>
+            <div class="col-lg-6">
+              <h3><strong>{{ t('modal_shortcuts.editor.title') }}</strong></h3>
 
-            <table class="table">
-              <tr>
-                <th>{{ t('modal_shortcuts.editor.Indent') }}:</th>
-                <td><span class="key key-longer">Tab</span></td>
-              </tr>
-              <tr>
-                <th>{{ t('modal_shortcuts.editor.Outdent') }}:</th>
-                <td class="text-nowrap"><span class="key key-long">Shift</span> + <span class="key key-longer">Tab</span></td>
-              </tr>
-              <tr>
-                <th>{{ t('modal_shortcuts.editor.Save Page') }}:</th>
-                <td><span class="key cmd-key"></span> + <span class="key">S</span></td>
-              </tr>
-              <tr>
-                <th>{{ t('modal_shortcuts.editor.Delete Line') }}:</th>
-                <td><span class="key cmd-key"></span> + <span class="key">D</span></td>
-              </tr>
-            </table>
-          </div><!-- /.col-lg-6 -->
+              <table class="table table-responsive">
+                <tr>
+                  <th>{{ t('modal_shortcuts.editor.Indent') }}:</th>
+                  <td><span class="key key-longer">Tab</span></td>
+                </tr>
+                <tr>
+                  <th>{{ t('modal_shortcuts.editor.Outdent') }}:</th>
+                  <td class="text-nowrap"><span class="key key-long">Shift</span> + <span class="key key-longer">Tab</span></td>
+                </tr>
+                <tr>
+                  <th>{{ t('modal_shortcuts.editor.Save Page') }}:</th>
+                  <td><span class="key cmd-key"></span> + <span class="key">S</span></td>
+                </tr>
+                <tr>
+                  <th>{{ t('modal_shortcuts.editor.Delete Line') }}:</th>
+                  <td><span class="key cmd-key"></span> + <span class="key">D</span></td>
+                </tr>
+              </table>
+            </div><!-- /.col-lg-6 -->
+          </div><!-- /.row -->
+        </div><!-- /.container -->
 
-        </div><!-- /.row -->
+        <div class="container">
+          <div class="row">
+            <div class="col-lg-6">
+              <h3><strong></strong></h3>
+            </div><!-- /.col-lg-6 -->
 
-        <div class="row">
-          <div class="col-lg-6">
-            <h3><strong></strong></h3>
-          </div><!-- /.col-lg-6 -->
+            <div class="col-lg-6">
+              <h3><strong>{{ t('modal_shortcuts.commentform.title') }}</strong></h3>
 
-          <div class="col-lg-6">
-            <h3><strong>{{ t('modal_shortcuts.commentform.title') }}</strong></h3>
-
-            <table class="table">
-              <tr>
-                <th>{{ t('modal_shortcuts.commentform.Post') }}:</th>
-                <td><span class="key cmd-key"></span> + <span class="key key-longer">{% include '../widget/icon-keyboard-return-enter.html' %}</span></td>
-              </tr>
-              <tr>
-                <th>{{ t('modal_shortcuts.editor.Delete Line') }}:</th>
-                <td><span class="key cmd-key"></span> + <span class="key">D</span></td>
-              </tr>
-            </table>
-          </div><!-- /.col-lg-6 -->
-
-        </div><!-- /.row -->
+              <table class="table table-responsive">
+                <tr>
+                  <th>{{ t('modal_shortcuts.commentform.Post') }}:</th>
+                  <td><span class="key cmd-key"></span> + <span class="key key-longer">{% include '../widget/icon-keyboard-return-enter.html' %}</span></td>
+                </tr>
+                <tr>
+                  <th>{{ t('modal_shortcuts.editor.Delete Line') }}:</th>
+                  <td><span class="key cmd-key"></span> + <span class="key">D</span></td>
+                </tr>
+              </table>
+            </div><!-- /.col-lg-6 -->
 
+          </div><!-- /.row -->
+        </div><!-- /.container -->
       </div>
+    </div>
 
 
     </div><!-- /.modal-content -->