apply admin.scss, clean code

lib/views/layout-crowi/not_found.html

@@ -29,7 +29,7 @@
 
 
 {% block content_main %}
-  <h2 class="m-l-15 message-not-found text-muted">
+  <h2 class="message-not-found text-muted m-b-20">
     <i class="icon-info" aria-hidden="true"></i>
     Page is not found
   </h2>

lib/views/layout-crowi/page_list.html

@@ -77,7 +77,7 @@
 
   {% include '../widget/page_content.html' %}
 
-  <div class="row page-list">
+  <div class="row page-list m-t-30">
     <div class="col-md-12">
       {% include '../widget/page_list_and_timeline.html' %}
     </div>

lib/views/layout-crowi/user_page.html

@@ -13,7 +13,7 @@
 
 
 {% block content_main_before %}
-  <div class="m-l-15 m-r-15 m-b-30">
+  <div class="m-b-30">
     {% include '../widget/user_page_content.html' %}
   </div>
 {% endblock %}

lib/views/layout-growi/not_found.html

@@ -23,19 +23,15 @@
 
 
 {% block content_main %}
-  <div class="container-fluid">
+  <div class="row">
+    <div class="col-lg-10 col-md-9">
+      <h2 class="message-not-found text-muted m-b-20">
+        <i class="icon-info" aria-hidden="true"></i>
+        Page is not found
+      </h2>
 
