Merge remote-tracking branch 'origin/master' into open933-c

# Conflicts: # platform/commonUI/edit/res/templates/create/create-menu.html # platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot # platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg # platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf # platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff # platform/commonUI/general/res/sass/_archetypes.scss # platform/commonUI/general/res/sass/_constants.scss # platform/commonUI/general/res/sass/_icons.scss # platform/commonUI/general/res/sass/_main.scss # platform/commonUI/general/res/sass/_mixins.scss # platform/commonUI/general/res/sass/controls/_buttons.scss # platform/commonUI/general/res/templates/controls/time-controller.html # platform/commonUI/themes/snow/res/sass/_constants.scss
nasa · Aug 2, 2016 · 753bd97 · 753bd97
1 parent c699cb8
commit 753bd97
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/platform/commonUI/browse/res/templates/browse/object-header.html b/platform/commonUI/browse/res/templates/browse/object-header.html
@@ -23,7 +23,6 @@
 <span class="l-elem-wrapper l-flex-row flex-elem grows">
     <span ng-if="parameters.mode" class='action flex-elem'>{{parameters.mode}}</span>
     <span class='title-label flex-elem flex-can-shrink'>{{model.name}}</span>
-    <span class="icon-alert t-icon-alert flex-elem">Icon here</span>
     <mct-representation
         key="'menu-arrow'"
         mct-object='domainObject'

diff --git a/platform/commonUI/general/res/sass/_icons.scss b/platform/commonUI/general/res/sass/_icons.scss
@@ -71,17 +71,28 @@
     line-height: inherit;
     position: relative;
     &.l-icon-link {
-        .t-item-icon-glyph {
+        &:after {
+            color: $colorIconLink;
+            content: '\e921'; //$glyph-icon-link;
+            height: auto; width: auto;
+            position: absolute;
+            left: 0; top: 0; right: 0; bottom: 20%;
+            @include transform-origin(bottom left);
+            @include transform(scale(0.3));
+            z-index: 2;
+        }
+
+/*        .t-item-icon-glyph {
             &:after {
                 color: $colorIconLink;
-                content: $glyph-icon-alert-rect;
+                content: '\e921'; //$glyph-icon-link;
                 height: auto; width: auto;
                 position: absolute;
                 left: 0; top: 0; right: 0; bottom: 20%;
                 @include transform-origin(bottom left);
                 @include transform(scale(0.3));
                 z-index: 2;
             }
-        }
+        }*/
     }
 }