WIP: reconstruct layouts

* modal-title

lib/views/admin/search.html

@@ -42,7 +42,7 @@
         <div class="form-group">
           <label for="" class="col-xs-3 control-label">Index Build</label>
           <div class="col-xs-6">
-            <button type="submit" class="btn btn-default">Build Now</button>
+            <button type="submit" class="btn btn-inverse">Build Now</button>
             <p class="help-block">
               Force rebuild index.<br>
               Click "Build Now" to delete and create mapping file and add all pages.<br>

lib/views/admin/users.html

@@ -65,7 +65,7 @@
 
             <div class="modal-header">
               <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-              <h4 class="modal-title">ユーザーを招待しました</h4>
+              <div class="modal-title">ユーザーを招待しました</div>
             </div>
 
             <div class="modal-body">
@@ -88,7 +88,7 @@
           <div class="modal-content">
             <div class="modal-header">
               <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-              <h4 class="modal-title">パスワードを新規発行しますか?</h4>
+              <div class="modal-title">パスワードを新規発行しますか?</div>
             </div>
 
             <div class="modal-body">
@@ -119,7 +119,7 @@
 
             <div class="modal-header">
               <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-              <h4 class="modal-title">Password reset!</h4>
+              <div class="modal-title">Password reset!</div>
             </div>
 
             <div class="modal-body">

lib/views/admin/widget/passport/ldap.html

@@ -284,7 +284,7 @@
 
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h4 class="modal-title">{{ t('Test LDAP Account') }}</h4>
+        <div class="modal-title">{{ t('Test LDAP Account') }}</div>
       </div>
 
       <div class="modal-body">

lib/views/layout-growi/widget/comments.html

@@ -35,7 +35,7 @@
             <input type="hidden" name="commentForm[revision_id]" value="{{ revision._id.toString() }}">
             <div class="pull-right">
               <span class="text-danger" id="comment-form-message"></span>
-              <button type="submit" id="comment-form-button" class="fcbtn btn btn-sm btn-outline btn-rounded btn-primary btn-1f" {% if not user %}disabled{% endif %}>
+              <button type="submit" id="comment-form-button" class="fcbtn btn btn-sm btn-outline btn-rounded btn-primary btn-1b" {% if not user %}disabled{% endif %}>
                 Comment
               </button>
             </div>

lib/views/layout/layout.html

@@ -75,7 +75,8 @@ gh/highlightjs/cdn-release@9.12.0/build/languages/yaml.min.js
   {% endif %}
 
   <script src="{{ webpack_asset('style').js }}"></script>
-  <script src="{{ webpack_asset('style-theme-default').js }}"></script>
+  <!-- <script src="{{ webpack_asset('style-theme-default').js }}"></script> -->
+  <script src="{{ webpack_asset('style-theme-default-dark').js }}"></script>
   <script src="{{ webpack_asset('commons').js }}" defer></script>
   {% if isEnabledPlugins() %}
     <script src="{{ webpack_asset('plugin').js }}" defer></script>

lib/views/me/external-accounts.html

@@ -113,7 +113,7 @@
 
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-          <h4 class="modal-title">{{ t('Create External Account') }}</h4>
+          <div class="modal-title">{{ t('Create External Account') }}</div>
         </div>
 
         <div class="modal-body">
@@ -192,7 +192,7 @@
 
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-          <h4 class="modal-title">{{ t('Diassociate External Account') }}</h4>
+          <div class="modal-title">{{ t('Diassociate External Account') }}</div>
         </div>
 
         <div class="modal-body">

lib/views/modal/create_page.html

@@ -2,9 +2,9 @@
   <div class="modal-dialog">
     <div class="modal-content">
 
-      <div class="modal-header bg-warning">
+      <div class="modal-header bg-primary">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h4 class="modal-title">{{ t('New Page') }}</h4>
+        <div class="modal-title">{{ t('New Page') }}</div>
       </div>
 
       <div class="modal-body">
@@ -20,7 +20,7 @@
                 <input type="text" data-prefix="/{{ now|datetz('Y/m/d') }}/" class="page-today-input2 form-control" id="page-today-input2" name="" placeholder="{{ t('Input page name (optional)') }}">
               </div>
               <div class="create-page-button-container">
