Yuki Takei 5 лет назад
Родитель
Сommit
b5a27a9b10

+ 1 - 1
src/client/js/components/Navbar/GrowiSubNavigation.jsx

@@ -111,7 +111,7 @@ const GrowiSubNavigation = (props) => {
   }
 
   return (
-    <div className={`grw-subnav d-flex align-items-center justify-content-between ${isCompactMode ? 'grw-subnav-compact d-print-none' : ''}`}>
+    <div className={`grw-subnav container-fluid d-flex align-items-center justify-content-between ${isCompactMode ? 'grw-subnav-compact d-print-none' : ''}`}>
 
       {/* Left side */}
       <div className="d-flex grw-subnav-left-side">

+ 19 - 0
src/client/styles/scss/_override-bootstrap.scss

@@ -9,6 +9,25 @@
     outline: none !important;
   }
 
+  .container,
+  .container-sm,
+  .container-md,
+  .container-lg,
+  .container-xl,
+  .container-fluid {
+    // default: 15px
+    // padding-right: 15px;
+    // padding-left: 15px;
+    @include media-breakpoint-down(xs) {
+      padding-right: 10px;
+      padding-left: 10px;
+    }
+    @include media-breakpoint-up(md) {
+      padding-right: 30px;
+      padding-left: 30px;
+    }
+  }
+
   h1 {
     font-size: 36px;
     line-height: 48px;

+ 2 - 1
src/client/styles/scss/_subnav.scss

@@ -1,6 +1,7 @@
 .grw-subnav {
   min-height: $grw-subnav-min-height;
-  padding: 8px 15px;
+  padding-top: 8px;
+  padding-bottom: 8px;
 
   @include media-breakpoint-up(md) {
     min-height: $grw-subnav-min-height-md;

+ 2 - 2
src/server/views/layout-growi/forbidden.html

@@ -2,13 +2,13 @@
 
 
 {% block content_main_before %}
-  <div class="container">
+  <div class="container-lg">
     {% include '../widget/page_alerts.html' %}
   </div>
 {% endblock %}
 
 {% block content_main %}
-  <div class="container">
+  <div class="container-lg">
     <div class="row">
       <div class="col">
         {% include '../widget/forbidden_content.html' %}

+ 2 - 2
src/server/views/layout-growi/not_creatable.html

@@ -2,14 +2,14 @@
 
 
 {% block content_main_before %}
-  <div class="container">
+  <div class="container-lg">
     {% include '../widget/page_alerts.html' %}
   </div>
 {% endblock %}
 
 
 {% block content_main %}
-  <div class="container">
+  <div class="container-lg">
     <div class="row">
       <div class="col">
         {% include '../widget/not_creatable_content.html' %}

+ 2 - 2
src/server/views/layout-growi/not_found.html

@@ -2,14 +2,14 @@
 
 
 {% block content_main_before %}
-  <div class="container">
+  <div class="container-lg">
     {% include '../widget/page_alerts.html' %}
   </div>
 {% endblock %}
 
 
 {% block content_main %}
-  <div class="container">
+  <div class="container-lg">
     <div class="row">
       <div class="col">
         {% include '../widget/not_found_content.html' %}

+ 1 - 1
src/server/views/layout-growi/page.html

@@ -6,7 +6,7 @@
 
 
 {% block content_main %}
-  <div class="container">
+  <div class="container-lg">
 
     {% include '../widget/page_content.html' %}
 

+ 2 - 2
src/server/views/layout-growi/page_list.html

@@ -6,7 +6,7 @@
 
 
 {% block content_main %}
-  <div class="container">
+  <div class="container-lg">
     {% include '../widget/page_content.html' %}
   </div>
 {% endblock %}
@@ -14,7 +14,7 @@
 
 {% block content_main_after %}
   {% if isTrashPage() %}
-    <div class="container">
+    <div class="container-lg">
       <div id="trash-page-list"></div>
     </div>
   {% endif %}

+ 2 - 2
src/server/views/layout-growi/user_page.html

@@ -6,7 +6,7 @@
 {% endblock %}
 
 {% block content_main %}
-  <div class="container">
+  <div class="container-lg">
 
     {% include '../widget/page_content.html' %}
 
@@ -18,7 +18,7 @@
   {% include 'widget/comments.html' %}
 
   {% if page %}
-    <div class="container">
+    <div class="container-lg">
 
       <div class="grw-page-list-m mt-5 pb-5 d-edit-none">
         <h2 class="grw-page-list-title-m border-bottom pb-2 mb-3" id="bookmarks-list">

+ 1 - 1
src/server/views/layout-growi/widget/comments.html

@@ -1,5 +1,5 @@
 <div class="page-comments-row mt-5 py-4 d-edit-none d-print-none">
-  <div class="container">
+  <div class="container-lg">
 
     <div class="page-comments">
 

+ 1 - 1
src/server/views/widget/page_attachments.html

@@ -1,5 +1,5 @@
 <div class="page-attachments-row mt-5 py-4 d-edit-none d-print-none">
-  <div class="container">
+  <div class="container-lg">
     <div class="page-attachments" id="page-attachment"></div>
 
     <p class="page-meta">