Merge branch 'support/apply-bootstrap4' into support/page-create-modal-bstr4

src/client/styles/scss/_navbar.scss

@@ -12,6 +12,13 @@
     content: none;
   }
 
+  .search-top {
+    button {
+      background: transparent;
+      border: none;
+    }
+  }
+
   .nav-link {
     &:hover {
       background: rgba(0, 0, 0, 0.1);

src/client/styles/scss/_override-bootstrap.scss

@@ -74,10 +74,6 @@ h5 {
   .dropdown-toggle.btn.disabled {
     cursor: not-allowed;
   }
-  button {
-    background: transparent;
-    border: none;
-  }
 }
 
 // agile-admin style

src/server/views/admin/Users_reserve.html

@@ -29,7 +29,7 @@
       {% include './widget/menu.html' with {current: 'user'} %}
     </div>
 
-    <div class="col-md-9">
+    <div class="col-lg-9">
       <p>
         <button data-toggle="collapse" class="btn btn-default" href="#inviteUserForm" {% if isUserCountExceedsUpperLimit %}disabled{% endif %}>
           {{ t("user_management.invite_users") }}

src/server/views/admin/customize.html

@@ -21,7 +21,7 @@
 {% block content_main %}
 <div class="content-main admin-customize row">
   {% parent %}
-  <div class="col-md-9" id="admin-customize"></div>
+  <div class="col-lg-9" id="admin-customize"></div>
 </div>
 {% endblock content_main %}
 

src/server/views/admin/external-accounts.html

@@ -11,7 +11,7 @@
 {% block content_main %}
 <div class="content-main row">
   {% parent %}
-  <div class="col-md-9" id="admin-external-account-setting"></div>
+  <div class="col-lg-9" id="admin-external-account-setting"></div>
 </div>
 {% endblock content_main %}
 

src/server/views/admin/global-notification-detail.html

@@ -11,7 +11,7 @@
 {% block content_main %}
 <div class="content-main row">
   {% parent %}
-  <div class="col-md-9" id="admin-global-notification-setting"
+  <div class="col-lg-9" id="admin-global-notification-setting"
       data-global-notification="{{ globalNotification|json }}"></div>
 </div>
 

src/server/views/admin/index.html

@@ -11,7 +11,7 @@
 {% block content_main %}
 <div class="content-main row">
   {% parent %}
-  <div class="col-md-9" id="admin-home"></div>
+  <div class="col-lg-9" id="admin-home"></div>
 </div>
 {% endblock content_main %}
 

src/server/views/admin/markdown.html

@@ -12,7 +12,7 @@
 {% block content_main %}
 <div class="content-main row">
   {% parent %}
-  <div class="col-md-9" id="admin-markdown-setting"></div>
+  <div class="col-lg-9" id="admin-markdown-setting"></div>
 </div>
 
 {% endblock content_main %}

src/server/views/admin/notification.html

@@ -11,7 +11,7 @@
 {% block content_main %}
 <div class="content-main admin-notification row">
   {% parent %}
-  <div class="col-md-9" id="admin-notification-setting"></div>
+  <div class="col-lg-9" id="admin-notification-setting"></div>
 </div>
 {% endblock content_main %}
 

src/server/views/admin/search.html

@@ -12,7 +12,7 @@
 <div class="content-main row">
   {% parent %}
     <div
-      class="col-md-9"
+      class="col-lg-9"
       id ="admin-full-text-search-management"
     >
       <!-- Reactify Paginator start -->

src/server/views/admin/security.html

@@ -11,7 +11,7 @@
 {% block content_main %}
 <div class="content-main admin-security row">
   {% parent %}
-  <div class="col-md-9" id="admin-security-setting"></div>
+  <div class="col-lg-9" id="admin-security-setting"></div>
 </div>
 {% endblock content_main %}
 

src/server/views/admin/user-group-detail.html

@@ -13,7 +13,7 @@
   {% parent %}
   <div
     id="admin-user-group-detail"
-    class="col-md-9"
+    class="col-lg-9"
     data-user-group="{{ userGroup|json }}"
   >
   </div>

src/server/views/admin/user-groups.html

@@ -11,7 +11,7 @@
 {% block content_main %}
 <div class="content-main row">
   {% parent %}
-  <div id ="admin-user-group-page" class="col-md-9"></div>
+  <div id ="admin-user-group-page" class="col-lg-9"></div>
 </div>
 {% endblock content_main %}
 

src/server/views/admin/users.html

@@ -12,7 +12,7 @@
 <div class="content-main row">
   {% parent %}
   <div
-    class="col-md-9"
+    class="col-lg-9"
     id ="admin-user-page"
   >
   </div>

src/server/views/layout/admin.html

@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block content_main %}
-  <div class="col-md-3" id="admin-navigation"></div>
+  <div class="col-lg-3" id="admin-navigation"></div>
 {% endblock content_main %}
 
 {# disable custom script in admin page #}