Merge branch 'release/1.1.2'

siteorigin · Nov 11, 2016 · c740bad · c740bad
2 parents a1f790c + d62d5fc
commit c740bad
Show file tree

Hide file tree

Showing 12 changed files with 7,599 additions and 5,751 deletions.
diff --git a/build b/build
diff --git a/css/admin.css b/css/admin.css
@@ -335,7 +335,7 @@
   padding: 5px 8px;
 }
 #so-custom-css-properties .sections .fields-table .minicolors input {
-  padding-left: 30px;
+  padding: 14px 0 14px 30px;
 }
 #so-custom-css-properties .sections .fields-table .select {
   display: block;

diff --git a/css/admin.less b/css/admin.less
@@ -399,7 +399,7 @@
 			}
 
 			.minicolors input {
-				padding-left: 30px;
+				padding: 14px 0 14px 30px;
 			}
 
 			.select {

diff --git a/js/css.js b/js/css.js
@@ -4252,7 +4252,7 @@ define(function (require, exports, module) {
 },{"amdefine":26}],26:[function(require,module,exports){
 (function (process,__filename){
 /** vim: et:ts=4:sw=4:sts=4
- * @license amdefine 1.0.0 Copyright (c) 2011-2015, The Dojo Foundation All Rights Reserved.
+ * @license amdefine 1.0.1 Copyright (c) 2011-2016, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/amdefine for details
  */