release 1.3.3

Conflicts: Gruntfile.js dist/fuelux-mctheme.zip
ExactTarget · Jan 21, 2015 · b9b7c5d · b9b7c5d
2 parents e0aa2a4 + 4e4177a
commit b9b7c5d
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 9 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -263,7 +263,7 @@ module.exports = function (grunt) {
 		grunt.task.run(['bump-only:' + versionReleaseType, 'dist', 'replace:readme']);
 	});
 
-	grunt.registerTask('gitrelease', ['shell:pullMaster', 'shell:pullRelease', 'release', 'shell:mergeRelease','shell:commitRelease','shell:tagRelease']);
+	grunt.registerTask('gitrelease', ['shell:pullMaster', 'shell:pullRelease', 'shell:mergeRelease', 'release','shell:commitRelease','shell:tagRelease']);
 
 	/* -------------
 			SERVE

diff --git a/Procfile b/Procfile
@@ -0,0 +1 @@
+web: node www/server.js
diff --git a/dist/css/fuelux-mctheme.css b/dist/css/fuelux-mctheme.css
diff --git a/dist/css/fuelux-mctheme.css.map b/dist/css/fuelux-mctheme.css.map
diff --git a/dist/css/fuelux-mctheme.min.css b/dist/css/fuelux-mctheme.min.css
diff --git a/dist/fuelux-mctheme.zip b/dist/fuelux-mctheme.zip
diff --git a/less/fuelux-override/selectlist.less b/less/fuelux-override/selectlist.less
@@ -13,4 +13,10 @@
 			}
 		}
 	}
+	&[data-resize="auto"] {
+		.selected-label {
+			padding-right: 10px;
+		}
+
+	}
 }
diff --git a/less/fuelux-override/tree.less b/less/fuelux-override/tree.less
@@ -46,7 +46,7 @@
 		margin-right: 4px;
 		.sprite(-96px, -2px);
 		height: 12px;
-		width: 17px;
+		width: 16px;
 	}
 
 	// SELECTED - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

diff --git a/package.json b/package.json
@@ -34,21 +34,21 @@
   },
   "devDependencies": {
     "bower": "1.x",
-    "grunt-bump": "0.x",
     "connect": "3.x",
     "grunt": "0.x",
     "grunt-banner": "0.x",
+    "grunt-bump": "0.x",
     "grunt-cli": "0.x",
     "grunt-contrib-clean": "0.x",
     "grunt-contrib-compress": "0.x",
     "grunt-contrib-connect": "0.x",
     "grunt-contrib-copy": "0.x",
     "grunt-contrib-less": "0.x",
-    "grunt-text-replace": "0.x",
     "grunt-contrib-watch": "0.x",
     "grunt-curl": "2.x",
-    "grunt-grunticon": "^1.4.0",
-    "grunt-svgmin": "^2.0.0",
+    "grunt-grunticon": "1.x",
+    "grunt-shell": "1.x",
+    "grunt-svgmin": "2.x",
     "grunt-text-replace": "0.x",
     "grunt-zip": "0.x",
     "load-grunt-tasks": "0.x",