Merge pull request #2811 from weseek/imprv/apply-container-tag

imprv/add container tag

src/client/js/components/Page.jsx

@@ -129,12 +129,12 @@ class Page extends React.Component {
 
   render() {
     const { appContainer, pageContainer } = this.props;
-    const isMobile = appContainer.isMobile;
+    const { isMobile } = appContainer;
     const isLoggedIn = appContainer.currentUser != null;
     const { markdown } = pageContainer.state;
 
     return (
-      <div className={isMobile ? 'page-mobile' : ''}>
+      <div className={isMobile && 'page-mobile'}>
         <RevisionRenderer growiRenderer={this.growiRenderer} markdown={markdown} />
 
         { isLoggedIn && (

src/client/styles/scss/_layout.scss

@@ -29,6 +29,8 @@ body {
 }
 
 .main {
+  padding-right: 15px;
+  padding-left: 15px;
   margin-top: 1rem;
 }
 

src/server/views/layout-growi/base/layout.html

@@ -19,7 +19,7 @@
 <div id="grw-fav-sticky-trigger" class="sticky-top"></div>
 {% endblock %}
 
-<div id="main" class="main container-fluid {% if page %}{{ css.grant(page) }}{% endif %} {% block main_css_class %}{% endblock %}">
+<div id="main" class="main {% if page %}{{ css.grant(page) }}{% endif %} {% block main_css_class %}{% endblock %}">
   {% block content_main_before %}
   {% endblock %}
 

src/server/views/widget/page_content.html

@@ -1,5 +1,5 @@
 {% if page %}
-<div id="content-main" class="content-main"
+<div id="content-main" class="content-main container"
   data-path="{{ encodeURI(page.path) }}"
   data-current-user="{% if user %}{{ user._id.toString() }}{% endif %}"
   data-page-id="{% if page %}{{ page._id.toString() }}{% endif %}"