merge

2015-12-04 17:47:41 +01:00
parent 98ce08244f 8cf5fe7eef
commit ef31c17776
7 changed files with 65 additions and 86 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 node_modules/
+.sass-cache/
--- a/css/editor.css
+++ b/css/editor.css
@@ -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;
@@ -332,50 +333,3 @@ a.language-selected {
    display: block; }
  .toolbox-reset .modal {
    left: inherit; }
-
-/*
- * Stuff we've deleted that comes from the bootstrap-combined.css file
- */
-.toolbox-reset .modal {
-  position: fixed;
-  top: 10%;
-  left: 50%;
-  z-index: 1050;
-  width: 560px;
-  margin-left: -280px;
-  background-color: #ffffff;
-  border: 1px solid #999;
-  border: 1px solid rgba(0, 0, 0, 0.3);
-  -webkit-border-radius: 6px;
-  -moz-border-radius: 6px;
-  border-radius: 6px;
-  -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-  -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-  box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-  -webkit-background-clip: padding-box;
-  -moz-background-clip: padding-box;
-  background-clip: padding-box;
-  outline: none; }
-
-.toolbox-reset .modal.fade {
-  -webkit-transition: opacity .3s linear, top .3s ease-out;
-  -moz-transition: opacity .3s linear, top .3s ease-out;
-  -o-transition: opacity .3s linear, top .3s ease-out;
-  transition: opacity .3s linear, top .3s ease-out;
-  top: -25%; }
-
-.toolbox-reset .modal.fade.in {
-  top: 10%;
-  display: inherit !important; }
-
-#MD {
-  width: 992px; }
-
-#SM {
-  width: 768px; }
-
-#XS {
-  width: 480px; }
-
-#LG {
-  width: 100%; }
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -12,18 +12,32 @@ gulp.task('sass', function () {
    .pipe(gulp.dest('css'));
 });

+gulp.task('sass:watch', function () {
+  gulp.watch('scss/*.scss', ['sass']);
+  gulp.watch(['css/*.css'], reload);
+});
+
+
 // Start a server with Live Reload
 gulp.task('serve', ['sass'], function () {
  browserSync({
+    // notify: false,
+    // Customize the BrowserSync console logging prefix
+    // logPrefix: 'WSK',
+    // Run as an https by uncommenting 'https: true'
+    // Note: this uses an unsigned certificate which on first access
+    //       will present a certificate warning in the browser.
+    // https: true,
    server: ['.tmp', './']
+
+    // proxy: 'http://localhost:8888/'
+
  });

-  gulp.watch(['sass/**/*.scss'], ['sass']);
-  gulp.watch(['css/*.css'], reload);

-});
-
-
-gulp.task('sass:watch', function () {
-  gulp.watch('scss/**/*.scss', ['sass']);
+  gulp.watch(['./scss/**/*.scss'], ['sass']);
+  gulp.watch(['css/**/*.css'], reload);
+  gulp.watch(['./*.html'], reload);
+  // gulp.watch(['./*.php'], reload);
+  // gulp.watch(['js/**/*.js'], [reload]);
 });
--- a/index.html
+++ b/index.html
@@ -20,6 +20,7 @@
    <![endif]-->
    <!-- Fav and touch icons -->
    <link rel="shortcut icon" href="img/favicon.png">
+
    <script type="text/javascript" src="js/jquery-2.0.0.min.js"></script>
    <!--[if lt IE 9]>
    <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.min.js"></script>
@@ -38,37 +39,37 @@
    </style>
  </head>
  <body style="cursor: auto;" class="edit toolbox-reset">
-    <div class="navbar navbar-inverse navbar-fixed-top">
-      <div class="navbar-inner">
-        <div class="container-fluid">
-          <div class="nav-collapse collapse">
-            <ul class="nav" id="menu-layoutit">
-              <li class="divider-vertical"></li>
-              <li>
-                <div class="btn-group">
-                  <button onclick="resizeCanvas('lg')" class="btn btn-primary"><i class="fa fa-desktop"></i> </button>
-                  <button onclick="resizeCanvas('md')" class="btn btn-primary"><i class="fa fa-laptop"></i> </button>
-                  <button onclick="resizeCanvas('sm')" class="btn btn-primary"><i class="fa fa-tablet"></i> </button>
-                  <button onclick="resizeCanvas('xs')" class="btn btn-primary"><i class="fa fa-mobile-phone"></i> </button>
-                </div>
-                <div class="btn-group">
-                  <a class="btn btn-primary" href="/" target="_blank"><i class="icon-home icon-white"></i>Home</a>
-                </div>
-                <div class="btn-group" data-toggle="buttons-radio">
-                  <button type="button" id="edit" class="btn btn-primary active"><i class="icon-edit icon-white"></i>Edit</button>
-                  <button type="button" class="btn btn-primary" id="devpreview"><i class="icon-eye-close icon-white"></i>Developer</button>
-                  <button type="button" class="btn btn-primary" id="sourcepreview"><i class="icon-eye-open icon-white"></i>Preview</button>
-                </div>
-                <div class="btn-group">
-                  <button type="button" class="btn btn-primary" data-target="#downloadModal" rel="/build/downloadModal" role="button" data-toggle="modal"><i class="icon-chevron-down icon-white"></i>Download</button>
-                  <button class="btn btn-primary" href="#clear" id="clear"><i class="icon-trash icon-white"></i>Clear</button>
-                </div>
-              </li>
-            </ul>
-          </div>
-        </div>
+    <nav class="navbar navbar-inverse navbar-fixed-top">
+      <div class="container-fluid">
+        <div class="container">
+          <ul class="nav" id="menu-layoutit">
+            <li class="divider-vertical"></li>
+            <li>
+              <div class="btn-group">
+                <button onclick="resizeCanvas('lg')" class="btn btn-primary"><i class="fa fa-desktop"></i> </button>
+                <button onclick="resizeCanvas('md')" class="btn btn-primary"><i class="fa fa-laptop"></i> </button>
+                <button onclick="resizeCanvas('sm')" class="btn btn-primary"><i class="fa fa-tablet"></i> </button>
+                <button onclick="resizeCanvas('xs')" class="btn btn-primary"><i class="fa fa-mobile-phone"></i> </button>
+              </div>
+              <div class="btn-group">
+                <a class="btn btn-primary" href="/" target="_blank"><i class="icon-home icon-white"></i>Home</a>
+              </div>
+              <div class="btn-group" data-toggle="buttons-radio">
+                <button type="button" id="edit" class="btn btn-primary active"><i class="icon-edit icon-white"></i>Edit</button>
+                <button type="button" class="btn btn-primary" id="devpreview"><i class="icon-eye-close icon-white"></i>Developer</button>
+                <button type="button" class="btn btn-primary" id="sourcepreview"><i class="icon-eye-open icon-white"></i>Preview</button>
+              </div>
+              <div class="btn-group">
+                <button type="button" class="btn btn-primary" data-target="#downloadModal" rel="/build/downloadModal" role="button" data-toggle="modal"><i class="icon-chevron-down icon-white"></i>Download</button>
+                <button class="btn btn-primary" href="#clear" id="clear"><i class="icon-trash icon-white"></i>Clear</button>
+              </div>
+            </li>
+          </ul>
      </div>
    </div>
+  </nav>
+
+
    <div class="container-fluid">
      <div class="changeDimension">
        <div class="row-fluid">
--- 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;