From 14a83e143cf82599e3896fc6dd259e4b0b1164a6 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 24 Jun 2015 13:39:31 -0700 Subject: [PATCH] [Frontend] New symbols font and CSS adjustments WTD-980 WTD-396 Minor sanding and shimming; Updated symbols; Create super-menu now uses key color; Removed unused wtdsymbols-v2* font files; --- .../general/res/css/theme-espresso.css | 152 +++++++++++------- .../res/fonts/symbols/wtdsymbols-v2.eot | Bin 7028 -> 0 bytes .../res/fonts/symbols/wtdsymbols-v2.svg | 55 ------- .../res/fonts/symbols/wtdsymbols-v2.ttf | Bin 6840 -> 0 bytes .../res/fonts/symbols/wtdsymbols-v2.woff | Bin 6916 -> 0 bytes .../general/res/fonts/symbols/wtdsymbols.eot | Bin 9440 -> 9440 bytes .../general/res/fonts/symbols/wtdsymbols.svg | 2 +- .../general/res/fonts/symbols/wtdsymbols.ttf | Bin 9264 -> 9264 bytes .../general/res/fonts/symbols/wtdsymbols.woff | Bin 9340 -> 9340 bytes .../general/res/sass/controls/_buttons.scss | 1 - .../general/res/sass/controls/_menus.scss | 68 ++++---- platform/core/bundle.json | 2 +- 12 files changed, 133 insertions(+), 147 deletions(-) delete mode 100755 platform/commonUI/general/res/fonts/symbols/wtdsymbols-v2.eot delete mode 100755 platform/commonUI/general/res/fonts/symbols/wtdsymbols-v2.svg delete mode 100755 platform/commonUI/general/res/fonts/symbols/wtdsymbols-v2.ttf delete mode 100755 platform/commonUI/general/res/fonts/symbols/wtdsymbols-v2.woff diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 1efef1e56a..1a87bddb4f 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -1364,21 +1364,21 @@ mct-container { content: "+"; font-family: symbolsfont; font-size: 0.8em; } - /* line 46, ../sass/controls/_buttons.scss */ + /* line 45, ../sass/controls/_buttons.scss */ .btn.create-btn .menu, .l-btn.create-btn .menu { margin-left: -7.5px; } - /* line 53, ../sass/controls/_buttons.scss */ + /* line 52, ../sass/controls/_buttons.scss */ .btn.sm, .l-btn.sm { padding: 0 5px; } - /* line 56, ../sass/controls/_buttons.scss */ + /* line 55, ../sass/controls/_buttons.scss */ .btn.vsm, .l-btn.vsm { padding: 0 2.5px; } /*********************************** STYLE STYLES */ -/* line 62, ../sass/controls/_buttons.scss */ +/* line 61, ../sass/controls/_buttons.scss */ .btn, .s-btn, .icon-btn, @@ -1392,7 +1392,7 @@ mct-container { text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; cursor: pointer; text-decoration: none; } - /* line 71, ../sass/controls/_buttons.scss */ + /* line 70, ../sass/controls/_buttons.scss */ .btn.major, .s-btn.major, .major.icon-btn, @@ -1441,7 +1441,7 @@ mct-container { .major.btn-menu.icon-btn .invoke-menu, .major.btn-menu.s-icon-btn .invoke-menu { color: #52d4ff; } - /* line 76, ../sass/controls/_buttons.scss */ + /* line 75, ../sass/controls/_buttons.scss */ .btn.major:hover, .s-btn.major:hover, .major.icon-btn:hover, @@ -1489,13 +1489,13 @@ mct-container { .major.icon-btn:hover.btn-menu .invoke-menu, .major.s-icon-btn:hover.btn-menu .invoke-menu { color: #6bdaff; } - /* line 80, ../sass/controls/_buttons.scss */ + /* line 79, ../sass/controls/_buttons.scss */ .btn.major .invoke-menu, .s-btn.major .invoke-menu, .major.icon-btn .invoke-menu, .major.s-icon-btn .invoke-menu { color: #ccf2ff; } - /* line 84, ../sass/controls/_buttons.scss */ + /* line 83, ../sass/controls/_buttons.scss */ .btn.subtle, .s-btn.subtle, .subtle.icon-btn, @@ -1543,7 +1543,7 @@ mct-container { .subtle.btn-menu.icon-btn .invoke-menu, .subtle.btn-menu.s-icon-btn .invoke-menu { color: #a8a8a8; } - /* line 87, ../sass/controls/_buttons.scss */ + /* line 86, ../sass/controls/_buttons.scss */ .btn.very-subtle, .btn.s-very-subtle, .s-btn.very-subtle, .very-subtle.icon-btn, @@ -1603,7 +1603,7 @@ mct-container { .s-very-subtle.btn-menu.icon-btn .invoke-menu, .s-very-subtle.btn-menu.s-icon-btn .invoke-menu { color: #757575; } - /* line 90, ../sass/controls/_buttons.scss */ + /* line 89, ../sass/controls/_buttons.scss */ .btn.very-subtle.paused, .btn.s-very-subtle.paused, .s-btn.very-subtle.paused, .very-subtle.paused.icon-btn, @@ -1663,7 +1663,7 @@ mct-container { .s-very-subtle.paused.btn-menu.icon-btn .invoke-menu, .s-very-subtle.paused.btn-menu.s-icon-btn .invoke-menu { color: #feb04d; } - /* line 92, ../sass/controls/_buttons.scss */ + /* line 91, ../sass/controls/_buttons.scss */ .btn.very-subtle.paused .icon:before, .btn.s-very-subtle.paused .icon:before, .s-btn.very-subtle.paused .icon:before, .very-subtle.paused.icon-btn .icon:before, @@ -1673,31 +1673,31 @@ mct-container { .s-very-subtle.paused.s-icon-btn .icon:before { content: "\0000EF"; } -/* line 99, ../sass/controls/_buttons.scss */ +/* line 98, ../sass/controls/_buttons.scss */ .icon-btn, .s-icon-btn { font-size: 1em; } - /* line 103, ../sass/controls/_buttons.scss */ + /* line 102, ../sass/controls/_buttons.scss */ .icon-btn .icon, .s-icon-btn .icon { color: #0099cc; } - /* line 107, ../sass/controls/_buttons.scss */ + /* line 106, ../sass/controls/_buttons.scss */ .icon-btn.paused .icon, .s-icon-btn.paused .icon { color: #fff; } - /* line 115, ../sass/controls/_buttons.scss */ + /* line 114, ../sass/controls/_buttons.scss */ .icon-btn:not(.disabled):not(.paused):hover .icon, .s-icon-btn:not(.disabled):not(.paused):hover .icon { color: #33ccff; } - /* line 122, ../sass/controls/_buttons.scss */ + /* line 121, ../sass/controls/_buttons.scss */ .icon-btn.labeled, .s-icon-btn.labeled { padding: 0 3.75px; } - /* line 127, ../sass/controls/_buttons.scss */ + /* line 126, ../sass/controls/_buttons.scss */ .icon-btn.labeled .title-label, .s-icon-btn.labeled .title-label { margin-left: 5px; } - /* line 133, ../sass/controls/_buttons.scss */ + /* line 132, ../sass/controls/_buttons.scss */ .icon-btn.pause-play.paused, .s-icon-btn.pause-play.paused { -moz-animation-name: pulse; @@ -1715,17 +1715,17 @@ mct-container { -moz-animation-timing-function: ease-in-out; -webkit-animation-timing-function: ease-in-out; animation-timing-function: ease-in-out; } - /* line 136, ../sass/controls/_buttons.scss */ + /* line 135, ../sass/controls/_buttons.scss */ .icon-btn.pause-play .icon:before, .s-icon-btn.pause-play .icon:before { content: "\0000F1"; } - /* line 142, ../sass/controls/_buttons.scss */ + /* line 141, ../sass/controls/_buttons.scss */ .icon-btn.show-thumbs .icon:before, .s-icon-btn.show-thumbs .icon:before { content: "\000039"; } /*********************************** LAYOUT STYLES */ -/* line 149, ../sass/controls/_buttons.scss */ +/* line 148, ../sass/controls/_buttons.scss */ span.btn, span.btn span, span.l-btn, @@ -2488,9 +2488,35 @@ label.checkbox.custom { left: 10px; } /* line 68, ../sass/controls/_menus.scss */ .menu-element .super-menu { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwOGViZCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwN2FhMyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #008ebd), color-stop(100%, #007aa3)); + background-image: -moz-linear-gradient(#008ebd, #007aa3); + background-image: -webkit-linear-gradient(#008ebd, #007aa3); + background-image: linear-gradient(#008ebd, #007aa3); + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + -moz-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; + -webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; + box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; + border: none; + border-top: 1px solid #0095c7; + color: #fff; + display: inline-block; + display: block; width: 450px; height: 430px; } - /* line 75, ../sass/controls/_menus.scss */ + /* line 160, ../sass/_mixins.scss */ + .menu-element .super-menu.btn-menu .invoke-menu { + color: #05c1ff; } + /* line 79, ../sass/controls/_menus.scss */ + .menu-element .super-menu .icon { + color: #4dd2ff; } + /* line 84, ../sass/controls/_menus.scss */ .menu-element .super-menu .contents { overflow: hidden; position: absolute; @@ -2500,12 +2526,12 @@ label.checkbox.custom { left: 5px; width: auto; height: auto; } - /* line 78, ../sass/controls/_menus.scss */ + /* line 87, ../sass/controls/_menus.scss */ .menu-element .super-menu .pane { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; } - /* line 80, ../sass/controls/_menus.scss */ + /* line 89, ../sass/controls/_menus.scss */ .menu-element .super-menu .pane.left { border-right: 1px solid rgba(255, 255, 255, 0.2); left: 0; @@ -2514,49 +2540,53 @@ label.checkbox.custom { width: 50%; overflow-x: hidden; overflow-y: auto; } - /* line 90, ../sass/controls/_menus.scss */ + /* line 99, ../sass/controls/_menus.scss */ .menu-element .super-menu .pane.left ul li { -moz-border-radius: 2px; -webkit-border-radius: 2px; border-radius: 2px; - border-top: none; } - /* line 96, ../sass/controls/_menus.scss */ + border-top: none; + color: #fff; } + /* line 106, ../sass/controls/_menus.scss */ .menu-element .super-menu .pane.left ul li:hover { - background: #737373; } - /* line 99, ../sass/controls/_menus.scss */ + background: #0099cc; } + /* line 108, ../sass/controls/_menus.scss */ + .menu-element .super-menu .pane.left ul li:hover .icon { + color: #ccf2ff; } + /* line 112, ../sass/controls/_menus.scss */ .menu-element .super-menu .pane.left ul li .icon { text-shadow: rgba(0, 0, 0, 0.4) 0 1px 2px; left: 5px; } - /* line 106, ../sass/controls/_menus.scss */ + /* line 119, ../sass/controls/_menus.scss */ .menu-element .super-menu .pane.right { left: auto; right: 0; padding: 25px; width: 50%; } - /* line 118, ../sass/controls/_menus.scss */ - .menu-element .menu-item-description .desc-area.icon { - position: relative; - color: #8c8c8c; - font-size: 8em; - left: 0; - height: 150px; - line-height: 150px; - margin-bottom: 25px; - text-align: center; } - /* line 132, ../sass/controls/_menus.scss */ - .menu-element .menu-item-description .desc-area.title { - color: #d9d9d9; - font-size: 1.2em; - margin-bottom: 0.5em; } - /* line 137, ../sass/controls/_menus.scss */ - .menu-element .menu-item-description .desc-area.description { - color: #8c8c8c; - font-size: 0.8em; } - /* line 143, ../sass/controls/_menus.scss */ + /* line 130, ../sass/controls/_menus.scss */ + .menu-element .super-menu .menu-item-description .desc-area.icon { + position: relative; + font-size: 8em; + left: 0; + height: 150px; + line-height: 150px; + margin-bottom: 25px; + text-align: center; } + /* line 141, ../sass/controls/_menus.scss */ + .menu-element .super-menu .menu-item-description .desc-area.title { + color: #fff; + font-size: 1.2em; + margin-bottom: 0.5em; } + /* line 146, ../sass/controls/_menus.scss */ + .menu-element .super-menu .menu-item-description .desc-area.description { + color: #fff; + font-size: 0.8em; + line-height: 1.5em; } + /* line 155, ../sass/controls/_menus.scss */ .menu-element .context-menu { font-size: 0.80rem; pointer-events: auto; } - /* line 149, ../sass/controls/_menus.scss */ + /* line 161, ../sass/controls/_menus.scss */ .menu-element .context-menu.menu { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzkxOTE5MSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzg1ODU4NSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2580,42 +2610,42 @@ label.checkbox.custom { /* line 160, ../sass/_mixins.scss */ .menu-element .context-menu.menu.btn-menu .invoke-menu { color: #b5b5b5; } - /* line 151, ../sass/controls/_menus.scss */ + /* line 163, ../sass/controls/_menus.scss */ .menu-element .context-menu.menu ul li { padding-left: 30px; } - /* line 153, ../sass/controls/_menus.scss */ + /* line 165, ../sass/controls/_menus.scss */ .menu-element .context-menu.menu ul li a { color: white; } - /* line 154, ../sass/controls/_menus.scss */ + /* line 166, ../sass/controls/_menus.scss */ .menu-element .context-menu.menu ul li .icon { color: #1ac6ff; } - /* line 157, ../sass/controls/_menus.scss */ + /* line 169, ../sass/controls/_menus.scss */ .menu-element .context-menu.menu ul li .type-icon { left: 5px; } - /* line 160, ../sass/controls/_menus.scss */ + /* line 172, ../sass/controls/_menus.scss */ .menu-element .context-menu.menu ul li:hover .icon { color: #33ccff; } -/* line 168, ../sass/controls/_menus.scss */ +/* line 180, ../sass/controls/_menus.scss */ .context-menu-holder { pointer-events: none; position: absolute; height: 200px; width: 170px; z-index: 70; } - /* line 174, ../sass/controls/_menus.scss */ + /* line 186, ../sass/controls/_menus.scss */ .context-menu-holder .context-menu-wrapper { position: absolute; height: 100%; width: 100%; } - /* line 181, ../sass/controls/_menus.scss */ + /* line 193, ../sass/controls/_menus.scss */ .context-menu-holder.go-left .context-menu { right: 0; } - /* line 182, ../sass/controls/_menus.scss */ + /* line 194, ../sass/controls/_menus.scss */ .context-menu-holder.go-up .context-menu { bottom: 0; } -/* line 185, ../sass/controls/_menus.scss */ +/* line 197, ../sass/controls/_menus.scss */ .btn-bar.right .menu, .menus-to-left .menu { left: auto; diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols-v2.eot b/platform/commonUI/general/res/fonts/symbols/wtdsymbols-v2.eot deleted file mode 100755 index c96cbe2bd11b3fb74178d69138a2a835b355dff5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7028 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 diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols-v2.svg b/platform/commonUI/general/res/fonts/symbols/wtdsymbols-v2.svg deleted file mode 100755 index 3621cccd4c..0000000000 --- a/platform/commonUI/general/res/fonts/symbols/wtdsymbols-v2.svg +++ /dev/null @@ -1,55 +0,0 @@ - - - -Generated by IcoMoon - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols-v2.ttf b/platform/commonUI/general/res/fonts/symbols/wtdsymbols-v2.ttf deleted file mode 100755 index 2ba029aaa835d5c3ba7674a61bec40cdb9c34b76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6840 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 diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols-v2.woff b/platform/commonUI/general/res/fonts/symbols/wtdsymbols-v2.woff deleted file mode 100755 index c0ce74f7521dadbb5ccddb29856f4661d5477b73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6916 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 M_RD-AWqpb6|4p!=z5oCK diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot index 494fb0268c56ac069e96899e9f036bdd69e5ebf9..7330435376124a7f15d5a09e5b8dea2038a9d15f 100755 GIT binary patch delta 220 zcmaFh`M`664NGE73HL;Y4I*x#t*i_TOaTlGvQIKn6I0mg&pq7C!uUh9o=rraQOwBP zz>difNZT`-nW!^@IA$jLjA}~k27EwqH6?yVHW6_HIUu{?-(+E7Rbf-%qRt}5Tp+C~ zEc|aWkOLP5DgcXu6dXX}z%(-Ef>cA5@PG_~nYX!JJe5<1yCfztp5Nvx12+o;2wdE7 N)Br|r=1{!B3;@SLI$i(( delta 220 zcmaFh`M`664NJUrr|(3E4I--EnM)WLm;x9WWS?ZDCZ@2}R~_EW!uUh9UQC3akxfaR z(SVQ1kWERSQO(4h(Lj&MP|d`i(acDk(ZG($(9B4lQA~s#q=e}Jqpq-Us<5f>zsqrj zaX>m%SeQ{4!~}~%m|#($7~_F|m+>k2cbNyS6Uf-yE}qIM|m4Tau0R%2? On5_t-H*+Z7U - + diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf index 27940e95269d595e00db2af433324314ee20a402..ac7134fd4a43d43a0eab644a31df10680d71f458 100755 GIT binary patch delta 211 zcmdnsvB6`4gNR#bD=Py7Qvd^l?30Yt#1yvra}PI${1B~Y6Om^WGcq@@V=@HN_KapG z>WmW%6JZA_VLHI5D=eHUY%2Wka$I2?kWLjAX4C~S z!J-f*SQIG6c;MegBb|3)t`H~aRP@}J)4L;qnMGofgO_}khW(u zGf`&*am-Bg8P$~74fufKYD)Z!Y$DAxj diff --git a/platform/commonUI/general/res/sass/controls/_buttons.scss b/platform/commonUI/general/res/sass/controls/_buttons.scss index c2f82c382f..9ea16036d3 100644 --- a/platform/commonUI/general/res/sass/controls/_buttons.scss +++ b/platform/commonUI/general/res/sass/controls/_buttons.scss @@ -41,7 +41,6 @@ $pad: $interiorMargin * $baseRatio; content:"+"; font-family: symbolsfont; font-size: 0.8em; - //margin-right: $interiorMarginSm; } .menu { margin-left: $pad * -1; diff --git a/platform/commonUI/general/res/sass/controls/_menus.scss b/platform/commonUI/general/res/sass/controls/_menus.scss index 362884c13b..46b67dd6ef 100644 --- a/platform/commonUI/general/res/sass/controls/_menus.scss +++ b/platform/commonUI/general/res/sass/controls/_menus.scss @@ -70,6 +70,15 @@ $h: $w - 20; $plw: 50%; //$w * 0.5; $prw: 50%; //$w - $plw; + $bg: $colorKey; + $fg: $colorKeyFg; + $colorMid: lighten($bg, 25%); + $bgHover: $bg; + @include containerSubtle(darken($bg, 15%), $fg); + display: block; + .icon { + color: $colorMid; + } width: $w; height: $h; .contents { @@ -91,10 +100,14 @@ @include border-radius($controlCr); // @include test(red); border-top: none; + color: $fg; // font-size: 0.85em; // line-height: 20px; &:hover { background: $bgHover; + .icon { + color: lighten($bg, 50%); + } } .icon { @include txtShdwSubtle(0.4); @@ -111,34 +124,33 @@ width: $prw; } } - } - .menu-item-description { - .desc-area { -// @include test(green); - &.icon { - //@include test(red); - $h: 150px; - position: relative; - color: lighten($bg, 30%); - font-size: 8em; - left: 0; - height: $h; - line-height: $h; - margin-bottom: $interiorMargin * 5; -// top: 0; right: 0; bottom: 5em; left: 0; -// height: 5em; - text-align: center; - } - &.title { - color: lighten($bg, 60%); - font-size: 1.2em; - margin-bottom: 0.5em; - } - &.description { - color: lighten($bg, 30%); - font-size: 0.8em; - } - } + .menu-item-description { + .desc-area { + // @include test(green); + &.icon { + //@include test(red); + $h: 150px; + position: relative; + font-size: 8em; + left: 0; + height: $h; + line-height: $h; + margin-bottom: $interiorMargin * 5; + text-align: center; + } + &.title { + color: $fg; + font-size: 1.2em; + margin-bottom: 0.5em; + } + &.description { + //color: lighten($bg, 30%); + color: $fg; + font-size: 0.8em; + line-height: 1.5em; + } + } + } } .context-menu { $bg: lighten($colorBodyBg, 25%); diff --git a/platform/core/bundle.json b/platform/core/bundle.json index 245fc3df72..fef89bd80d 100644 --- a/platform/core/bundle.json +++ b/platform/core/bundle.json @@ -130,7 +130,7 @@ "name": "Folder", "glyph": "F", "features": "creation", - "description": "A folder, useful for storing and organizing domain objects.", + "description": "Useful for storing and organizing domain objects.", "model": { "composition": [] } } ],