merge

2015-12-04 17:47:41 +01:00
parent 98ce08244f 8cf5fe7eef
commit ef31c17776
7 changed files with 65 additions and 86 deletions
--- a/scss/editor.scss
+++ b/scss/editor.scss
@@ -1,3 +1,2 @@
@import 'partials/legacy';
@import 'partials/overwrites';
-@import 'partials/editor';
--- a/scss/partials/_editor.scss
+++ b/scss/partials/_editor.scss
@@ -39,6 +39,15 @@
    top: 10%;
    display: inherit !important;
  }
+
+  // sidebar
+  .accordion-group {
+    margin-bottom: 2px;
+    border: 1px solid #e5e5e5;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+  }
 }

 // screen sizes
--- a/scss/partials/_legacy.scss
+++ b/scss/partials/_legacy.scss
@@ -1,8 +1,9 @@
 /* compiler is working */
 body {
+	background: red !important;
 	padding-top:50px;
 	padding-bottom: 40px;
-	margin-left:200px;
+	margin-left:200px !important;
 	-webkit-transition: margin 500ms ease;
 	-moz-transition: margin 500ms ease;
 	-ms-transition: margin 500ms ease;