Merge branch 'ci-integration' into 'master'

fix errors to master branch salt install

See merge request !10

.gitignore

@@ -44,6 +44,6 @@ circle/bower_components
 jsi18n
 scripts.rc
 
-# less
-# *.css
+# les
+*.css
 circle/dashboard/static/compile_bootstrap.css

circle/dashboard/static/dashboard/dashboard.css

@@ -1365,14 +1365,4 @@ textarea[name="new_members"] {
   margin-right: 8px;
 }
 
-#ace-meta-data {
-  position: absolute;
-  width: 95%;
-  height: 150px;
-}
 
-#ace-user-data {
-  position: absolute;
-  width: 95%;
-  height: 350px;
-}
\ No newline at end of file

circle/dashboard/static/dashboard/dashboard.less

@@ -1596,3 +1596,15 @@ textarea[name="new_members"] {
     }
   }
 }
+
+#ace-meta-data {
+  position: absolute;
+  width: 95%;
+  height: 150px;
+}
+
+#ace-user-data {
+  position: absolute;
+  width: 95%;
+  height: 350px;
+}
\ No newline at end of file