Commit dc670b2 1 parent 8b29ccf commit dc670b2 Copy full SHA for dc670b2
File tree 8 files changed +39
-23
lines changed
forms/res/templates/controls
8 files changed +39
-23
lines changed Original file line number Diff line number Diff line change @@ -218,15 +218,14 @@ define([
218
218
"$window"
219
219
] ,
220
220
"group" : "windowing" ,
221
- "glyph " : "y " ,
221
+ "cssclass " : "icon-new-window " ,
222
222
"priority" : "preferred"
223
223
} ,
224
224
{
225
225
"key" : "fullscreen" ,
226
226
"implementation" : FullscreenAction ,
227
227
"category" : "view-control" ,
228
228
"group" : "windowing" ,
229
- "glyph" : "z" ,
230
229
"priority" : "default"
231
230
}
232
231
] ,
Original file line number Diff line number Diff line change @@ -51,7 +51,8 @@ define(
51
51
// based on whether or not we are currently
52
52
// full screen.
53
53
var metadata = Object . create ( FullscreenAction ) ;
54
- metadata . glyph = screenfull . isFullscreen ? "_" : "z" ;
54
+ //metadata.glyph = screenfull.isFullscreen ? "_" : "z";
55
+ metadata . cssclass = screenfull . isFullscreen ? "icon-fullscreen-expand" : "icon-fullscreen-collapse" ;
55
56
metadata . description = screenfull . isFullscreen ?
56
57
EXIT_FULLSCREEN : ENTER_FULLSCREEN ;
57
58
metadata . group = "windowing" ;
Original file line number Diff line number Diff line change @@ -172,7 +172,8 @@ define([
172
172
] ,
173
173
"description" : "Edit" ,
174
174
"category" : "view-control" ,
175
- "glyph" : "p"
175
+ "glyph" : "p" ,
176
+ "cssclass" : "icon-pencil"
176
177
} ,
177
178
{
178
179
"key" : "properties" ,
@@ -182,6 +183,7 @@ define([
182
183
] ,
183
184
"implementation" : PropertiesAction ,
184
185
"glyph" : "p" ,
186
+ "cssclass" : "icon-pencil" ,
185
187
"name" : "Edit Properties..." ,
186
188
"description" : "Edit properties of this object." ,
187
189
"depends" : [
Original file line number Diff line number Diff line change 1
1
@mixin glyph ($unicode ) {
2
- & :before { content : $unicode ; }
2
+ & :before {
3
+ content : $unicode ;
4
+ }
5
+ }
6
+
7
+ [class *= " icon-" ] {
8
+ @extend .ui-symbol ;
3
9
}
4
10
5
11
.ui-symbol ,
8
14
& .context-available { @include glyph (' \e902 ' ); }
9
15
}
10
16
17
+ .icon-pencil { @include glyph (' \e1024 ' ); }
18
+ .icon-new-window { @include glyph (' \e1021 ' ); }
19
+ .icon-fullscreen-collapse { @include glyph (' \e1012 ' ); }
20
+ .icon-fullscreen-expand { @include glyph (' \e1013 ' ); }
21
+
11
22
/* ************************************** MENUS */
12
23
.icon-menu ul li {
13
24
& .i-layers-move-to-top { @include glyph (' \e905 ' ); }
Original file line number Diff line number Diff line change 33
33
& .type-icon {
34
34
color : $colorObjHdrIc ;
35
35
}
36
- & .icon {
37
- color : $colorKey ;
38
- font-size : inherit ;
39
- & .alert {
40
- color : $colorAlert ;
41
- & :hover {
42
- color : lighten ($colorAlert , $ltGamma );
43
- }
44
- }
45
- & .major {
46
- font-size : 1.65em ;
47
- }
48
- }
49
36
& .icon-calendar :after {
50
37
content : " \e605 " ;
51
38
}
52
39
}
53
40
41
+ [class ^= " i-" ],
42
+ .ui-symbol.icon {
43
+ color : $colorKey ;
44
+ font-size : inherit ;
45
+ & .alert {
46
+ color : $colorAlert ;
47
+ & :hover {
48
+ color : lighten ($colorAlert , $ltGamma );
49
+ }
50
+ }
51
+ & .major {
52
+ font-size : 1.65em ;
53
+ }
54
+ }
55
+
54
56
.bar .ui-symbol {
55
57
display : inline-block ;
56
58
}
Original file line number Diff line number Diff line change @@ -121,6 +121,7 @@ $pad: $interiorMargin * $baseRatio;
121
121
@extend .ui-symbol ;
122
122
content : ' \e901 ' ;
123
123
color : $colorKey ;
124
+ margin-right : $interiorMargin ;
124
125
}
125
126
& :hover :before {
126
127
color : pullForward ($c , 10% );
Original file line number Diff line number Diff line change 19
19
this source code distribution or the Licensing information page available
20
20
at runtime from the About dialog for additional information.
21
21
-->
22
- < a class ="s-btn key-{{parameters.action.getMetadata().key}} "
22
+ < a class ="s-btn key-{{parameters.action.getMetadata().key}} {{parameters.action.getMetadata().cssclass}} "
23
23
ng-class ="{ labeled: parameters.labeled } "
24
24
title ="{{parameters.action.getMetadata().description}} "
25
25
ng-click ="parameters.action.perform() ">
26
- < span class ="ui-symbol icon ">
26
+ <!-- span class="ui-symbol icon">
27
27
{{parameters.action.getMetadata().glyph}}
28
- </ span >
28
+ </span-- >
29
29
< span class ="title-label " ng-if ="parameters.labeled ">
30
30
{{parameters.action.getMetadata().name}}
31
31
</ span >
Original file line number Diff line number Diff line change 22
22
< a class ="s-btn "
23
23
ng-class ="{ labeled: structure.text, structure.cssclass } "
24
24
ng-click ="structure.click() ">
25
- < span class ="ui-symbol icon ">
25
+ <!-- span class="ui-symbol icon">
26
26
{{structure.glyph}}
27
- </ span >
27
+ </span-- >
28
28
< span class ="title-label " ng-if ="structure.text ">
29
29
{{structure.text}}
30
30
</ span >
You can’t perform that action at this time.
0 commit comments