Explorar o código

set min-width

Yuki Takei %!s(int64=5) %!d(string=hai) anos
pai
achega
69d04cd30e

+ 2 - 2
src/client/js/components/PageEditor.jsx

@@ -289,7 +289,7 @@ class PageEditor extends React.Component {
 
 
     return (
     return (
       <div className="d-flex flex-wrap">
       <div className="d-flex flex-wrap">
-        <div className="page-editor-editor-container" style={{ flex: 1 }}>
+        <div className="page-editor-editor-container flex-grow-1 flex-basis-0 mw-0">
           <Editor
           <Editor
             ref={(c) => { this.editor = c }}
             ref={(c) => { this.editor = c }}
             value={this.state.markdown}
             value={this.state.markdown}
@@ -305,7 +305,7 @@ class PageEditor extends React.Component {
             onSave={this.onSaveWithShortcut}
             onSave={this.onSaveWithShortcut}
           />
           />
         </div>
         </div>
-        <div className="d-none d-xl-block page-editor-preview-container" style={{ flex: 1 }}>
+        <div className="d-none d-xl-block page-editor-preview-container flex-grow-1 flex-basis-0 mw-0">
           <Preview
           <Preview
             markdown={this.state.markdown}
             markdown={this.state.markdown}
             // eslint-disable-next-line no-return-assign
             // eslint-disable-next-line no-return-assign

+ 0 - 1
src/client/styles/scss/_layout.scss

@@ -15,7 +15,6 @@ body {
 }
 }
 
 
 #page-wrapper {
 #page-wrapper {
-  min-width: 0;
   margin-top: $grw-navbar-height + $grw-navbar-border-width;
   margin-top: $grw-navbar-height + $grw-navbar-border-width;
 }
 }
 
 

+ 0 - 8
src/client/styles/scss/_on-edit.scss

@@ -136,14 +136,6 @@ body.on-edit {
     }
     }
   }
   }
 
 
-  // deal with word wrap problem
-  // see: https://qiita.com/mpyw/items/dfc63c1fed5dfc5eda26
-  .page-editor-editor-container,
-  .page-editor-preview-container {
-    min-width: 0;
-    overflow-wrap: break-word;
-  }
-
   /*********************
   /*********************
    * Navigation styles
    * Navigation styles
    */
    */

+ 8 - 0
src/client/styles/scss/style-app.scss

@@ -75,6 +75,14 @@
  * Helper Classes
  * Helper Classes
  */
  */
 
 
+.mw-0 {
+  min-width: 0;
+}
+
+.flex-basis-0 {
+  flex-basis: 0;
+}
+
 .picture {
 .picture {
   width: 24px;
   width: 24px;
   height: 24px;
   height: 24px;

+ 8 - 12
src/server/views/layout-growi/base/layout.html

@@ -15,20 +15,16 @@
 </header>
 </header>
 {% endblock %}
 {% endblock %}
 
 
-<div class="container-fluid">
-  <div class="row">
-    <div id="main" class="main col-md-12 {% if page %}{{ css.grant(page) }}{% endif %} {% block main_css_class %}{% endblock %}">
-      {% block content_main_before %}
-      {% endblock %}
+<div id="main" class="main container-fluid {% if page %}{{ css.grant(page) }}{% endif %} {% block main_css_class %}{% endblock %}">
+  {% block content_main_before %}
+  {% endblock %}
 
 
-      {% block content_main %}
-      {% endblock content_main %}
+  {% block content_main %}
+  {% endblock content_main %}
 
 
-      {% block content_main_after %}
-      {% endblock %}
-    </div><!-- /.main -->
-  </div><!-- /.row -->
-</div><!-- /.container-fluid -->
+  {% block content_main_after %}
+  {% endblock %}
+</div><!-- /.main -->
 
 
 <footer class="footer">
 <footer class="footer">
   {% include '../../widget/system-version.html' %}
   {% include '../../widget/system-version.html' %}

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

@@ -118,7 +118,7 @@
     {# Sidebar #}
     {# Sidebar #}
     <div id="grw-sidebar-wrapper"></div>
     <div id="grw-sidebar-wrapper"></div>
 
 
-    <div class="flex-grow-1">
+    <div class="flex-fill mw-0">
       {% block head_warn_alert_siteurl_undefined %}{% include '../widget/alert_siteurl_undefined.html' %}{% endblock %}
       {% block head_warn_alert_siteurl_undefined %}{% include '../widget/alert_siteurl_undefined.html' %}{% endblock %}
 
 
       {# Search #}
       {# Search #}