mayu morita 7 лет назад
Родитель
Сommit
eb2126fc32

+ 7 - 2
lib/views/layout-kibela/base/layout.html

@@ -4,7 +4,9 @@
 <div class="container-fluid">
 
 
+  <aside class="col-md-3 ">
 
+  </aside>
   <div class="row body m-0 p-0">
 
     <div id="main" class="main col-md-7 kibela-block bg-white m-t-30 round-corner {% if page %}{{ css.grant(page) }}{% endif %} {% block main_css_class %}{% endblock %}">
@@ -13,10 +15,13 @@
               {% block content_header %}
               {% endblock %}
             </div>
-          </div><!-- /.bg-title -->
+        </div><!-- /.bg-title -->
       {% block content_main_before %}
-      {% endblock %} {% block content_main %}
+      {% endblock %}
+
+      {% block content_main %}
       {% endblock content_main %}
+
       {% block content_main_after%}
       {% endblock %}
     </div>

+ 4 - 5
lib/views/layout-kibela/widget/header.html

@@ -1,9 +1,9 @@
-<div class="header-wrap">
+
   <header id="page-header">
     <div class="d-flex align-items-center">
-      <div class="title-logo-container hidden-xs hidden-sm">
-        <a class="logo" href="/">
-          <div class="logo-mark">{% include '../../widget/logo.html' %}</div>
+      <div class="hidden-xs hidden-sm">
+        <a class="" href="/">
+          <div class="">{% include '../../widget/logo.html' %}</div>
         </a>
       </div>
       <div class="title-container">
@@ -48,4 +48,3 @@
     </div>
 
   </header>
-</div>

+ 45 - 19
resource/styles/scss/_layout_kibela.scss

@@ -6,31 +6,27 @@
   body, html {
     background-color: gray;
   }
-  .container-fluid {
-    width: 100%;
-  }
-  .logo-mark {
-    background-color: white;
-    height: 50px;
-  }
-  .group1 {
-   background-color: #5584E1;
-  }
-  .navbar-header {
+  .logo {
+    background: transparent;
+     .logo-mark {
+      background-color: white;
+      height: 50px;
+   }
+ }
+
+
+
+
+  #page-header, .navbar-header, .textarea-editor, .page-editor-preview-body, .btn, .top-left-part {
     background: white;
-    margin: none !important;
-    padding: none !important;
   }
 
   #page-wrapper {
     background-color: #F4F5F6 !important;
 
   }
-  .header-wrap {
-    margin: none !important;
-    padding: none !important;
-
-    svg {
+  .bg-title {
+     svg {
       display: none;
     }
   }
@@ -40,7 +36,7 @@
     z-index: absolute;
   }
   .d-flex {
-    position: relative;
+
   }
   .kibela-block {
 
@@ -65,6 +61,7 @@
     border-top: solid 0.2em #5584E1;
     z-index: absolute;
   }
+
   .revision-toc {
     &.affix {
       right: 6rem;
@@ -84,6 +81,35 @@
       }
     }
   }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
 
+
+
+
+
+
+
+
+
+
+