Merged from master

2015-11-25 09:04:11 -08:00
parent 7849803a5d
commit 268a2c2427
64 changed files with 3200 additions and 231 deletions
--- a/platform/forms/res/templates/controls/color.html
+++ b/platform/forms/res/templates/controls/color.html
@@ -20,7 +20,7 @@
 at runtime from the About dialog for additional information.
 -->
 <div
-	class="t-btn l-btn s-btn s-icon-btn s-menu-btn menu-element t-color-palette"
+	class="t-btn l-btn s-btn s-menu-btn menu-element t-color-palette"
    ng-controller="ClickAwayController as toggle"
 	>