WIP: reconstruct layouts

* crowi-sidebar, system-version

resource/styles/scss/_comment.scss

@@ -21,77 +21,6 @@
   }
 }
 
-.main-container .crowi-sidebar .side-content { // styles only for original crowi
-
-.page-comments {
-  margin: 8px 0 0 0;
-
-  .page-comment-form {
-    margin-top: 16px;
-
-    .comment-form {
-    }
-
-    .comment-form-main {
-
-      .comment-form-comment {
-        height: 60px;
-      }
-
-      .comment-submit {
-        margin-top: 8px;
-        text-align: right;
-      }
-    }
-  }
-
-  .page-comments-list {
-    .page-comment {
-      margin-top: 8px;
-      padding-top: 8px;
-      border-top: solid 1px #ccc;
-
-      .picture {
-        float: left;
-        width: 24px;
-        height: 24px;
-      }
-
-      .page-comment-creator {
-        font-weight: bold;
-      }
-
-      .page-comment-main {
-        position: relative;
-        margin-left: 40px;
-
-        .page-comment-meta {
-          color: #aaa;
-          font-size: .9em;
-        }
-        .page-comment-body {
-          padding: 8px 0;
-          word-wrap: break-word;
-        }
-        .page-comment-control {
-          position: absolute;
-          display: none;    // default hidden
-          top: 0;
-          right: 0;
-        }
-      }
-
-      // show controls when hover
-      .page-comment-main:hover > .page-comment-control {
-        display: block;
-      }
-    }
-
-  }
-}
-
-} // .main-container aside.sidebar .side-content
-
 .main-container {
   .page-comments {
 

resource/styles/scss/_layout.scss

@@ -85,82 +85,6 @@ $nav-main-left-tab-width: 95px;
 }
 
 
-.crowi.single { // {{{
-} // }}}
-
-.crowi.single.nologin { // {{{
-  .installer-header {
-    margin-top: 100px;
-    text-align: center;
-
-    h1 {
-      margin: 40px 0 40px;
-      color: #fff;
-      font-size: 1.6em;
-    }
-  }
-
-  .main {
-    margin: 0;
-    padding: 0;
-  }
-
-  h1.login-page {
-    margin-top: 80px;
-    color: #fff;
-    font-size: 1.6em;
-    padding: 10px;
-    text-align: center;
-    text-shadow: 0px 0px 6px rgba(0,0,0,.5);
-    line-height: 100%;
-  }
-
-
-  .login-dialog-container {
-
-    margin: 40px auto;
-    float: none;
-
-    .login-dialog {
-      position: relative;
-
-      form {
-        margin-top: 10px;
-        .input-group {
-          margin-bottom: 10px;
-        }
-      }
-
-      .login-dialog-inner, .register-dialog-inner {
-        top: 0;
-        left: 0;
-        padding: 42px 48px;
-        background: #fff;
-        position: absolute;
-        margin-bottom: 40px;
-        width: 100%;
-
-        box-shadow: 0 1px 40px 0 rgba(0,0,0,0.3);
-        border-radius: 3px;
-
-        h2 {
-          margin: 0 0 28px;
-          font-size: 1.3em;
-          text-align: center;
-        }
-      }
-
-      p.bottom-text {
-        text-align: right;
-        margin: 20px 0 0;
-      }
-    }
-
-  }
-
-
-} // }}}
-
 @media print { // {{{ printable style
   .main-container { // {{{
     padding: 30px;
@@ -206,3 +130,14 @@ $nav-main-left-tab-width: 95px;
     }
   }
 } // }}}
+
+.system-version {
+  position: fixed;
+  right: 0.5em;
+  bottom: 0;
+  opacity: .6;
+
+  > span {
+    margin-left: .5em;
+  }
+}

resource/styles/scss/_layout_crowi-plus.scss

@@ -13,16 +13,6 @@
       padding: 0;
     }
   }
-
 }
 
-.system-version {
-  position: fixed;
-  right: 0.5em;
-  bottom: 0;
-  opacity: .6;
 
-  > span {
-    margin-left: .5em;
-  }
-}

resource/styles/scss/_layout_crowi.scss

@@ -36,20 +36,4 @@
     }
   }
 
-  .crowi-sidebar {
-    .portal-form-button {
-      text-align: center;
-    }
-
-    .system-version {
-      position: absolute;
-      left: 0.5em;
-      right: 1em;
-      bottom: 0.5em;
-
-      display: flex;
-      justify-content: space-between;
-    }
-  }
-
 }

resource/styles/scss/_layout_crowi_sidebar.scss

@@ -11,7 +11,6 @@
   background: #f5f5f5;
 
   transition: .3s ease;
-  -webkit-transition: .3s ease;
 
 
   .page-meta {
@@ -71,7 +70,7 @@
   }
 
   .side-content {
-    // margin-bottom: $crowiFooterHeight + $crowiHeaderHeight;
+    margin-bottom: 100px;
     color: #666;
     padding: 15px;
 
@@ -79,12 +78,6 @@
       font-size: 1.1em;
     }
 
-    // disabled in crowi-plus -- 2017.06.03 Yuki Takei
-    // a {
-    //   color: #ccc;
-    //   &:hover { color: #aaa;}
-    // }
-
     ul.fitted-list {
       padding-left: 0;
       li {
@@ -95,6 +88,93 @@
         }
       }
     }
+
+    .page-comments {
+      margin: 8px 0 0 0;
+
+      .page-comment-form {
+        margin-top: 16px;
+
+        .comment-form {
+        }
+
+        .comment-form-main {
+
+          .comment-form-comment {
+            height: 60px;
+          }
+
+          .comment-submit {
+            margin-top: 8px;
+            text-align: right;
+          }
+        }
+      }
+
+      .page-comments-list {
+        .page-comment {
+          margin-top: 8px;
+          padding-top: 8px;
+          border-top: solid 1px #ccc;
+
+          .picture {
+            float: left;
+            width: 24px;
+            height: 24px;
+          }
+
+          .page-comment-creator {
+            font-weight: bold;
+          }
+
+          .page-comment-main {
+            position: relative;
+            margin-left: 40px;
+
+            .page-comment-meta {
+              color: #aaa;
+              font-size: .9em;
+            }
+            .page-comment-body {
+              padding: 8px 0;
+              word-wrap: break-word;
+            }
+            .page-comment-control {
+              position: absolute;
+              display: none;    // default hidden
+              top: 0;
+              right: 0;
+            }
+          }
+
+          // show controls when hover
+          .page-comment-main:hover > .page-comment-control {
+            display: block;
+          }
+        }
+      }
+    }
+
+  }
+
+  .portal-form-button {
+    text-align: center;
+  }
+
+  .system-version {
+    position: fixed;
+    z-index: 1;
+    right: 1.4em;
+    width: calc(25% - 1.5em);
+    bottom: 0.1em;
+    padding-right: 1em;
+    opacity: 1;
+
+    display: flex;
+    justify-content: space-between;
+
+    background-color: #f5f5f5;
+    transition: .3s ease;
   }
 
 } // }}}
@@ -107,7 +187,7 @@
     }
   }
 
-  .crowi-sidebar { // {{{
+  .crowi-sidebar, .system-version { // {{{
     right: -25%;
   } // }}}