Merge remote-tracking branch 'origin/master'

keymasroy · May 31, 2017 · 21a2de0 · 21a2de0
2 parents 89f862c + e69240f
commit 21a2de0
Show file tree

Hide file tree

Showing 418 changed files with 25,732 additions and 14,498 deletions.
diff --git a/ax-boot-admin/src/main/webapp/WEB-INF/tags/common-code.tag b/ax-boot-admin/src/main/webapp/WEB-INF/tags/common-code.tag
@@ -72,9 +72,9 @@
         case "radio":
             for (CommonCode commonCode : commonCodes) {
                 if (StringUtils.isNotEmpty(defaultValue) && defaultValue.equals(commonCode.getCode())) {
-                    builder.append(String.format(" <input type=\"radio\" name=\"%s\" data-ax-path=\"%s\" value=\"%s\" checked> %s &nbsp;", name, dataPath, commonCode.getCode(), commonCode.getName()));
+                    builder.append(String.format("<label class=\"checkbox-inline\"><input type=\"radio\" name=\"%s\" data-ax-path=\"%s\" value=\"%s\" checked> %s </label>", name, dataPath, commonCode.getCode(), commonCode.getName()));
                 } else {
-                    builder.append(String.format(" <input type=\"radio\" name=\"%s\" data-ax-path=\"%s\" value=\"%s\"> %s &nbsp;", name, dataPath, commonCode.getCode(), commonCode.getName()));
+                    builder.append(String.format("<label class=\"checkbox-inline\"><input type=\"radio\" name=\"%s\" data-ax-path=\"%s\" value=\"%s\"> %s </label>", name, dataPath, commonCode.getCode(), commonCode.getName()));
                 }
             }
             break;

diff --git a/ax-boot-admin/src/main/webapp/assets/css/axboot-01.css b/ax-boot-admin/src/main/webapp/assets/css/axboot-01.css
diff --git a/ax-boot-admin/src/main/webapp/assets/css/axboot-02.css b/ax-boot-admin/src/main/webapp/assets/css/axboot-02.css
diff --git a/ax-boot-admin/src/main/webapp/assets/css/axboot-03.css b/ax-boot-admin/src/main/webapp/assets/css/axboot-03.css
diff --git a/ax-boot-admin/src/main/webapp/assets/css/axboot.css b/ax-boot-admin/src/main/webapp/assets/css/axboot.css
diff --git a/ax-boot-admin/src/main/webapp/assets/plugins/ax5core/.bower.json b/ax-boot-admin/src/main/webapp/assets/plugins/ax5core/.bower.json
@@ -1,6 +1,6 @@
 {
   "name": "ax5core",
-  "version": "1.3.96",
+  "version": "1.4.67",
   "authors": [
     "ThomasJ <[email protected]>"
   ],
@@ -16,15 +16,16 @@
     "javascript ui"
   ],
   "dependencies": {
-    "jquery": "^1.11.0"
+    "jquery": ""
   },
+  "devDependencies": {},
   "license": "MIT",
   "homepage": "ax5.io",
-  "_release": "1.3.96",
+  "_release": "1.4.67",
   "_resolution": {
     "type": "version",
-    "tag": "1.3.96",
-    "commit": "156bdec35b8962eef008e24bd53aa323f63d9ef6"
+    "tag": "1.4.67",
+    "commit": "31d889255f7433a6e7c3cdc8e6067e24e1cb9d2c"
   },
   "_source": "https://github.com/ax5ui/ax5core.git",
   "_target": ">=1.3.0",

diff --git a/ax-boot-admin/src/main/webapp/assets/plugins/ax5core/API-ax5-util.md b/ax-boot-admin/src/main/webapp/assets/plugins/ax5core/API-ax5-util.md
@@ -775,4 +775,10 @@ $(document.body).click(function(){
 ax5.util.string("{0} is dead, but {1} is alive! {0} {2}").format("ASP", "ASP.NET");
 ax5.util.string("{0} is dead, but {1} is alive! {0} {2}").format(["ASP", "ASP.NET"]);
 ax5.util.stinrg("{0} counts").format(100);
-```
+``````
+
+## ax5.util.color
+`ax5.util.color("#ff3300");`  
+`ax5.util.color("rgb(255, 100, 100)");`  
+`ax5.util.color("#ff3300").lighten(10).getHexValue();`  
+`ax5.util.color("#ff3300").darken(10).getHexValue();`  
diff --git a/ax-boot-admin/src/main/webapp/assets/plugins/ax5core/bower.json b/ax-boot-admin/src/main/webapp/assets/plugins/ax5core/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "ax5core",
-  "version": "1.4.18",
+  "version": "1.4.67",
   "authors": [
     "ThomasJ <[email protected]>"
   ],
@@ -16,12 +16,9 @@
     "javascript ui"
   ],
   "dependencies": {
-    "jquery": "^1.11.0"
-  },
-  "devDependencies": {
-    "bootstrap-sass": "^3.3.7",
-    "bourbon": "^4.2.7"
+    "jquery": ""
   },
+  "devDependencies": {},
   "license": "MIT",
   "homepage": "ax5.io"
 }