Browse Source

WIP: reconstruct layouts

* crowi-sidebar
Yuki Takei 8 years ago
parent
commit
2130844154

+ 3 - 1
lib/views/layout-crowi/base/layout.html

@@ -4,7 +4,9 @@
 {% block layout_main %}
 <div class="container-fluid">
 
-  <a href="" class=" hidden-xs hidden-sm layout-control" id="toggle-sidebar"><i class="fa fa-chevron-right"></i> <span class="hide-on-affix-top"></span></a>
+  <a href="" class=" hidden-xs hidden-sm layout-control" id="toggle-sidebar">
+    <i class="ti-angle-right"></i><i class="ti-angle-left"></i> <span class="hide-on-affix-top"></span>
+  </a>
   <aside class="crowi-sidebar col-md-3 hidden-xs hidden-sm hidden-print">
 
     {% block side_header %}

+ 16 - 4
resource/styles/scss/_layout_crowi_sidebar.scss

@@ -172,11 +172,22 @@
 
 } // }}}
 
+body:not(.aside-hidden) #toggle-sidebar {
+  i.ti-angle-left {
+    display: none;
+  }
+  i.ti-angle-right {
+    display: block;
+  }
+}
 .aside-hidden { // {{{
   #toggle-sidebar {
     right: 0;
-    i {
-      transform: rotate(180deg);
+    i.ti-angle-right {
+      display: block;
+    }
+    i.ti-angle-right {
+      display: none;
     }
   }
 
@@ -184,7 +195,8 @@
     right: -25%;
   } // }}}
 
-  .main { // {{{
+  .bg-title .col-md-9,
+  .main {
     width: 100%;
-  } // }}}
+  }
 } // }}}