[Frontend] Refactoring glyphs to classes

fixes #1047 In-progess, menus and Create menu fixes
nasa · Jun 27, 2016 · 46cae10 · 46cae10
1 parent fe30977
commit 46cae10
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/platform/commonUI/edit/res/templates/create/create-menu.html b/platform/commonUI/edit/res/templates/create/create-menu.html
@@ -25,7 +25,7 @@
             <li ng-repeat="createAction in createActions" ng-click="createAction.perform()">
                 <a ng-mouseover="representation.activeMetadata = createAction.getMetadata()"
                    ng-mouseleave="representation.activeMetadata = undefined"
-                   class="{{ createAction.getMetadata().cssclass }}">
+                   class="menu-item-a {{ createAction.getMetadata().cssclass }}">
                     {{createAction.getMetadata().name}}
                 </a>
             </li>

diff --git a/platform/commonUI/general/res/sass/_icons.scss b/platform/commonUI/general/res/sass/_icons.scss
@@ -68,7 +68,7 @@
 
 .menu .type-icon,
 .tree-item .type-icon,
-.super-menu.menu .type-icon {
+.super-menu.menu .menu-item-a:before {
 	position: absolute;
 }
 

diff --git a/platform/commonUI/general/res/sass/controls/_menus.scss b/platform/commonUI/general/res/sass/controls/_menus.scss
@@ -117,14 +117,13 @@
 .s-menu-btn .menu {
 	pointer-events: auto;
 	ul li {
-		a {
-			// TO-DO: factor this <a> out
+		a.menu-item-a {
             color: $colorMenuFg;
             display: block;
-		}
-        &:before {
-            color: $colorMenuIc;
-			left: $interiorMargin;
+            &:before {
+                color: $colorMenuIc;
+                left: $interiorMargin;
+            }
 		}
 	}
 }