Skip to content

Commit 753bd97

Browse files
committed
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
1 parent c699cb8 commit 753bd97

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

platform/commonUI/browse/res/templates/browse/object-header.html

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
<span class="l-elem-wrapper l-flex-row flex-elem grows">
2424
<span ng-if="parameters.mode" class='action flex-elem'>{{parameters.mode}}</span>
2525
<span class='title-label flex-elem flex-can-shrink'>{{model.name}}</span>
26-
<span class="icon-alert t-icon-alert flex-elem">Icon here</span>
2726
<mct-representation
2827
key="'menu-arrow'"
2928
mct-object='domainObject'

platform/commonUI/general/res/sass/_icons.scss

+14-3
Original file line numberDiff line numberDiff line change
@@ -71,17 +71,28 @@
7171
line-height: inherit;
7272
position: relative;
7373
&.l-icon-link {
74-
.t-item-icon-glyph {
74+
&:after {
75+
color: $colorIconLink;
76+
content: '\e921'; //$glyph-icon-link;
77+
height: auto; width: auto;
78+
position: absolute;
79+
left: 0; top: 0; right: 0; bottom: 20%;
80+
@include transform-origin(bottom left);
81+
@include transform(scale(0.3));
82+
z-index: 2;
83+
}
84+
85+
/* .t-item-icon-glyph {
7586
&:after {
7687
color: $colorIconLink;
77-
content: $glyph-icon-alert-rect;
88+
content: '\e921'; //$glyph-icon-link;
7889
height: auto; width: auto;
7990
position: absolute;
8091
left: 0; top: 0; right: 0; bottom: 20%;
8192
@include transform-origin(bottom left);
8293
@include transform(scale(0.3));
8394
z-index: 2;
8495
}
85-
}
96+
}*/
8697
}
8798
}

0 commit comments

Comments
 (0)