Bladeren bron

WIP: apply bootstrap theme

* clean scss
Yuki Takei 8 jaren geleden
bovenliggende
commit
bd11e28908
3 gewijzigde bestanden met toevoegingen van 39 en 36 verwijderingen
  1. 0 35
      resource/styles/scss/_layout.scss
  2. 36 0
      resource/styles/scss/_override-agileadmin.scss
  3. 3 1
      resource/styles/scss/crowi.scss

+ 0 - 35
resource/styles/scss/_layout.scss

@@ -5,41 +5,6 @@
 
   &.main-container { // {{{
 
-    // hide sidebar by agile-admin completely
-    &.content-wrapper {
-      .sidebar {
-        display: none;
-      }
-      #page-wrapper {
-        margin-left: 0;
-      }
-    }
-
-    // logo
-    .top-left-part {
-      line-height: 0%;
-      a {
-        text-transform: none;
-      }
-    }
-    .logo {
-      svg.dark-logo, svg.dark-logo-text {
-        fill: white;
-      }
-      svg.light-logo, svg.light-logo-text {
-        fill: #4F5467;
-      }
-      svg.dark-logo, svg.light-logo {
-        padding: 12px;
-        width: 50px;
-        height: 50px;
-      }
-      svg.dark-logo-text, svg.light-logo-text {
-        width: 156px;
-        height: 50px;
-      }
-    }
-
     .crowi-header { // {{{
       z-index: 1040;
       // background: $crowiHeaderBackground;

+ 36 - 0
resource/styles/scss/_override-agileadmin.scss

@@ -0,0 +1,36 @@
+// hide sidebar by agile-admin completely
+.content-wrapper {
+  .sidebar {
+    display: none;
+  }
+  #page-wrapper {
+    margin-left: 0;
+  }
+}
+
+// logo
+.top-left-part {
+  line-height: 0%;
+  a {
+    text-transform: none;
+  }
+
+  .logo {
+    svg.dark-logo, svg.dark-logo-text {
+      fill: white;
+    }
+    svg.light-logo, svg.light-logo-text {
+      fill: #4F5467;
+    }
+    svg.dark-logo, svg.light-logo {
+      padding: 12px;
+      width: 50px;
+      height: 50px;
+    }
+    svg.dark-logo-text, svg.light-logo-text {
+      width: 156px;
+      height: 50px;
+    }
+  }
+}
+

+ 3 - 1
resource/styles/scss/crowi.scss

@@ -4,6 +4,8 @@
 // import crowi variables
 @import 'variables';
 
+@import 'override-agileadmin';
+
 // crowi component
 // @import 'admin';
 // @import 'attachments';
@@ -17,7 +19,7 @@
 // @import 'page';
 // @import 'page_crowi-plus';
 // @import 'portal';
-// @import 'search';
+@import 'search';
 // @import 'shortcuts';
 // @import 'user';
 // @import 'user_crowi-plus';