Merge pull request #6 from jezuhke/master

css/editor.css

@@ -329,3 +329,5 @@ a.language-selected {
   padding: inherit;
   -webkit-text-size-adjust: inherit;
   -ms-text-size-adjust: inherit; }
+  .toolbox-reset .collapse {
+    display: block; }

index.html

@@ -11,7 +11,7 @@
     <!-- Le styles -->
     <!-- <link href="css/bootstrap-combined.min.css" rel="stylesheet"> -->
     <link href="css/toolbox.css" rel="stylesheet">
-    <link href="css/layoutit.css" rel="stylesheet">
+    <link href="css/editor.css" rel="stylesheet">
     <link href="css/docs.min.css" rel="stylesheet">
     <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
     <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
@@ -43,7 +43,6 @@
         <div class="container-fluid">
           <div class="nav-collapse collapse">
             <ul class="nav" id="menu-layoutit">
-              <span>test push 2</span>
               <li class="divider-vertical"></li>
               <li>
                 <div class="btn-group">

scss/editor.scss

@@ -0,0 +1,2 @@
+@import 'partials/legacy';
+@import 'partials/overwrites';

scss/partials/_legacy.scss

@@ -34,7 +34,17 @@ body {
 	box-shadow: inset 1px 1px 3px rgba(0, 0, 0, 0.7);
 }
 
-.edit .demo { margin-left:0px; margin-top:10px; padding:30px 15px 15px; border: 1px solid #DDDDDD; border-radius: 4px; position:relative; word-wrap: break-word;}
+.edit .demo {
+  margin-left:0px;
+  margin-top:10px;
+  padding:30px 15px 15px;
+  border: 1px solid #DDDDDD;
+  border-radius: 4px;
+  position:relative;
+  word-wrap: break-word;
+  padding-left: 220px;
+}
+
 .edit .demo:after {
 	background-color: #F5F5F5;
 	border: 1px solid #DDDDDD;
@@ -199,16 +209,3 @@ body.devpreview { margin-left:0px;}
 #downloadModal textarea { width:100%;height:280px;resize: none;-moz-box-sizing: border-box;-webkit-box-sizing: border-box;box-sizing: border-box; }
 #editorModal {width:640px;}
 a.language-selected { font-style: italic; font-weight: bold; }
-
-.toolbox-reset {
-    background: inherit;
-    color: inherit;
-    display: inherit;
-    /*font-family: inherit;*/
-    /*font-size: inherit;*/
-    line-height: inherit;
-    margin: inherit;
-    padding: inherit;
-    -webkit-text-size-adjust: inherit;
-    -ms-text-size-adjust: inherit;
-}

scss/partials/_overwrites.scss

@@ -0,0 +1,16 @@
+.toolbox-reset {
+    background: inherit;
+    color: inherit;
+    display: inherit;
+    /*font-family: inherit;*/
+    /*font-size: inherit;*/
+    line-height: inherit;
+    margin: inherit;
+    padding: inherit;
+    -webkit-text-size-adjust: inherit;
+    -ms-text-size-adjust: inherit;
+
+    & .collapse {
+      display: block;
+    }
+}