Home Explore Help
Sign In
wiki
/
weseek__growi
mirror of https://github.com/weseek/growi
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

reconstruct layouts

Yuki Takei 8 years ago
parent
03c203926d
commit
ee63b34769
13 changed files with 118 additions and 111 deletions
Split View Show Diff Stats
  1. 3 2
      lib/views/layout/layout.html
  2. 4 4
      resource/styles/scss/_comment.scss
  3. 1 1
      resource/styles/scss/_comment_crowi-plus.scss
  4. 64 46
      resource/styles/scss/_layout.scss
  5. 1 1
      resource/styles/scss/_layout_crowi-plus.scss
  6. 35 4
      resource/styles/scss/_layout_crowi.scss
  7. 3 3
      resource/styles/scss/_page.scss
  8. 2 2
      resource/styles/scss/_page_crowi-plus.scss
  9. 1 1
      resource/styles/scss/_page_list.scss
  10. 1 1
      resource/styles/scss/_user.scss
  11. 1 1
      resource/styles/scss/_user_crowi-plus.scss
  12. 1 44
      resource/styles/scss/_wiki.scss
  13. 1 1
      resource/styles/scss/_wiki_crowi-plus.scss

+ 3 - 2
lib/views/layout/layout.html
View File 

@@ -107,8 +107,9 @@ gh/highlightjs/cdn-release@9.12.0/build/languages/yaml.min.js
 
 
 {% block html_body %}
 
 <body
 
-  class="crowi main-container content-wrapper {% block html_base_css %}{% endblock %}
 
-      {% if 'crowi-plus' === layoutType() %}crowi-plus{% endif %}"
 
+  class="main-container content-wrapper {% block html_base_css %}{% endblock %}
 
+      {% if 'crowi' === layoutType() %}crowi{% endif %}
 
+      {% if 'crowi-plus' === layoutType() %}growi{% endif %}"
 
   data-me="{{ user._id.toString() }}"
 
   data-plugin-enabled="{{ isEnabledPlugins() }}"
 
  {% block html_base_attr %}{% endblock %}

+ 4 - 4
resource/styles/scss/_comment.scss
View File 

@@ -1,4 +1,4 @@
 
