[Themes] Resolve conflicts

Resolve conflicts in preparation for merge, nasa/openmctweb#118
2015-09-22 16:09:42 -07:00
parent aba0969312 54334a8906
commit dbe1875e70
95 changed files with 11085 additions and 6512 deletions
--- a/platform/features/layout/bundle.json
+++ b/platform/features/layout/bundle.json
@@ -1,6 +1,6 @@
 {
    "name": "Layout components.",
-    "description": "Plug in adding Layout capabiltiies.",
+    "description": "Plug in adding Layout capabilities.",
    "extensions": {
        "views": [
            {
@@ -85,7 +85,7 @@
                                },
                                {
                                    "property": "fill",
-                                    "glyph": "\u00E0",
+                                    "glyph": "\ue606",
                                    "control": "color"
                                },
                                {