-    <div class="row">
-      <div class="col-lg-10 col-md-9">
-        <h2 class="message-not-found text-muted">
-          <i class="icon-info" aria-hidden="true"></i>
-          Page is not found
-        </h2>
-
-        {% include '../widget/not_found_content.html' %}
-
-      </div> {# /.col- #}
-    </div>
+      {% include '../widget/not_found_content.html' %}
 
+    </div> {# /.col- #}
   </div>
 {% endblock %}

lib/views/layout-growi/page.html

@@ -22,50 +22,50 @@
 
 
 {% block content_main %}
-  <div class="container-fluid">
-    <div class="row">
+  <div class="row">
 
-      <div class="col-lg-10 col-md-9">
+    <div class="col-lg-10 col-md-9">
 
-        {% include '../widget/page_content.html' %}
+      {% include '../widget/page_content.html' %}
 
-        {# force remove #revision-toc from #content_main of parent #}
-        <script>
-          $('#revision-toc').remove();
-        </script>
+      {# force remove #revision-toc from #content_main of parent #}
+      <script>
+        $('#revision-toc').remove();
+      </script>
 
-      </div> {# /.col- #}
+    </div> {# /.col- #}
 
-      {# relocate #revision-toc #}
-      <div class="col-lg-2 col-md-3 visible-lg visible-md">
-        <div id="revision-toc" class="revision-toc" data-spy="affix" data-offset-top="80">
-          <div id="revision-toc-content" class="revision-toc-content"></div>
-        </div>
-      </div> {# /.col- #}
+    {# relocate #revision-toc #}
+    <div class="col-lg-2 col-md-3 visible-lg visible-md">
+      <div id="revision-toc" class="revision-toc" data-spy="affix" data-offset-top="80">
+        <div id="revision-toc-content" class="revision-toc-content"></div>
+      </div>
+    </div> {# /.col- #}
 
-    </div>
+  </div>
 
-    {% if 'crowi-plus' === behaviorType() %}
-    <div class="row page-list m-t-30">
-      <div class="col-md-12">
-        {% include '../widget/page_list_and_timeline.html' %}
-      </div>
+  {% if 'crowi-plus' === behaviorType() %}
+  <div class="row page-list m-t-30">
+    <div class="col-md-12">
+      {% include '../widget/page_list_and_timeline.html' %}
     </div>
-    {% endif %}
-
   </div>
+  {% endif %}
 {% endblock %}
 
+
 {% block content_main_after %}
   {% include 'widget/comments.html' %}
 {% endblock %}
 
+
 {% block content_footer %}
   {% if page %}
     {% include '../widget/page_attachments.html' %}
   {% endif %}
 {% endblock %}
 
+
 {% block body_end %}
   <div id="presentation-layer" class="fullscreen-layer">
     <div id="presentation-container"></div>

lib/views/layout-growi/page_list.html

@@ -23,44 +23,43 @@
 
 
 {% block content_main %}
-  <div class="container-fluid">
+  <div class="row">
 
-    <div class="row">
+    <div class="col-lg-10 col-md-9">
 
-      <div class="col-lg-10 col-md-9">
+      {% include '../widget/page_content.html' %}
 
-        {% include '../widget/page_content.html' %}
+      {# force remove #revision-toc from #content_main of parent #}
+      <script>
+        $('#revision-toc').remove();
+      </script>
 
-        {# force remove #revision-toc from #content_main of parent #}
-        <script>
-          $('#revision-toc').remove();
-        </script>
+    </div> {# /.col- #}
 
-      </div> {# /.col- #}
+    {# relocate #revision-toc #}
+    <div class="col-lg-2 col-md-3 visible-lg visible-md">
+      <div id="revision-toc" class="revision-toc" data-spy="affix" data-offset-top="80">
+        <div id="revision-toc-content" class="revision-toc-content"></div>
+      </div>
+    </div> {# /.col- #}
 
-      {# relocate #revision-toc #}
-      <div class="col-lg-2 col-md-3 visible-lg visible-md">
-        <div id="revision-toc" class="revision-toc" data-spy="affix" data-offset-top="80">
-          <div id="revision-toc-content" class="revision-toc-content"></div>
-        </div>
-      </div> {# /.col- #}
+  </div>
 
-    </div>
-
-    <div class="row page-list m-t-30">
-      <div class="col-md-12">
-        {% include '../widget/page_list_and_timeline.html' %}
-      </div>
+  <div class="row page-list m-t-30">
+    <div class="col-md-12">
+      {% include '../widget/page_list_and_timeline.html' %}
     </div>
   </div>
 {% endblock %}
 
+
 {% block content_footer %}
   {% if page %}
     {% include '../widget/page_attachments.html' %}
   {% endif %}
 {% endblock %}
 
+
 {% block body_end %}
   <div id="presentation-layer" class="fullscreen-layer">
     <div id="presentation-container"></div>

lib/views/layout-growi/user_page.html

@@ -15,54 +15,53 @@
 
 
 {% block content_main %}
-  <div class="container-fluid">
-    <div class="row">
+  <div class="row">
 
-      <div class="col-lg-10 col-md-9">
+    <div class="col-lg-10 col-md-9">
 
-        {#
-         # ensure to insert 'user_page_content' widget to here
-         #
-         #   Because this block has content like 'Bookmarks' or 'Recent Created' whose height changes dynamically,
-         #   setting of 'revision-toc' (affix) is hindered.
-         #}
-        <div class="m-b-30">
-          {% include '../widget/user_page_content.html' %}
-        </div>
+      {#
+        # ensure to insert 'user_page_content' widget to here
+        #
+        #   Because this block has content like 'Bookmarks' or 'Recent Created' whose height changes dynamically,
+        #   setting of 'revision-toc' (affix) is hindered.
+        #}
+      <div class="m-b-30">
+        {% include '../widget/user_page_content.html' %}
+      </div>
 
-        {% block content_main_before %}
-          {% parent %}
-        {% endblock %}
+      {% block content_main_before %}
+        {% parent %}
+      {% endblock %}
 
-        {% include '../widget/page_content.html' %}
+      {% include '../widget/page_content.html' %}
 
-        {# force remove #revision-toc from #content_main of parent #}
-        <script>
-          $('#revision-toc').remove();
-        </script>
+      {# force remove #revision-toc from #content_main of parent #}
+      <script>
+        $('#revision-toc').remove();
+      </script>
 
-      </div> {# /.col- #}
+    </div> {# /.col- #}
 
-      {# relocate #revision-toc #}
-      <div class="col-lg-2 col-md-3 visible-lg visible-md">
-        <div id="revision-toc" class="revision-toc" data-spy="affix" data-offset-top="75">
-          <div id="revision-toc-content" class="revision-toc-content"></div>
-        </div>
-      </div> {# /.col- #}
+    {# relocate #revision-toc #}
+    <div class="col-lg-2 col-md-3 visible-lg visible-md">
+      <div id="revision-toc" class="revision-toc" data-spy="affix" data-offset-top="75">
+        <div id="revision-toc-content" class="revision-toc-content"></div>
+      </div>
+    </div> {# /.col- #}
 
-    </div>
+  </div>
 
-    {% if 'crowi-plus' === behaviorType() %}
-    <div class="row page-list m-t-30">
-      <div class="col-md-12">
-        {% include '../widget/page_list_and_timeline.html' %}
-      </div>
+  {% if 'crowi-plus' === behaviorType() %}
+  <div class="row page-list m-t-30">
+    <div class="col-md-12">
+      {% include '../widget/page_list_and_timeline.html' %}
     </div>
-    {% endif %}
-
   </div>
+  {% endif %}
+
 {% endblock %}
 
+
 {% block content_main_after %}
   {% include 'widget/comments.html' %}
 {% endblock %}

lib/views/widget/page_attachments.html

@@ -1,6 +1,6 @@
 <div class="row page-attachments-row">
   <div class="col-xs-12">
-    <div class="m-t-15 m-l-15 m-r-15 m-b-15">
+    <div class="m-t-15 m-b-15">
       <div class="page-attachments" id="page-attachment"></div>
 
       <p class="page-meta">

resource/styles/scss/_admin.scss

@@ -1,57 +1,51 @@
-// import crowi variable
-@import 'utilities';
-
-.crowi {
+.admin-user-menu {
+  .dropdown-menu {
+    left: auto;
+    right: 0;
+  }
+}
 
-  .admin-user-menu {
-    .dropdown-menu {
-      left: auto;
-      right: 0;
-    }
+.admin-customize {
+  .ss-container img {
+    padding: .5em;
+    background-color: #ddd;
   }
 
-  .admin-customize {
-    .ss-container img {
-      padding: .5em;
-      background-color: #ddd;
-    }
+  // Toggle Twitter Bootstrap button class when active
+  // https://jsfiddle.net/ms040m01/3/
+  .btn-group.btn-toggle {
+    .btn.active[data-active-class="primary"] {
+      color: $btn-primary-color;
+      background-color: darken($btn-primary-bg, 10%);
+      border-color: $btn-primary-border;
 
-    // Toggle Twitter Bootstrap button class when active
-    // https://jsfiddle.net/ms040m01/3/
-    .btn-group.btn-toggle {
-      .btn.active[data-active-class="primary"] {
-        color: $btn-primary-color;
-        background-color: darken($btn-primary-bg, 10%);
-        border-color: $btn-primary-border;
-
-        &:hover {
-          background-color: darken($btn-primary-bg, 15%);
-        }
+      &:hover {
+        background-color: darken($btn-primary-bg, 15%);
       }
     }
+  }
 
-    .table-user-list {
-      .label-admin {
-        margin-left: 1em;
-      }
+  .table-user-list {
+    .label-admin {
+      margin-left: 1em;
     }
+  }
 
-    // override CodeMirror styles
-    .CodeMirror pre {
-      font-family: $font-family-monospace;
-    }
+  // override CodeMirror styles
+  .CodeMirror pre {
+    font-family: $font-family-monospace;
   }
+}
 
-  .admin-security {
-    .passport-logo {
-      padding: 4px;
-      height: 32px;
-      background-color: black;
-    }
+.admin-security {
+  .passport-logo {
+    padding: 4px;
+    height: 32px;
+    background-color: black;
+  }
 
-    .auth-mechanism-configurations {
-      min-height: 800px;
-    }
+  .auth-mechanism-configurations {
+    min-height: 800px;
   }
-  
 }
+

resource/styles/scss/_layout.scss

@@ -19,16 +19,10 @@
   } // }}}
 
   .main {
-    padding: 0; // cancel bootstrap padding
-
     .header-wrap {
       padding: 15px 15px 0 15px;
       min-height: 70px;
     }
-
-    .content-main {
-      padding: 8px 15px;
-    }
   }
 
   .layout-control { // {{{

resource/styles/scss/_layout_crowi.scss

@@ -36,8 +36,4 @@
     }
   }
 
-  .row.page-list {
-    margin-left: 0;
-    margin-right: 0;
-  }
 }

resource/styles/scss/_page_crowi-plus.scss

@@ -53,16 +53,3 @@
     }
   }
 }
-
-// for not_found.html
-.growi.main-container {
-  .message-not-found {
-    margin-left: 0;
-  }
-
-  .content-main.content-main-not-found {
-    .nav {
-      margin-top: 32px;
-    }
-  }
-}

resource/styles/scss/crowi.scss

@@ -11,7 +11,7 @@
 @import 'override-rbt';
 
 // crowi component
-// @import 'admin';
+@import 'admin';
 @import 'attachments';
 @import 'comment';
 @import 'comment_crowi-plus';