-                <button type="submit" class="fcbtn btn btn-outline btn-rounded btn-primary btn-1f"><i class="icon-fw icon-doc"></i>{{ t('Create') }}</button>
+                <button type="submit" class="fcbtn btn btn-outline btn-rounded btn-primary btn-1b"><i class="icon-fw icon-doc"></i>{{ t('Create') }}</button>
               </div>
             </div>
           </fieldset>
@@ -38,7 +38,7 @@
                 {% endif %}
               </div>
               <div class="create-page-button-container">
-                <button type="submit" class="fcbtn btn btn-outline btn-rounded btn-primary btn-1f"><i class="icon-fw icon-doc"></i>{{ t('Create') }}</button>
+                <button type="submit" class="fcbtn btn btn-outline btn-rounded btn-primary btn-1b"><i class="icon-fw icon-doc"></i>{{ t('Create') }}</button>
               </div>
             </div>
           </fieldset>

lib/views/modal/delete.html

@@ -4,15 +4,15 @@
 
       <form role="form" id="delete-page-form" onsubmit="return false;">
 
-        <div class="modal-header">
+        <div class="modal-header {% if page.isDeleted() %}bg-danger{% endif %}">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-          <h4 class="modal-title">
+          <div class="modal-title">
             {% if page.isDeleted() %}
-            <i class="icon-fw icon-fire text-danger"></i> {{ t('modal_delete.label.completely') }}
+            <i class="icon-fw icon-fire"></i> {{ t('modal_delete.label.completely') }}
             {% else %}
             <i class="icon-fw icon-trash"></i> {{ t('modal_delete.label.Delete Page') }}
             {% endif %}
-          </h4>
+          </div>
         </div>
         <div class="modal-body">
           <div class="form-group">

lib/views/modal/duplicate.html

@@ -6,7 +6,7 @@
 
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-          <h4 class="modal-title">{{ t('modal_duplicate.label.Duplicate page') }}</h4>
+          <div class="modal-title">{{ t('modal_duplicate.label.Duplicate page') }}</div>
         </div>
         <div class="modal-body">
             <div class="form-group">

lib/views/modal/page_name_warning.html

@@ -4,7 +4,7 @@
 
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h4 class="modal-title">ページ名に関するヒント</h4>
+        <div class="modal-title">ページ名に関するヒント</div>
       </div>
       <div class="modal-body alert alert-danger">
 

lib/views/modal/put_back.html

@@ -4,9 +4,9 @@
 
       <form role="form" id="revert-delete-page-form" onsubmit="return false;">
 
-        <div class="modal-header">
+        <div class="modal-header bg-info">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-          <h4 class="modal-title"><i class="icon-action-undo"></i> {{ t('modal_putBack.label.Put Back Page') }}</h4>
+          <div class="modal-title"><i class="icon-action-undo"></i> {{ t('modal_putBack.label.Put Back Page') }}</div>
         </div>
         <div class="modal-body">
           <div class="form-group">

lib/views/modal/rename.html

@@ -6,7 +6,7 @@
 
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-          <h4 class="modal-title">{{ t('Rename page') }}</h4>
+          <div class="modal-title">{{ t('Rename page') }}</div>
         </div>
         <div class="modal-body">
             <div class="form-group">

lib/views/modal/shortcuts.html

@@ -4,7 +4,7 @@
 
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h4 class="modal-title">{{ t('Shortcuts') }}</h4>
+        <div class="modal-title">{{ t('Shortcuts') }}</div>
       </div>
 
       <div class="modal-body">

lib/views/modal/unportalize.html

@@ -11,7 +11,7 @@
 
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-          <h4 class="modal-title">ポータル化を解除する</h4>
+          <div class="modal-title">ポータル化を解除する</div>
         </div>
         <div class="modal-body">
           <ul>

lib/views/modal/what_is_portal.html

@@ -4,7 +4,7 @@
 
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h4 class="modal-title">What is Portal?</h4>
+        <div class="modal-title">What is Portal?</div>
       </div>
 
       <div class="modal-body">
@@ -61,7 +61,7 @@
 
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h4 class="modal-title">ポータルに関するヒント</h4>
+        <div class="modal-title">ポータルに関するヒント</div>
       </div>
       <div class="modal-body">
 

resource/js/components/Common/Modal.js

@@ -23,7 +23,7 @@ export default class Modal extends React.Component {
 
             <div class="modal-header">
               <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-              <h4 class="modal-title">Rename page</h4>
+              <div class="modal-title">Rename page</div>
             </div>
             <div class="modal-body">
                 <div class="form-group">