-.crowi.main-container {
 
+.main-container {
 
   .page-comment-main {
 
     // delete button
 
     .page-comment-control {
 
@@ -21,7 +21,7 @@
 
   }
 
 }
 
 
-.crowi.main-container .crowi-sidebar .side-content { // styles only for original crowi
 
+.main-container .crowi-sidebar .side-content { // styles only for original crowi
 
 
 .page-comments {
 
   margin: 8px 0 0 0;
 
@@ -90,9 +90,9 @@
 
   }
 
 }
 
 
-} // .crowi.main-container aside.sidebar .side-content
 
+} // .main-container aside.sidebar .side-content
 
 
-.crowi.main-container {
 
+.main-container {
 
   .page-comments {
 
 
     .page-comments-list-toggle-newer,

+ 1 - 1
resource/styles/scss/_comment_crowi-plus.scss
View File 

@@ -1,4 +1,4 @@
 
-.crowi-plus.main-container  {
 
+.growi.main-container  {
 
 
   %comment-section {
 
     position: relative;

+ 64 - 46
resource/styles/scss/_layout.scss
View File 

@@ -1,60 +1,78 @@
 
-.crowi { // {{{
 
+.main-container { // {{{
 
   h1, h2, h3, h4, h5, h6 {
 
     font-weight: 500;
 
   }
 
 
-  &.main-container { // {{{
 
-
 
-    .navbar-top-links { // {{{
 
-      .confidential {
 
-        a {
 
-          // border: solid 2px #f00;
 
-          // background: #fff;
 
-          // color: #f00;
 
-          // font-weight: bold;
 
-          // height: 42px;
 
-          // margin-top: 5px;
 
-          // padding: 10px;
 
-          // margin-right: 5px;
 
-        }
 
+  .navbar-top-links { // {{{
 
+    .confidential {
 
+      a {
 
+        // border: solid 2px #f00;
 
+        // background: #fff;
 
+        // color: #f00;
 
+        // font-weight: bold;
 
+        // height: 42px;
 
+        // margin-top: 5px;
 
+        // padding: 10px;
 
+        // margin-right: 5px;
 
       }
 
-    } // }}}
 
+    }
 
+  } // }}}
 
 
-    .main {
 
-      padding: 0; // cancel bootstrap padding
 
+  .main {
 
+    padding: 0; // cancel bootstrap padding
 
 
-      .header-wrap {
 
-        padding: 16px 16px 0 16px;
 
-        min-height: 70px;
 
-      }
 
+    .header-wrap {
 
+      padding: 16px 16px 0 16px;
 
+      min-height: 70px;
 
+    }
 
 
-      .content-main {
 
-        padding: 8px 16px;
 
-      }
 
+    .content-main {
 
+      padding: 8px 16px;
 
+    }
 
+  }
 
+
 
+  .layout-control { // {{{
 
+    transition: .3s ease;
 
+    -webkit-transition: .3s ease;
 
+    position: fixed;
 
+    display: block;
 
+    text-align: center;
 
+    right: 25%;
 
+    bottom: 25px;
 
+    padding: 5px 8px;
 
+    border: solid 1px #ccc;
 
+    border-right: none;
 
+    border-radius: 5px 0 0 5px;
 
+    z-index: 1039;
 
+    font-size: .8em;
 
+
 
+    &:hover {
 
+      text-decoration: none;
 
+      cursor: pointer;
 
     }
 
+  } // }}}
 
+
 
+  .revision-toc {
 
+    font-size: .9em;
 
+    max-width: 250px;
 
+    overflow: hidden;
 
+
 
+    .revision-toc-content {
 
+      padding: 10px;
 
 
-    .layout-control { // {{{
 
-      transition: .3s ease;
 
-      -webkit-transition: .3s ease;
 
-      position: fixed;
 
-      display: block;
 
-      text-align: center;
 
-      right: 25%;
 
-      bottom: 25px;
 
-      padding: 5px 8px;
 
-      border: solid 1px #ccc;
 
-      border-right: none;
 
-      border-radius: 5px 0 0 5px;
 
-      z-index: 1039;
 
-      font-size: .8em;
 
-
 
-      &:hover {
 
-        text-decoration: none;
 
-        cursor: pointer;
 
+      > ul {
 
+        padding-left: 0;
 
+        ul {
 
+          padding-left: 1em;
 
+        }
 
       }
 
-    } // }}}
 
 
-  } // }}}
 
+      > ul > li { // first level of li
 
+        margin: 4px 4px 4px 15px;
 
+        padding: 5px;
 
+      }
 
+    }
 
+  }
 
 } // }}}
 
 
 
@@ -135,7 +153,7 @@
 
 } // }}}
 
 
 @media print { // {{{ printable style
 
-  .crowi.main-container { // {{{
 
+  .main-container { // {{{
 
     padding: 30px;
 
 
     a:after {

+ 1 - 1
resource/styles/scss/_layout_crowi-plus.scss
View File 

@@ -1,4 +1,4 @@
 
-.crowi-plus.main-container {
 
+.growi.main-container {
 
   .main-crowi-plus-customized .content-main {
 
     padding: 0;
 
   }

+ 35 - 4
resource/styles/scss/_layout_crowi.scss
View File 

@@ -1,7 +1,38 @@
 
-header {
 
-  #search-listpage-form {
 
-    .btn-sm {
 
-      line-height: 0.5em;
 
+.crowi.main-container {
 
+  header {
 
+    #search-listpage-form {
 
+      .btn-sm {
 
+        line-height: 0.5em;
 
+      }
 
+    }
 
+  }
 
+
 
+  .revision-toc {
 
+    float: right;
 
+    border: solid 1px #aaa;
 
+    border-radius: 5px;
 
+    max-width: 250px;
 
+    overflow: hidden;
 
+
 
+    .revision-toc-head {
 
+      display: inline-block;
 
+      float: right;
 
+      border-left: solid 1px #aaa;
 
+      border-bottom: solid 1px #aaa;
 
+      border-radius: 0 5px;
 
+      padding: 3px 11px;
 
+      font-weight: bold;
 
+      background: #f0f0f0;
 
+      margin-left: 5px;
 
+      margin-bottom: 5px;
 
+
 
+      &.collapsed {
 
+        border: none;
 
+        margin: 0;
 
+      }
 
+    }
 
+    .revision-toc-content {
 
+      background: #fcfcfc;
 
     }
 
   }
 
 }

+ 3 - 3
resource/styles/scss/_page.scss
View File 

@@ -1,7 +1,7 @@
 
 // import diff2html styles
 
 @import "~diff2html/dist/diff2html.css";
 
 
-.crowi.main-container {
 
+.main-container {
 
   // padding controll of .header-wrap and .content-main are moved to _layout and _form
 
 
   /*
 
@@ -136,7 +136,7 @@
 
   */
 
 }
 
 
-.crowi.main-container .main .content-main .revision-history { // {{{
 
+.main-container .main .content-main .revision-history { // {{{
 
 
   .revision-history-list {
 
     .revision-hisory-outer {
 
@@ -175,7 +175,7 @@
 
 
 // for not_found.html
 
 /*
 
-.crowi.main-container {
 
+.main-container {
 
   .message-not-found {
 
     margin-top: 10px;
 
     margin-left: 16px;

+ 2 - 2
resource/styles/scss/_page_crowi-plus.scss
View File 

@@ -1,4 +1,4 @@
 
-.crowi-plus.main-container {
 
+.growi.main-container {
 
   header {
 
 
     div.title-logo-container {
 
@@ -55,7 +55,7 @@
 
 }
 
 
 // for not_found.html
 
-.crowi-plus.main-container {
 
+.growi.main-container {
 
   .message-not-found {
 
     margin-left: 0;
 
   }

+ 1 - 1
resource/styles/scss/_page_list.scss
View File 

@@ -1,5 +1,5 @@
 
 
-.crowi.main-container .main .timeline-body { // {{{
 
+.main-container .main .timeline-body { // {{{
 
   .revision-path {
 
     margin-top: 1.6em;
 
     margin-bottom: 0;

+ 1 - 1
resource/styles/scss/_user.scss
View File 

@@ -1,4 +1,4 @@
 
-.crowi.main-container {
 
+.main-container {
 
   .main.user-page { // {{{ .main of layout related
 
 
     .header-wrap {

+ 1 - 1
resource/styles/scss/_user_crowi-plus.scss
View File 

@@ -1,4 +1,4 @@
 
-.crowi-plus.main-container {
 
+.growi.main-container {
 
   .main-crowi-plus-customized.user-page {
 
 
     .header-wrap {

+ 1 - 44
resource/styles/scss/_wiki.scss
View File 

@@ -2,49 +2,6 @@ div.body {
 
   padding: 10px;
 
 }
 
 
-.revision-toc {
 
-  float: right;
 
-  font-size: .9em;
 
-  border: solid 1px #aaa;
 
-  border-radius: 5px;
 
-  max-width: 250px;
 
-  overflow: hidden;
 
-
 
-  .revision-toc-head {
 
-    display: inline-block;
 
-    float: right;
 
-    border-left: solid 1px #aaa;
 
-    border-bottom: solid 1px #aaa;
 
-    border-radius: 0 5px;
 
-    padding: 3px 11px;
 
-    font-weight: bold;
 
-    background: #f0f0f0;
 
-    margin-left: 5px;
 
-    margin-bottom: 5px;
 
-
 
-    &.collapsed {
 
-      border: none;
 
-      margin: 0;
 
-    }
 
-  }
 
-  .revision-toc-content {
 
-    background: #fcfcfc;
 
-    padding: 10px;
 
-
 
-    > ul {
 
-      padding-left: 0;
 
-      ul {
 
-        padding-left: 1em;
 
-      }
 
-    }
 
-
 
-    > ul > li { // first level of li
 
-      margin: 4px 4px 4px 15px;
 
-      padding: 5px;
 
-    }
 
-  }
 
-}
 
-
 
 .revision-head {
 
 
   .revision-head-link,
 
@@ -192,7 +149,7 @@ div.body {
 
 }
 
 
 @media (max-width: $screen-sm-max) { // {{{ tablet and iphone size
 
-  .crowi.main-container .main .wiki {
 
+  .main-container .main .wiki {
 
     img {
 
       max-width: 100%;
 
     }

+ 1 - 1
resource/styles/scss/_wiki_crowi-plus.scss
View File 

@@ -1,4 +1,4 @@
 
-.crowi-plus.main-container {
 
+.growi.main-container {
 
 
   .revision-toc {
 
     // reset official styles