Merge branch 'release/1.2.0'

siteorigin · Jun 6, 2018 · ad972c4 · ad972c4
2 parents 8b35ee8 + 0676238
commit ad972c4
Show file tree

Hide file tree

Showing 20 changed files with 4,172 additions and 2,470 deletions.
diff --git a/build b/build
diff --git a/build-config.js b/build-config.js
@@ -28,6 +28,9 @@ module.exports = {
         src: 'js/main.js',
         dest: 'js/',
         fileName: 'css.js',
+		watchFiles: [
+			'js/**',
+		]
     },
     bust: {
         src: []

diff --git a/css/admin.css b/css/admin.css
@@ -14,8 +14,8 @@
   height: auto;
   margin: -8px 10px -8px 0;
 }
-#siteorigin-custom-css .updated {
-  margin: 0 20px 20px 20px ;
+#siteorigin-custom-css .notice {
+  margin: 0 20px 20px 20px;
 }
 #siteorigin-custom-css #poststuff {
   padding: 0 20px;

diff --git a/css/admin.less b/css/admin.less
@@ -19,8 +19,8 @@
 		box-shadow: 0 1px 1px rgba(0,0,0,0.035);
 	}
 
-	.updated {
-		margin: 0 20px 20px 20px ;
+	.notice {
+		margin: 0 20px 20px 20px;
 	}
 
 	#poststuff {
@@ -780,4 +780,4 @@
 .CodeMirror-hints {
 	/* This is above the editor in full-screen mode */
 	z-index: 100002;
-}
+}
+227 −179		gulpfile.js
+6,494 −0		package-lock.json
+3 −0		package.json