From 29b91193fb6577b8cbf65b3c236015f6f84036b8 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 30 Jun 2015 08:50:06 -0700 Subject: [PATCH 01/15] [Frontend] New ? icon in symbols font WTD-1404 WTD-1402 --- .../symbols/iconmoon.io-WTD-Symbols-v2.0.json | 208 ++++++++++-------- .../general/res/fonts/symbols/wtdsymbols.eot | Bin 9860 -> 10120 bytes .../general/res/fonts/symbols/wtdsymbols.svg | 1 + .../general/res/fonts/symbols/wtdsymbols.ttf | Bin 9684 -> 9944 bytes .../general/res/fonts/symbols/wtdsymbols.woff | Bin 9760 -> 10020 bytes 5 files changed, 116 insertions(+), 93 deletions(-) diff --git a/platform/commonUI/general/res/fonts/symbols/iconmoon.io-WTD-Symbols-v2.0.json b/platform/commonUI/general/res/fonts/symbols/iconmoon.io-WTD-Symbols-v2.0.json index 45b1da9c33..d2486a1eec 100644 --- a/platform/commonUI/general/res/fonts/symbols/iconmoon.io-WTD-Symbols-v2.0.json +++ b/platform/commonUI/general/res/fonts/symbols/iconmoon.io-WTD-Symbols-v2.0.json @@ -10,7 +10,7 @@ { "order": 1, "id": 75, - "prevSize": 32, + "prevSize": 16, "code": 123, "name": "icon-pointer-left", "tempChar": "" @@ -18,7 +18,7 @@ { "order": 3, "id": 74, - "prevSize": 32, + "prevSize": 16, "code": 125, "name": "icon-pointer-right", "tempChar": "" @@ -26,7 +26,7 @@ { "order": 4, "id": 73, - "prevSize": 32, + "prevSize": 16, "code": 80, "name": "icon-person", "tempChar": "" @@ -34,7 +34,7 @@ { "order": 5, "id": 72, - "prevSize": 32, + "prevSize": 16, "code": 232, "name": "icon-chain-links", "tempChar": "" @@ -42,7 +42,7 @@ { "order": 6, "id": 71, - "prevSize": 32, + "prevSize": 16, "code": 115, "name": "icon-database-in-brackets", "tempChar": "" @@ -50,7 +50,7 @@ { "order": 7, "id": 70, - "prevSize": 32, + "prevSize": 16, "code": 114, "name": "icon-refresh", "tempChar": "" @@ -58,7 +58,7 @@ { "order": 8, "id": 69, - "prevSize": 32, + "prevSize": 16, "code": 108, "name": "icon-lock", "tempChar": "" @@ -66,7 +66,7 @@ { "order": 9, "id": 68, - "prevSize": 32, + "prevSize": 16, "code": 51, "name": "icon-box-with-dashed-lines", "tempChar": "" @@ -74,7 +74,7 @@ { "order": 10, "id": 67, - "prevSize": 32, + "prevSize": 16, "code": 58880, "name": "icon-box-with-arrow-cursor", "tempChar": "" @@ -82,7 +82,7 @@ { "order": 11, "id": 66, - "prevSize": 32, + "prevSize": 16, "code": 65, "name": "icon-activity-mode", "tempChar": "" @@ -90,7 +90,7 @@ { "order": 12, "id": 65, - "prevSize": 32, + "prevSize": 16, "code": 97, "name": "icon-activity", "tempChar": "" @@ -98,7 +98,7 @@ { "order": 13, "id": 64, - "prevSize": 32, + "prevSize": 16, "code": 33, "name": "icon-alert-rect", "tempChar": "" @@ -106,7 +106,7 @@ { "order": 14, "id": 63, - "prevSize": 32, + "prevSize": 16, "code": 58883, "name": "icon-alert-triangle", "tempChar": "" @@ -114,7 +114,7 @@ { "order": 15, "id": 62, - "prevSize": 32, + "prevSize": 16, "code": 238, "name": "icon-arrow-double-down", "tempChar": "" @@ -122,7 +122,7 @@ { "order": 16, "id": 61, - "prevSize": 32, + "prevSize": 16, "code": 235, "name": "icon-arrow-double-up", "tempChar": "" @@ -130,7 +130,7 @@ { "order": 2, "id": 60, - "prevSize": 32, + "prevSize": 16, "code": 118, "name": "icon-arrow-down", "tempChar": "" @@ -138,7 +138,7 @@ { "order": 19, "id": 59, - "prevSize": 32, + "prevSize": 16, "code": 60, "name": "icon-arrow-left", "tempChar": "" @@ -146,7 +146,7 @@ { "order": 20, "id": 58, - "prevSize": 32, + "prevSize": 16, "code": 62, "name": "icon-arrow-right", "tempChar": "" @@ -154,7 +154,7 @@ { "order": 21, "id": 57, - "prevSize": 32, + "prevSize": 16, "code": 236, "name": "icon-arrow-tall-down", "tempChar": "" @@ -162,7 +162,7 @@ { "order": 22, "id": 56, - "prevSize": 32, + "prevSize": 16, "code": 237, "name": "icon-arrow-tall-up", "tempChar": "" @@ -170,7 +170,7 @@ { "order": 23, "id": 55, - "prevSize": 32, + "prevSize": 16, "code": 94, "name": "icon-arrow-up", "tempChar": "" @@ -178,7 +178,7 @@ { "order": 24, "id": 54, - "prevSize": 32, + "prevSize": 16, "code": 73, "name": "icon-arrows-out", "tempChar": "" @@ -186,7 +186,7 @@ { "order": 25, "id": 53, - "prevSize": 32, + "prevSize": 16, "code": 58893, "name": "icon-arrows-right-left", "tempChar": "" @@ -194,7 +194,7 @@ { "order": 33, "id": 52, - "prevSize": 32, + "prevSize": 16, "code": 53, "name": "icon-arrows-up-down", "tempChar": "" @@ -202,7 +202,7 @@ { "order": 26, "id": 51, - "prevSize": 32, + "prevSize": 16, "code": 42, "name": "icon-asterisk", "tempChar": "" @@ -210,7 +210,7 @@ { "order": 27, "id": 50, - "prevSize": 32, + "prevSize": 16, "code": 72, "name": "icon-autoflow-tabular", "tempChar": "" @@ -218,7 +218,7 @@ { "order": 28, "id": 49, - "prevSize": 32, + "prevSize": 16, "code": 224, "name": "icon-box-round-corners", "tempChar": "" @@ -226,7 +226,7 @@ { "order": 29, "id": 48, - "prevSize": 32, + "prevSize": 16, "code": 50, "name": "icon-check", "tempChar": "" @@ -234,7 +234,7 @@ { "order": 30, "id": 47, - "prevSize": 32, + "prevSize": 16, "code": 67, "name": "icon-clock", "tempChar": "" @@ -242,7 +242,7 @@ { "order": 31, "id": 46, - "prevSize": 32, + "prevSize": 16, "code": 46, "name": "icon-connectivity", "tempChar": "" @@ -250,7 +250,7 @@ { "order": 32, "id": 45, - "prevSize": 32, + "prevSize": 16, "code": 100, "name": "icon-database-query", "tempChar": "" @@ -258,7 +258,7 @@ { "order": 17, "id": 44, - "prevSize": 32, + "prevSize": 16, "code": 68, "name": "icon-database", "tempChar": "" @@ -266,7 +266,7 @@ { "order": 35, "id": 43, - "prevSize": 32, + "prevSize": 16, "code": 81, "name": "icon-dictionary", "tempChar": "" @@ -274,7 +274,7 @@ { "order": 36, "id": 42, - "prevSize": 32, + "prevSize": 16, "code": 242, "name": "icon-duplicate", "tempChar": "" @@ -282,7 +282,7 @@ { "order": 37, "id": 41, - "prevSize": 32, + "prevSize": 16, "code": 102, "name": "icon-folder-new", "tempChar": "" @@ -290,7 +290,7 @@ { "order": 38, "id": 40, - "prevSize": 32, + "prevSize": 16, "code": 70, "name": "icon-folder", "tempChar": "" @@ -298,7 +298,7 @@ { "order": 39, "id": 39, - "prevSize": 32, + "prevSize": 16, "code": 95, "name": "icon-fullscreen-collapse", "tempChar": "" @@ -306,7 +306,7 @@ { "order": 40, "id": 38, - "prevSize": 32, + "prevSize": 16, "code": 122, "name": "icon-fullscreen-expand", "tempChar": "" @@ -314,7 +314,7 @@ { "order": 41, "id": 37, - "prevSize": 32, + "prevSize": 16, "code": 71, "name": "icon-gear", "tempChar": "" @@ -322,7 +322,7 @@ { "order": 49, "id": 34, - "prevSize": 32, + "prevSize": 16, "code": 227, "name": "icon-image", "tempChar": "" @@ -330,7 +330,7 @@ { "order": 42, "id": 33, - "prevSize": 32, + "prevSize": 16, "code": 225, "name": "icon-layers", "tempChar": "" @@ -338,7 +338,7 @@ { "order": 43, "id": 32, - "prevSize": 32, + "prevSize": 16, "code": 76, "name": "icon-layout", "tempChar": "" @@ -346,7 +346,7 @@ { "order": 44, "id": 31, - "prevSize": 32, + "prevSize": 16, "code": 226, "name": "icon-line-horz", "tempChar": "" @@ -354,7 +354,7 @@ { "order": 45, "id": 30, - "prevSize": 32, + "prevSize": 16, "code": 244, "name": "icon-link", "tempChar": "" @@ -362,7 +362,7 @@ { "order": 46, "id": 29, - "prevSize": 32, + "prevSize": 16, "code": 88, "name": "icon-magnify-in", "tempChar": "" @@ -370,7 +370,7 @@ { "order": 47, "id": 28, - "prevSize": 32, + "prevSize": 16, "code": 89, "name": "icon-magnify-out", "tempChar": "" @@ -378,7 +378,7 @@ { "order": 48, "id": 27, - "prevSize": 32, + "prevSize": 16, "code": 77, "name": "icon-magnify", "tempChar": "" @@ -386,7 +386,7 @@ { "order": 34, "id": 26, - "prevSize": 32, + "prevSize": 16, "code": 109, "name": "icon-menu", "tempChar": "" @@ -394,7 +394,7 @@ { "order": 50, "id": 25, - "prevSize": 32, + "prevSize": 16, "code": 243, "name": "icon-move", "tempChar": "" @@ -402,7 +402,7 @@ { "order": 51, "id": 24, - "prevSize": 32, + "prevSize": 16, "code": 121, "name": "icon-new-window", "tempChar": "" @@ -410,178 +410,186 @@ { "order": 52, "id": 23, - "prevSize": 32, + "prevSize": 16, "code": 111, "name": "icon-object", "tempChar": "" }, + { + "order": 73, + "id": 77, + "prevSize": 16, + "code": 63, + "name": "icon-object-unknown", + "tempChar": "" + }, { "order": 53, "id": 22, - "prevSize": 32, + "prevSize": 16, "code": 86, "name": "icon-packet", - "tempChar": "" + "tempChar": "" }, { "order": 54, "id": 21, - "prevSize": 32, + "prevSize": 16, "code": 234, "name": "icon-page", - "tempChar": "" + "tempChar": "" }, { "order": 55, "id": 20, - "prevSize": 32, + "prevSize": 16, "code": 241, "name": "icon-pause", - "tempChar": "" + "tempChar": "" }, { "order": 56, "id": 19, - "prevSize": 32, + "prevSize": 16, "code": 112, "name": "icon-pencil", - "tempChar": "" + "tempChar": "" }, { "order": 65, "id": 18, - "prevSize": 32, + "prevSize": 16, "code": 79, "name": "icon-people", - "tempChar": "" + "tempChar": "" }, { "order": 57, "id": 17, - "prevSize": 32, + "prevSize": 16, "code": 239, "name": "icon-play", - "tempChar": "" + "tempChar": "" }, { "order": 58, "id": 16, - "prevSize": 32, + "prevSize": 16, "code": 233, "name": "icon-plot-resource", - "tempChar": "" + "tempChar": "" }, { "order": 59, "id": 15, - "prevSize": 32, + "prevSize": 16, "code": 43, "name": "icon-plus", - "tempChar": "" + "tempChar": "" }, { "order": 60, "id": 76, - "prevSize": 32, + "prevSize": 16, "code": 45, "name": "icon-minus", - "tempChar": "" + "tempChar": "" }, { "order": 61, "id": 11, - "prevSize": 32, + "prevSize": 16, "code": 54, "name": "icon-sine", - "tempChar": "" + "tempChar": "" }, { "order": 62, "id": 10, - "prevSize": 32, + "prevSize": 16, "code": 228, "name": "icon-T", - "tempChar": "" + "tempChar": "" }, { "order": 63, "id": 9, - "prevSize": 32, + "prevSize": 16, "code": 116, "name": "icon-telemetry-panel", - "tempChar": "" + "tempChar": "" }, { "order": 64, "id": 8, - "prevSize": 32, + "prevSize": 16, "code": 84, "name": "icon-telemetry", - "tempChar": "" + "tempChar": "" }, { "order": 18, "id": 7, - "prevSize": 32, + "prevSize": 16, "code": 246, "name": "icon-thumbs-strip", - "tempChar": "" + "tempChar": "" }, { "order": 67, "id": 6, - "prevSize": 32, + "prevSize": 16, "code": 83, "name": "icon-timeline", - "tempChar": "" + "tempChar": "" }, { "order": 68, "id": 5, - "prevSize": 32, + "prevSize": 16, "code": 245, "name": "icon-timer", - "tempChar": "" + "tempChar": "" }, { "order": 69, "id": 4, - "prevSize": 32, + "prevSize": 16, "code": 90, "name": "icon-trash", - "tempChar": "" + "tempChar": "" }, { "order": 70, "id": 3, - "prevSize": 32, + "prevSize": 16, "code": 229, "name": "icon-two-parts-both", - "tempChar": "" + "tempChar": "" }, { "order": 71, "id": 2, - "prevSize": 32, + "prevSize": 16, "code": 231, "name": "icon-two-parts-one-only", - "tempChar": "" + "tempChar": "" }, { "order": 72, "id": 1, - "prevSize": 32, + "prevSize": 16, "code": 120, "name": "icon-x-heavy", - "tempChar": "" + "tempChar": "" }, { "order": 66, "id": 0, - "prevSize": 32, + "prevSize": 16, "code": 58946, "name": "icon-x", - "tempChar": "" + "tempChar": "" } ], "id": 2, @@ -1410,6 +1418,20 @@ "icon-object" ] }, + { + "id": 77, + "paths": [ + "M510-2l-512 320v384l512 320 512-320v-384l-512-320zM585.4 859.2c-21.2 20.8-46 30.8-76 30.8-31.2 0-56.2-9.8-76.2-29.6-20-20-29.6-44.8-29.6-76.2 0-30.4 10.2-55.2 31-76.2s45.2-31.2 74.8-31.2c29.6 0 54.2 10.4 75.6 32s31.8 46.4 31.8 76c-0.2 29-10.8 54-31.4 74.4zM638.2 546.6c-23.6 11.8-37.4 22-43.4 32.4-3.6 6.2-6 14.8-7.4 26.8v41h-161.4v-44.2c0-40.2 4.4-69.8 13-88 8-17.2 22.6-30.2 44.8-40l34.8-15.4c32-14.2 48.2-35.2 48.2-62.8 0-16-6-30.4-17.2-41.8-11.2-11.2-25.6-17.2-41.6-17.2-24 0-54.4 10-62.8 57.4l-2.2 12.2h-147l1.4-16.2c4-44.6 17-82.4 38.8-112.2 19.6-27 45.6-48.6 77-64.6s64.6-24 98.2-24c60.6 0 110.2 19.4 151.4 59.6 41.2 40 61.2 88 61.2 147.2 0 70.8-28.8 121.4-85.8 149.8z" + ], + "attrs": [ + {} + ], + "isMulticolor": false, + "grid": 0, + "tags": [ + "icon-object-unknown" + ] + }, { "id": 22, "paths": [ diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot index a341f741c908067f4310726966890594b5ee507f..de50409f28dffd2e389abbe738db0f274fa11031 100755 GIT binary patch delta 703 zcmYL{Pe>F|9LL|AnVtVLZ`Rz|X|dg9XJ;hbgwkC-#O@M7g^2bC6M||@*M&3}l(N%$ z@UVEuWTHBh6hQ}x5Dc@rY!+qq4?!X?Vj&%Bg$@Z4F|W5s^xp6Bd*9#Z_xm0mZ?v`8 z#ujS<_-s$G31(%(nwm&Y6gEGt0RU^rIoO*S%mV;40I0Jh^SynSvz=|{$q1DLAl#Yj z$#k>hRVM+6ln77cNP#OcD$!d+M|1r{!!}2gyIJvT>>D_jY3fOJ5Y$fit^Uk#9-IP~ zh%OTyzL4qfF+$55rvb2JGBA}N7#spLLBO7Ka_}}xIV?3E|A;@}_xLSd#BcBdevMz^ z7x+0Y;b-_MeuC%lV?2vb;N$pM;7H(5AQ=#e2XvOGw6jKWGhVvL6lm5w`@>a0I6R+|v+QmQis+#L3om3&Cby<2{P7I~Iy5N;Rj6VV~^d1woI> zTBKR`g=JaZ6$&2S6K~OHZg5`$HB;8c${DnO6G%+ujlt4f_Q${MT#GcpR_9$L$zqpa z%SoFJPRd*@l&Ifyg1$)4G6r*i$uifOvM24yd+vD3Y?d8ke{${IP3}Io&Wn5(Kh1v^ zL?I@02@l19cvYMf%TiS8l7^)#(gSHxT9*yEQSO$x%mJ9 delta 451 zcmeD1Z}DYoQDb1ZqB@byjKwgeI)0+V#QNvgt}rk#$^fxTdSY<_0|SEq0|Qe6kmg9w zsZ8toa6%Z!&tPDXkH|<(OkwL4i)LU@JOGq8%K!?nA7J4H@_zvNDjB&Y6-sQ(zZe*l zK;{|bTUX{!e?Fev)~q5B%T%f7kz=|9AY~ z{(sy5t^b4n2mKF}@{n?qvX$Zln!z~vB9p`92Tbgn1(`coHqYd^FC`OSonjczZ}XLb zn+0SC!^Q0xZ(;Q0Daz)IK9kQV+im7k5oWBfV%o;^joFNO2J<22XDnhYIV=ZQKCmjV z=CD3v<6 + diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf index e56f67ce32b7029747b46962a71a4e634f6bc831..d3ce41072429cbcdf867c2667e161b02447f7600 100755 GIT binary patch delta 686 zcmYL{Ur19?9LIm>-n;w%-g7l~w}x$V*EAJ$&yN>{j_NYi;WL@RK7VLw^*Dg7 z(t(-$(C`Sb6hX9jv3M1AIB7H$e?wlASL7vGBrnJUc}|{^C*(0Hkw@eqc|eNfKDkGZ zki+CqV1Hn5AQ6zM1#;?`q_dq7<}%C#S73=t=2@4W2OdIj5I{mzG|(m;S&?W%6Ng8`oyFXWEkXSzFh6J*cPk3H`4A3#aioUck#n3=sW! L&^hG4d}ZKf0a?LtaeKyF7(Mxkk~yQ# zWEo|<&2h@YjP+Ga+nByFn=#K|KE(WtMT{kf&6?xo5Wke+r~SO_ZlAup9xaQ{xv`cF)}dlF!(T(G5`Y>2$+Cg5#G$N HdXfnzwfyb$8s|?h#&6>FE)2N`w_=_74++;!MwjG%u92r}M!F z@gb9i=pn-XK8S^&sMX75QKnP`67>=m(nD$VkRTyD&1%taejh*P`@Z?j3^T)r?;g>+ z>uYKN1SFynAUW0i04VDsr4Pl7-0J(q)>LN}0BV#d{9kCTZI{!8n*bo#=%BIwd^FRN zY6c)I6HmDVcCheNhLD8YPv#K^T%J)g?Oi>D%K!k&9GD!v*4A;3_#!umX9E>2RSoT_ zo@@*NBSFaE22O+S3#s-N!jVnkh=ahw%9(6OXBRm=GqipWR#~^)B zRwk5Wu}x&dS`3A)`OuGCp88Ff)0gN;#>?zu(#$nx*;Vbzx`tiLY?>Wle{x5;>)d^A zi5K}MevJPnh(b(g5*~^^@v3-JT$UnIlhh+!kw&FCX-W3VWpcATpd^$&WlVXYEGS=; iHI-HUYJ=LZPN=_71L{Mw=#v%$2Byh{OkxvtRO_E#yON$*T)@DmS~v-OHaX8;9(VlF_w3J9|wVByWkEvW#C zWiT)>8i2488}qN6{A8dyWwe{Th_T=F-2b!x&-_32|K$G@|BwGa_W$tzL;nx_-~WHt z|DFGL{NMh6+yAZqgZ~Hp50vtda+9)^;$&cEU<7*EW^w})_vW=s9W0woIqplz#8;;n z#`D{JW#DE3I)H)U;`WTUFnY3qvN@yAT}~z;=OMf?bV0g}saY5r+Xs7DpGy8jeStdYrSk1i0k5 za=4aoJ>vSo&Bv|7?ZutKJ%f7-_Y)p2o*ld_yav2(ydk_vycN7{yz_Xk@p15(@Rjgg Z<7eUb;E&@6#SSnMnHYRF+o?Wd1OS!iiyZ&} From 8ee28c39183c9c8a04151d56b7f1473d1301689f Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 30 Jun 2015 09:00:06 -0700 Subject: [PATCH 02/15] [Frontend] Removed z-index on hover WTD-1404 WTD-1383 --- .../general/res/css/theme-espresso.css | 49 +++++++++++-------- .../general/res/sass/edit/_editor.scss | 2 +- .../general/res/sass/user-environ/_frame.scss | 2 +- 3 files changed, 31 insertions(+), 22 deletions(-) diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 49c5675a07..18a856288c 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -92,7 +92,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 5, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 5, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -113,38 +113,38 @@ time, mark, audio, video { font-size: 100%; vertical-align: baseline; } -/* line 22, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 22, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html { line-height: 1; } -/* line 24, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 24, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ ol, ul { list-style: none; } -/* line 26, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 26, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ table { border-collapse: collapse; border-spacing: 0; } -/* line 28, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 28, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; } -/* line 30, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 30, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q, blockquote { quotes: none; } - /* line 103, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ + /* line 103, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; } -/* line 32, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 32, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ a img { border: none; } -/* line 116, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 116, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } @@ -1256,26 +1256,37 @@ mct-container { .tabular tr td, .tabular tr .td, .tabular .tr td, .tabular .tr .td { border-top: 1px solid rgba(255, 255, 255, 0.1); min-width: 110px; + color: #fff; padding: 2px 5px; vertical-align: top; } - /* line 107, ../sass/lists/_tabular.scss */ + /* line 108, ../sass/lists/_tabular.scss */ .tabular tr td.numeric, .tabular tr .td.numeric, .tabular .tr td.numeric, .tabular .tr .td.numeric { text-align: right; } - /* line 113, ../sass/lists/_tabular.scss */ + /* line 111, ../sass/lists/_tabular.scss */ + .tabular tr td.s-cell-type-value, .tabular tr .td.s-cell-type-value, .tabular .tr td.s-cell-type-value, .tabular .tr .td.s-cell-type-value { + text-align: right; } + /* line 113, ../sass/lists/_tabular.scss */ + .tabular tr td.s-cell-type-value .l-cell-contents, .tabular tr .td.s-cell-type-value .l-cell-contents, .tabular .tr td.s-cell-type-value .l-cell-contents, .tabular .tr .td.s-cell-type-value .l-cell-contents { + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + padding-left: 5px; + padding-right: 5px; } + /* line 122, ../sass/lists/_tabular.scss */ .tabular.filterable tbody, .tabular.filterable .tbody { top: 36px; } - /* line 118, ../sass/lists/_tabular.scss */ + /* line 127, ../sass/lists/_tabular.scss */ .tabular.fixed-header { height: 100%; } - /* line 120, ../sass/lists/_tabular.scss */ + /* line 129, ../sass/lists/_tabular.scss */ .tabular.fixed-header thead, .tabular.fixed-header .thead, .tabular.fixed-header tbody tr, .tabular.fixed-header .tbody .tr { display: table; table-layout: fixed; } - /* line 125, ../sass/lists/_tabular.scss */ + /* line 134, ../sass/lists/_tabular.scss */ .tabular.fixed-header thead, .tabular.fixed-header .thead { width: calc(100% - 10px); } - /* line 128, ../sass/lists/_tabular.scss */ + /* line 137, ../sass/lists/_tabular.scss */ .tabular.fixed-header tbody, .tabular.fixed-header .tbody { overflow: hidden; position: absolute; @@ -1288,7 +1299,7 @@ mct-container { top: 18px; display: block; overflow-y: scroll; } - /* line 136, ../sass/lists/_tabular.scss */ + /* line 145, ../sass/lists/_tabular.scss */ .tabular.t-event-messages td, .tabular.t-event-messages .td { min-width: 150px; } @@ -2852,8 +2863,7 @@ label.checkbox.custom { -moz-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; - border-color: #0099cc; - z-index: 2; } + border-color: #0099cc; } /* line 93, ../sass/edit/_editor.scss */ .edit-main .frame.child-frame.panel:hover .view-switcher { opacity: 1; } @@ -4105,8 +4115,7 @@ input[type="text"] { border: 1px solid #4d4d4d; } /* line 28, ../sass/user-environ/_frame.scss */ .frame.child-frame.panel:hover { - border-color: #666666; - z-index: 2; } + border-color: #666666; } /* line 36, ../sass/user-environ/_frame.scss */ .frame > .object-header.abs, .btn-menu .frame > span.object-header.l-click-area { font-size: 0.75em; diff --git a/platform/commonUI/general/res/sass/edit/_editor.scss b/platform/commonUI/general/res/sass/edit/_editor.scss index b4a4920f56..b98fa93de8 100644 --- a/platform/commonUI/general/res/sass/edit/_editor.scss +++ b/platform/commonUI/general/res/sass/edit/_editor.scss @@ -89,7 +89,7 @@ &:hover { @include boxShdwLarge(); border-color: $colorKey; - z-index: 2; + //z-index: 2; .view-switcher { opacity: 1; } diff --git a/platform/commonUI/general/res/sass/user-environ/_frame.scss b/platform/commonUI/general/res/sass/user-environ/_frame.scss index a371459cc0..387cbb81b7 100644 --- a/platform/commonUI/general/res/sass/user-environ/_frame.scss +++ b/platform/commonUI/general/res/sass/user-environ/_frame.scss @@ -27,7 +27,7 @@ border: 1px solid $bc; &:hover { border-color: lighten($bc, 10%); - z-index: 2; + //z-index: 2; } .contents { // overflow: hidden; From af2ca49b23d70721080c12051588eef006ca6f79 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 30 Jun 2015 09:27:56 -0700 Subject: [PATCH 03/15] [Frontend] Added top right resize corner WTD-1404 WTD-1376 --- .../general/res/css/theme-espresso.css | 41 ++++++++++++------- .../general/res/sass/edit/_editor.scss | 8 ++++ .../general/res/sass/user-environ/_frame.scss | 2 - .../features/layout/res/templates/layout.html | 7 ++-- 4 files changed, 37 insertions(+), 21 deletions(-) diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 18a856288c..ea093fb650 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -2797,6 +2797,9 @@ label.checkbox.custom { width: 15px; height: 15px; } /* line 35, ../sass/edit/_editor.scss */ + .edit-main .edit-corner:hover { + z-index: 11; } + /* line 38, ../sass/edit/_editor.scss */ .edit-main .edit-corner.edit-resize-nw { -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; @@ -2804,7 +2807,15 @@ label.checkbox.custom { cursor: nw-resize; top: 0; left: 0; } - /* line 40, ../sass/edit/_editor.scss */ + /* line 43, ../sass/edit/_editor.scss */ + .edit-main .edit-corner.edit-resize-ne { + -moz-border-radius-bottomleft: 5px; + -webkit-border-bottom-left-radius: 5px; + border-bottom-left-radius: 5px; + cursor: ne-resize; + top: 0; + right: 0; } + /* line 48, ../sass/edit/_editor.scss */ .edit-main .edit-corner.edit-resize-se { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; @@ -2812,7 +2823,7 @@ label.checkbox.custom { cursor: se-resize; bottom: 0; right: 0; } - /* line 45, ../sass/edit/_editor.scss */ + /* line 53, ../sass/edit/_editor.scss */ .edit-main .edit-corner.edit-resize-sw { -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; @@ -2820,13 +2831,13 @@ label.checkbox.custom { cursor: sw-resize; bottom: 0; left: 0; } -/* line 53, ../sass/edit/_editor.scss */ +/* line 61, ../sass/edit/_editor.scss */ .edit-main .edit-handle { top: 15px; right: 15px; bottom: 15px; left: 15px; } - /* line 55, ../sass/edit/_editor.scss */ + /* line 63, ../sass/edit/_editor.scss */ .edit-main .edit-handle.edit-move { cursor: move; left: 0; @@ -2834,43 +2845,43 @@ label.checkbox.custom { top: 0; bottom: 0; z-index: 1; } - /* line 65, ../sass/edit/_editor.scss */ + /* line 73, ../sass/edit/_editor.scss */ .edit-main .edit-handle.edit-resize-n { top: 0px; bottom: auto; height: 15px; cursor: n-resize; } - /* line 70, ../sass/edit/_editor.scss */ + /* line 78, ../sass/edit/_editor.scss */ .edit-main .edit-handle.edit-resize-e { right: 0px; left: auto; width: 15px; cursor: e-resize; } - /* line 75, ../sass/edit/_editor.scss */ + /* line 83, ../sass/edit/_editor.scss */ .edit-main .edit-handle.edit-resize-s { bottom: 0px; top: auto; height: 15px; cursor: s-resize; } - /* line 80, ../sass/edit/_editor.scss */ + /* line 88, ../sass/edit/_editor.scss */ .edit-main .edit-handle.edit-resize-w { left: 0px; right: auto; width: 15px; cursor: w-resize; } -/* line 89, ../sass/edit/_editor.scss */ +/* line 97, ../sass/edit/_editor.scss */ .edit-main .frame.child-frame.panel:hover { -moz-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; border-color: #0099cc; } - /* line 93, ../sass/edit/_editor.scss */ + /* line 101, ../sass/edit/_editor.scss */ .edit-main .frame.child-frame.panel:hover .view-switcher { opacity: 1; } - /* line 96, ../sass/edit/_editor.scss */ + /* line 104, ../sass/edit/_editor.scss */ .edit-main .frame.child-frame.panel:hover .edit-corner { background-color: rgba(0, 153, 204, 0.8); } - /* line 98, ../sass/edit/_editor.scss */ + /* line 106, ../sass/edit/_editor.scss */ .edit-main .frame.child-frame.panel:hover .edit-corner:hover { background-color: #0099cc; } @@ -4129,14 +4140,14 @@ input[type="text"] { right: 5px; bottom: 5px; left: 5px; } -/* line 54, ../sass/user-environ/_frame.scss */ +/* line 53, ../sass/user-environ/_frame.scss */ .frame.frame-template .view-switcher { opacity: 0; z-index: 10; } -/* line 59, ../sass/user-environ/_frame.scss */ +/* line 57, ../sass/user-environ/_frame.scss */ .frame.frame-template:hover .view-switcher { opacity: 1; } -/* line 67, ../sass/user-environ/_frame.scss */ +/* line 65, ../sass/user-environ/_frame.scss */ .frame .view-switcher .name { display: none; } diff --git a/platform/commonUI/general/res/sass/edit/_editor.scss b/platform/commonUI/general/res/sass/edit/_editor.scss index b98fa93de8..3245df8d35 100644 --- a/platform/commonUI/general/res/sass/edit/_editor.scss +++ b/platform/commonUI/general/res/sass/edit/_editor.scss @@ -32,11 +32,19 @@ .edit-corner { width: $handleD; height: $handleD; + &:hover { + z-index: 11; + } &.edit-resize-nw { @include border-bottom-right-radius($cr); cursor: nw-resize; top: 0; left: 0; } + &.edit-resize-ne { + @include border-bottom-left-radius($cr); + cursor: ne-resize; + top: 0; right: 0; + } &.edit-resize-se { @include border-top-left-radius($cr); cursor: se-resize; diff --git a/platform/commonUI/general/res/sass/user-environ/_frame.scss b/platform/commonUI/general/res/sass/user-environ/_frame.scss index 387cbb81b7..3fdc925b5b 100644 --- a/platform/commonUI/general/res/sass/user-environ/_frame.scss +++ b/platform/commonUI/general/res/sass/user-environ/_frame.scss @@ -50,9 +50,7 @@ &.frame-template { // Hide the view switcher by default when it's in an element that's in a frame context // Frame template is used because we need to target the lowest nested frame - // This has the effect of hiding the view switcher in nested frames in edit mode, which is desirable currently (as it's non-functional) .view-switcher { - //display: none; opacity: 0; z-index: 10; } diff --git a/platform/features/layout/res/templates/layout.html b/platform/features/layout/res/templates/layout.html index 0a42ba30fe..ca3a359dba 100644 --- a/platform/features/layout/res/templates/layout.html +++ b/platform/features/layout/res/templates/layout.html @@ -75,13 +75,12 @@ mct-drag="controller.continueDrag(delta)" mct-drag-up="controller.endDrag()"> - + Date: Tue, 30 Jun 2015 10:37:19 -0700 Subject: [PATCH 04/15] [Frontend] Moved browse mode splitter settings to CSS file WTD-1404 WTD-1399 --- .../commonUI/browse/res/templates/browse.html | 5 +- .../general/res/css/theme-espresso.css | 96 ++++++++++--------- .../res/sass/_hide-non-functional.scss | 10 -- platform/commonUI/general/res/sass/_main.scss | 1 + .../res/sass/user-environ/_layout.scss | 5 +- 5 files changed, 61 insertions(+), 56 deletions(-) diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html index 0a7698e8bd..3671e08ace 100644 --- a/platform/commonUI/browse/res/templates/browse.html +++ b/platform/commonUI/browse/res/templates/browse.html @@ -23,8 +23,9 @@
-
+
diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index ea093fb650..2b850933fa 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -614,56 +614,61 @@ mct-container { /* line 199, ../sass/user-environ/_layout.scss */ .pane { position: absolute; } - /* line 202, ../sass/user-environ/_layout.scss */ - .pane.treeview .create-btn-holder { - bottom: auto; - top: 0; - height: 24px; } - /* line 205, ../sass/user-environ/_layout.scss */ - .pane.treeview .create-btn-holder .wrapper.menu-element { - position: absolute; - bottom: 5px; } - /* line 210, ../sass/user-environ/_layout.scss */ - .pane.treeview .tree-holder { - overflow: auto; - top: 34px; } - /* line 217, ../sass/user-environ/_layout.scss */ + /* line 201, ../sass/user-environ/_layout.scss */ + .pane.treeview { + min-width: 150px; + max-width: 50%; } + /* line 204, ../sass/user-environ/_layout.scss */ + .pane.treeview .create-btn-holder { + bottom: auto; + top: 0; + height: 24px; } + /* line 207, ../sass/user-environ/_layout.scss */ + .pane.treeview .create-btn-holder .wrapper.menu-element { + position: absolute; + bottom: 5px; } + /* line 212, ../sass/user-environ/_layout.scss */ + .pane.treeview .tree-holder { + overflow: auto; + top: 34px; + padding-right: 5px; } + /* line 220, ../sass/user-environ/_layout.scss */ .pane.items .object-browse-bar .left.abs, .pane.items .object-browse-bar .btn-menu span.left.l-click-area, .btn-menu .pane.items .object-browse-bar span.left.l-click-area, .pane.items .object-browse-bar .right.abs, .pane.items .object-browse-bar .btn-menu span.right.l-click-area, .btn-menu .pane.items .object-browse-bar span.right.l-click-area { top: auto; } - /* line 222, ../sass/user-environ/_layout.scss */ + /* line 225, ../sass/user-environ/_layout.scss */ .pane.items .object-holder { top: 34px; } - /* line 227, ../sass/user-environ/_layout.scss */ + /* line 230, ../sass/user-environ/_layout.scss */ .pane.edit-main .object-holder { top: 0; } - /* line 233, ../sass/user-environ/_layout.scss */ + /* line 236, ../sass/user-environ/_layout.scss */ .pane .object-holder { overflow: auto; } -/* line 241, ../sass/user-environ/_layout.scss */ +/* line 244, ../sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane { margin-top: 5px; } - /* line 244, ../sass/user-environ/_layout.scss */ + /* line 247, ../sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane:first-child { margin-top: 0; } -/* line 251, ../sass/user-environ/_layout.scss */ +/* line 254, ../sass/user-environ/_layout.scss */ .split-layout.vertical > .pane { margin-left: 5px; } - /* line 253, ../sass/user-environ/_layout.scss */ + /* line 256, ../sass/user-environ/_layout.scss */ .split-layout.vertical > .pane > .holder { left: 0; right: 0; } - /* line 257, ../sass/user-environ/_layout.scss */ + /* line 260, ../sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child { margin-left: 0; } - /* line 259, ../sass/user-environ/_layout.scss */ + /* line 262, ../sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child .holder { - right: 5px; } + right: 3px; } -/* line 268, ../sass/user-environ/_layout.scss */ +/* line 271, ../sass/user-environ/_layout.scss */ .vscroll { overflow-y: auto; } @@ -3741,7 +3746,7 @@ input[type="text"] { overflow: hidden; } /* line 50, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-axis-area.gl-plot-y { - top: 29px; + top: 25px; right: auto; bottom: 37px; left: 0; @@ -3758,7 +3763,7 @@ input[type="text"] { color: #e6e6e6; padding: 2px 5px; position: absolute; - top: 39px; + top: 35px; right: auto; bottom: auto; left: 70px; @@ -3769,7 +3774,7 @@ input[type="text"] { /* line 76, ../sass/plots/_plots-main.scss */ .gl-plot .gl-plot-display-area { position: absolute; - top: 29px; + top: 25px; right: 0; bottom: 37px; left: 60px; @@ -3837,7 +3842,7 @@ input[type="text"] { right: 0; bottom: auto; left: 0; - height: 24px; + height: 20px; overflow-x: hidden; overflow-y: auto; } /* line 157, ../sass/plots/_plots-main.scss */ @@ -3895,14 +3900,15 @@ input[type="text"] { .legend .plot-legend-item, .legend .legend-item { display: inline-block; - margin-right: 10px; } - /* line 204, ../sass/plots/_plots-main.scss */ + margin-right: 10px; + margin-bottom: 3px; } + /* line 205, ../sass/plots/_plots-main.scss */ .gl-plot-legend .plot-legend-item span, .gl-plot-legend .legend-item span, .legend .plot-legend-item span, .legend .legend-item span { vertical-align: middle; } - /* line 207, ../sass/plots/_plots-main.scss */ + /* line 208, ../sass/plots/_plots-main.scss */ .gl-plot-legend .plot-legend-item .plot-color-swatch, .gl-plot-legend .plot-legend-item .color-swatch, .gl-plot-legend .legend-item .plot-color-swatch, @@ -3918,7 +3924,7 @@ input[type="text"] { height: 8px; width: 8px; } -/* line 220, ../sass/plots/_plots-main.scss */ +/* line 221, ../sass/plots/_plots-main.scss */ .gl-plot-legend .plot-legend-item { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -3926,22 +3932,22 @@ input[type="text"] { color: #fff; line-height: 1.5em; padding: 0px 5px; } - /* line 226, ../sass/plots/_plots-main.scss */ + /* line 227, ../sass/plots/_plots-main.scss */ .gl-plot-legend .plot-legend-item .plot-color-swatch { border: 1px solid #333; height: 9px; width: 9px; } -/* line 234, ../sass/plots/_plots-main.scss */ +/* line 235, ../sass/plots/_plots-main.scss */ .tick { position: absolute; border: 0 rgba(255, 255, 255, 0.3) solid; } - /* line 237, ../sass/plots/_plots-main.scss */ + /* line 238, ../sass/plots/_plots-main.scss */ .tick.tick-x { border-right-width: 1px; height: 100%; } -/* line 243, ../sass/plots/_plots-main.scss */ +/* line 244, ../sass/plots/_plots-main.scss */ .gl-plot-tick, .tick-label { font-size: 0.7rem; @@ -3949,7 +3955,7 @@ input[type="text"] { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; } - /* line 251, ../sass/plots/_plots-main.scss */ + /* line 252, ../sass/plots/_plots-main.scss */ .gl-plot-tick.gl-plot-x-tick-label, .gl-plot-tick.tick-label-x, .tick-label.gl-plot-x-tick-label, .tick-label.tick-label-x { @@ -3960,7 +3966,7 @@ input[type="text"] { width: 20%; margin-left: -10%; text-align: center; } - /* line 261, ../sass/plots/_plots-main.scss */ + /* line 262, ../sass/plots/_plots-main.scss */ .gl-plot-tick.gl-plot-y-tick-label, .gl-plot-tick.tick-label-y, .tick-label.gl-plot-y-tick-label, .tick-label.tick-label-y { @@ -3970,18 +3976,18 @@ input[type="text"] { margin-bottom: -0.5em; text-align: right; } -/* line 273, ../sass/plots/_plots-main.scss */ +/* line 274, ../sass/plots/_plots-main.scss */ .gl-plot-tick.gl-plot-x-tick-label { top: 5px; } -/* line 276, ../sass/plots/_plots-main.scss */ +/* line 277, ../sass/plots/_plots-main.scss */ .gl-plot-tick.gl-plot-y-tick-label { right: 5px; left: 5px; } -/* line 283, ../sass/plots/_plots-main.scss */ +/* line 284, ../sass/plots/_plots-main.scss */ .tick-label.tick-label-x { top: 0; } -/* line 286, ../sass/plots/_plots-main.scss */ +/* line 287, ../sass/plots/_plots-main.scss */ .tick-label.tick-label-y { right: 0; left: 0; } @@ -4941,6 +4947,10 @@ input[type="text"] { height: 100%; width: 100%; } +/* line 6, ../sass/_initialization.scss */ +.browse-mode .split-layout .pane .treeview { + width: 15%; } + /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space diff --git a/platform/commonUI/general/res/sass/_hide-non-functional.scss b/platform/commonUI/general/res/sass/_hide-non-functional.scss index 0f1fcd525a..14860ec8ce 100644 --- a/platform/commonUI/general/res/sass/_hide-non-functional.scss +++ b/platform/commonUI/general/res/sass/_hide-non-functional.scss @@ -32,15 +32,5 @@ .browse-area.holder { // When .browse.top-bar is hidden, set the top of the browse-area holder top: $bodyMargin; - > .contents.split-layout { - // Don't pad in from top and bottom - //top: 0; bottom: 0; - .object-browse-bar { - .btn.key-window { - // Hide the Open in New Window button -// display: none; - } - } - } } } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/_main.scss b/platform/commonUI/general/res/sass/_main.scss index 07fec4ed79..d56c55aca5 100644 --- a/platform/commonUI/general/res/sass/_main.scss +++ b/platform/commonUI/general/res/sass/_main.scss @@ -70,4 +70,5 @@ @import "properties"; @import "autoflow"; @import "iframe"; +@import "initialization"; @import "hide-non-functional"; diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index 639e53af75..4bbfa59069 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -199,6 +199,8 @@ .pane { position: absolute; &.treeview { + min-width: 150px; + max-width: 50%; .create-btn-holder { bottom: auto; top: 0; height: $ueTopBarH; @@ -210,6 +212,7 @@ .tree-holder { overflow: auto; top: $ueTopBarH + $interiorMarginLg; + padding-right: $interiorMargin; } } &.items { @@ -257,7 +260,7 @@ &:first-child { margin-left: 0; .holder { - right: $interiorMargin; + right: $interiorMarginSm; } } } From c24a459f666f5155ab655ec5ab1163f0885934ed Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 30 Jun 2015 10:38:10 -0700 Subject: [PATCH 05/15] [Frontend] Plot legend minor cleanups WTD-1404 WTD-1386 --- platform/commonUI/browse/bundle.json | 2 +- platform/commonUI/general/res/sass/plots/_plots-main.scss | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/commonUI/browse/bundle.json b/platform/commonUI/browse/bundle.json index e10f3e9048..881c0e67fb 100644 --- a/platform/commonUI/browse/bundle.json +++ b/platform/commonUI/browse/bundle.json @@ -92,7 +92,7 @@ }, { "key": "window", - "name": "Open in a new tab", + "name": "Open In New Tab", "implementation": "windowing/NewTabAction.js", "description": "Open in a new browser tab", "category": ["view-control", "contextual"], diff --git a/platform/commonUI/general/res/sass/plots/_plots-main.scss b/platform/commonUI/general/res/sass/plots/_plots-main.scss index 5681f0d0cc..af59fd0af2 100644 --- a/platform/commonUI/general/res/sass/plots/_plots-main.scss +++ b/platform/commonUI/general/res/sass/plots/_plots-main.scss @@ -22,7 +22,7 @@ $yBarW: 60px; $yLabelW: auto; $xBarH: 32px; -$legendH: 24px; +$legendH: 20px; $colorHash: rgba(white, 0.3); $styleHash: dashed; $swatchD: 8px; @@ -201,6 +201,7 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa .legend-item { display: inline-block; margin-right: $interiorMarginLg; + margin-bottom: $interiorMarginSm; span { vertical-align: middle; } From 9d25e3081f0d96a1e73c13c35efdf35afdb4f278 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 30 Jun 2015 13:23:56 -0700 Subject: [PATCH 06/15] [Frontend] Edit mode refactored to use new mct-split-pane WTD-1404 WTD-1399 --- .../commonUI/browse/res/templates/browse.html | 2 +- .../res/templates/browse/object-header.html | 2 +- .../edit/res/templates/edit-object.html | 61 +++----- platform/commonUI/general/res/css/forms.css | 49 +++---- .../general/res/css/theme-espresso.css | 133 ++++++++++-------- .../general/res/sass/controls/_controls.scss | 2 +- .../general/res/sass/forms/_elems.scss | 21 +-- .../res/sass/user-environ/_layout.scss | 33 +++-- .../res/templates/containers/accordion.html | 14 +- 9 files changed, 163 insertions(+), 154 deletions(-) diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html index 3671e08ace..3ac082fc59 100644 --- a/platform/commonUI/browse/res/templates/browse.html +++ b/platform/commonUI/browse/res/templates/browse.html @@ -24,7 +24,7 @@
diff --git a/platform/commonUI/browse/res/templates/browse/object-header.html b/platform/commonUI/browse/res/templates/browse/object-header.html index eb13bb3764..fe521ef188 100644 --- a/platform/commonUI/browse/res/templates/browse/object-header.html +++ b/platform/commonUI/browse/res/templates/browse/object-header.html @@ -25,6 +25,6 @@ {{parameters.mode}} {{type.getName()}} {{model.name}} - + v
\ No newline at end of file diff --git a/platform/commonUI/edit/res/templates/edit-object.html b/platform/commonUI/edit/res/templates/edit-object.html index a7073b13a1..651bb03d6f 100644 --- a/platform/commonUI/edit/res/templates/edit-object.html +++ b/platform/commonUI/edit/res/templates/edit-object.html @@ -23,74 +23,47 @@ mct-object="domainObject" ng-model="representation"> -
- - -
-
-
+
+ +
+ + +
- - +
- - -
-
-
+
-
- -
-
+
-
-
+
+
-
+
diff --git a/platform/commonUI/general/res/css/forms.css b/platform/commonUI/general/res/css/forms.css index bc7cbac350..a21995d9f3 100644 --- a/platform/commonUI/general/res/css/forms.css +++ b/platform/commonUI/general/res/css/forms.css @@ -120,8 +120,8 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 24, ../sass/forms/_elems.scss */ -.form .section-header { +/* line 22, ../sass/forms/_elems.scss */ +.section-header { -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; @@ -129,13 +129,14 @@ font-size: 0.8em; margin-top: 5px; padding: 5px; } - /* line 30, ../sass/forms/_elems.scss */ - .form .section-header:first-child { + /* line 28, ../sass/forms/_elems.scss */ + .section-header:first-child { margin-top: 0; } -/* line 34, ../sass/forms/_elems.scss */ + +/* line 35, ../sass/forms/_elems.scss */ .form .form-section { position: relative; } -/* line 38, ../sass/forms/_elems.scss */ +/* line 39, ../sass/forms/_elems.scss */ .form .form-row { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -146,10 +147,10 @@ margin-top: 5px; padding: 5px; position: relative; } - /* line 45, ../sass/forms/_elems.scss */ + /* line 46, ../sass/forms/_elems.scss */ .form .form-row.first { border-top: none; } - /* line 49, ../sass/forms/_elems.scss */ + /* line 50, ../sass/forms/_elems.scss */ .form .form-row .label, .form .form-row .controls { -moz-box-sizing: border-box; @@ -161,47 +162,47 @@ font-size: 0.75rem; line-height: 22px; min-height: 22px; } - /* line 60, ../sass/forms/_elems.scss */ + /* line 61, ../sass/forms/_elems.scss */ .form .form-row > .label { float: left; position: relative; white-space: nowrap; width: 20%; } - /* line 68, ../sass/forms/_elems.scss */ + /* line 69, ../sass/forms/_elems.scss */ .form .form-row .value { color: #cccccc; } - /* line 72, ../sass/forms/_elems.scss */ + /* line 73, ../sass/forms/_elems.scss */ .form .form-row .controls { float: left; position: relative; width: 79.9%; } - /* line 79, ../sass/forms/_elems.scss */ + /* line 80, ../sass/forms/_elems.scss */ .form .form-row .controls .l-composite-control.l-checkbox { display: inline-block; line-height: 14px; margin-right: 5px; } - /* line 88, ../sass/forms/_elems.scss */ + /* line 89, ../sass/forms/_elems.scss */ .form .form-row .controls input[type="text"] { height: 22px; line-height: 22px; margin-top: -4px; vertical-align: baseline; } - /* line 95, ../sass/forms/_elems.scss */ + /* line 96, ../sass/forms/_elems.scss */ .form .form-row .controls .l-med input[type="text"] { width: 200px; } - /* line 99, ../sass/forms/_elems.scss */ + /* line 100, ../sass/forms/_elems.scss */ .form .form-row .controls .l-small input[type="text"] { width: 50px; } - /* line 103, ../sass/forms/_elems.scss */ + /* line 104, ../sass/forms/_elems.scss */ .form .form-row .controls .l-numeric input[type="text"] { text-align: right; } - /* line 107, ../sass/forms/_elems.scss */ + /* line 108, ../sass/forms/_elems.scss */ .form .form-row .controls .select { margin-right: 5px; } - /* line 112, ../sass/forms/_elems.scss */ + /* line 113, ../sass/forms/_elems.scss */ .form .form-row .field-hints { color: #666666; } - /* line 116, ../sass/forms/_elems.scss */ + /* line 117, ../sass/forms/_elems.scss */ .form .form-row .selector-list { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -214,7 +215,7 @@ position: relative; height: 150px; overflow: auto; } - /* line 127, ../sass/forms/_elems.scss */ + /* line 128, ../sass/forms/_elems.scss */ .form .form-row .selector-list .wrapper { overflow-y: auto; position: absolute; @@ -223,24 +224,24 @@ bottom: 5px; left: 5px; } -/* line 141, ../sass/forms/_elems.scss */ +/* line 142, ../sass/forms/_elems.scss */ label.form-control.checkbox input { margin-right: 5px; vertical-align: top; } -/* line 147, ../sass/forms/_elems.scss */ +/* line 148, ../sass/forms/_elems.scss */ .hint, .s-hint { font-size: 0.9em; } -/* line 152, ../sass/forms/_elems.scss */ +/* line 153, ../sass/forms/_elems.scss */ .l-result { display: inline-block; min-width: 32px; min-height: 32px; position: relative; vertical-align: top; } - /* line 159, ../sass/forms/_elems.scss */ + /* line 160, ../sass/forms/_elems.scss */ .l-result div.s-hint { -moz-border-radius: 2px; -webkit-border-radius: 2px; diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 2b850933fa..d695d60a52 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -611,64 +611,71 @@ mct-container { *zoom: 1; padding: 5px 0; } -/* line 199, ../sass/user-environ/_layout.scss */ +/* line 201, ../sass/user-environ/_layout.scss */ +.browse-mode .split-layout .pane.left { + min-width: 150px; + max-width: 50%; } + +/* line 210, ../sass/user-environ/_layout.scss */ +.edit-mode .split-layout .pane.right { + min-width: 150px; + max-width: 50%; } + /* line 213, ../sass/user-environ/_layout.scss */ + .edit-mode .split-layout .pane.right .pane.bottom { + min-height: 50px; + max-height: 80%; } + +/* line 221, ../sass/user-environ/_layout.scss */ .pane { position: absolute; } - /* line 201, ../sass/user-environ/_layout.scss */ - .pane.treeview { - min-width: 150px; - max-width: 50%; } - /* line 204, ../sass/user-environ/_layout.scss */ - .pane.treeview .create-btn-holder { - bottom: auto; - top: 0; - height: 24px; } - /* line 207, ../sass/user-environ/_layout.scss */ - .pane.treeview .create-btn-holder .wrapper.menu-element { - position: absolute; - bottom: 5px; } - /* line 212, ../sass/user-environ/_layout.scss */ - .pane.treeview .tree-holder { - overflow: auto; - top: 34px; - padding-right: 5px; } - /* line 220, ../sass/user-environ/_layout.scss */ + /* line 224, ../sass/user-environ/_layout.scss */ + .pane.treeview.left .create-btn-holder { + bottom: auto; + top: 0; + height: 24px; } + /* line 227, ../sass/user-environ/_layout.scss */ + .pane.treeview.left .create-btn-holder .wrapper.menu-element { + position: absolute; + bottom: 5px; } + /* line 232, ../sass/user-environ/_layout.scss */ + .pane.treeview.left .tree-holder { + overflow: auto; + top: 34px; + padding-right: 5px; } + /* line 240, ../sass/user-environ/_layout.scss */ .pane.items .object-browse-bar .left.abs, .pane.items .object-browse-bar .btn-menu span.left.l-click-area, .btn-menu .pane.items .object-browse-bar span.left.l-click-area, .pane.items .object-browse-bar .right.abs, .pane.items .object-browse-bar .btn-menu span.right.l-click-area, .btn-menu .pane.items .object-browse-bar span.right.l-click-area { top: auto; } - /* line 225, ../sass/user-environ/_layout.scss */ + /* line 245, ../sass/user-environ/_layout.scss */ .pane.items .object-holder { top: 34px; } - /* line 230, ../sass/user-environ/_layout.scss */ - .pane.edit-main .object-holder { - top: 0; } - /* line 236, ../sass/user-environ/_layout.scss */ + /* line 249, ../sass/user-environ/_layout.scss */ .pane .object-holder { overflow: auto; } -/* line 244, ../sass/user-environ/_layout.scss */ +/* line 257, ../sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane { margin-top: 5px; } - /* line 247, ../sass/user-environ/_layout.scss */ + /* line 260, ../sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane:first-child { margin-top: 0; } -/* line 254, ../sass/user-environ/_layout.scss */ +/* line 267, ../sass/user-environ/_layout.scss */ .split-layout.vertical > .pane { margin-left: 5px; } - /* line 256, ../sass/user-environ/_layout.scss */ + /* line 269, ../sass/user-environ/_layout.scss */ .split-layout.vertical > .pane > .holder { left: 0; right: 0; } - /* line 260, ../sass/user-environ/_layout.scss */ + /* line 273, ../sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child { margin-left: 0; } - /* line 262, ../sass/user-environ/_layout.scss */ + /* line 275, ../sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child .holder { right: 3px; } -/* line 271, ../sass/user-environ/_layout.scss */ +/* line 284, ../sass/user-environ/_layout.scss */ .vscroll { overflow-y: auto; } @@ -1922,7 +1929,7 @@ a.l-btn span { content: "^"; display: block; font-family: 'symbolsfont'; - font-size: 1.2em; + font-size: 0.9em; position: absolute; right: 5px; text-transform: none; @@ -3146,8 +3153,8 @@ label.checkbox.custom { * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 24, ../sass/forms/_elems.scss */ -.form .section-header { +/* line 22, ../sass/forms/_elems.scss */ +.section-header { -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; @@ -3155,13 +3162,14 @@ label.checkbox.custom { font-size: 0.8em; margin-top: 5px; padding: 5px; } - /* line 30, ../sass/forms/_elems.scss */ - .form .section-header:first-child { + /* line 28, ../sass/forms/_elems.scss */ + .section-header:first-child { margin-top: 0; } -/* line 34, ../sass/forms/_elems.scss */ + +/* line 35, ../sass/forms/_elems.scss */ .form .form-section { position: relative; } -/* line 38, ../sass/forms/_elems.scss */ +/* line 39, ../sass/forms/_elems.scss */ .form .form-row { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -3172,10 +3180,10 @@ label.checkbox.custom { margin-top: 5px; padding: 5px; position: relative; } - /* line 45, ../sass/forms/_elems.scss */ + /* line 46, ../sass/forms/_elems.scss */ .form .form-row.first { border-top: none; } - /* line 49, ../sass/forms/_elems.scss */ + /* line 50, ../sass/forms/_elems.scss */ .form .form-row .label, .form .form-row .controls { -moz-box-sizing: border-box; @@ -3187,47 +3195,47 @@ label.checkbox.custom { font-size: 0.75rem; line-height: 22px; min-height: 22px; } - /* line 60, ../sass/forms/_elems.scss */ + /* line 61, ../sass/forms/_elems.scss */ .form .form-row > .label { float: left; position: relative; white-space: nowrap; width: 20%; } - /* line 68, ../sass/forms/_elems.scss */ + /* line 69, ../sass/forms/_elems.scss */ .form .form-row .value { color: #cccccc; } - /* line 72, ../sass/forms/_elems.scss */ + /* line 73, ../sass/forms/_elems.scss */ .form .form-row .controls { float: left; position: relative; width: 79.9%; } - /* line 79, ../sass/forms/_elems.scss */ + /* line 80, ../sass/forms/_elems.scss */ .form .form-row .controls .l-composite-control.l-checkbox { display: inline-block; line-height: 14px; margin-right: 5px; } - /* line 88, ../sass/forms/_elems.scss */ + /* line 89, ../sass/forms/_elems.scss */ .form .form-row .controls input[type="text"] { height: 22px; line-height: 22px; margin-top: -4px; vertical-align: baseline; } - /* line 95, ../sass/forms/_elems.scss */ + /* line 96, ../sass/forms/_elems.scss */ .form .form-row .controls .l-med input[type="text"] { width: 200px; } - /* line 99, ../sass/forms/_elems.scss */ + /* line 100, ../sass/forms/_elems.scss */ .form .form-row .controls .l-small input[type="text"] { width: 50px; } - /* line 103, ../sass/forms/_elems.scss */ + /* line 104, ../sass/forms/_elems.scss */ .form .form-row .controls .l-numeric input[type="text"] { text-align: right; } - /* line 107, ../sass/forms/_elems.scss */ + /* line 108, ../sass/forms/_elems.scss */ .form .form-row .controls .select { margin-right: 5px; } - /* line 112, ../sass/forms/_elems.scss */ + /* line 113, ../sass/forms/_elems.scss */ .form .form-row .field-hints { color: #666666; } - /* line 116, ../sass/forms/_elems.scss */ + /* line 117, ../sass/forms/_elems.scss */ .form .form-row .selector-list { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -3240,7 +3248,7 @@ label.checkbox.custom { position: relative; height: 150px; overflow: auto; } - /* line 127, ../sass/forms/_elems.scss */ + /* line 128, ../sass/forms/_elems.scss */ .form .form-row .selector-list .wrapper { overflow-y: auto; position: absolute; @@ -3249,24 +3257,24 @@ label.checkbox.custom { bottom: 5px; left: 5px; } -/* line 141, ../sass/forms/_elems.scss */ +/* line 142, ../sass/forms/_elems.scss */ label.form-control.checkbox input { margin-right: 5px; vertical-align: top; } -/* line 147, ../sass/forms/_elems.scss */ +/* line 148, ../sass/forms/_elems.scss */ .hint, .s-hint { font-size: 0.9em; } -/* line 152, ../sass/forms/_elems.scss */ +/* line 153, ../sass/forms/_elems.scss */ .l-result { display: inline-block; min-width: 32px; min-height: 32px; position: relative; vertical-align: top; } - /* line 159, ../sass/forms/_elems.scss */ + /* line 160, ../sass/forms/_elems.scss */ .l-result div.s-hint { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -4947,10 +4955,17 @@ input[type="text"] { height: 100%; width: 100%; } -/* line 6, ../sass/_initialization.scss */ -.browse-mode .split-layout .pane .treeview { +/* line 5, ../sass/_initialization.scss */ +.browse-mode .split-layout .pane.left { width: 15%; } +/* line 13, ../sass/_initialization.scss */ +.edit-mode .split-layout .pane.right { + width: 15%; } + /* line 15, ../sass/_initialization.scss */ + .edit-mode .split-layout .pane.right .pane.bottom { + height: 30%; } + /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index 571c9f1146..98a919658e 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -79,7 +79,7 @@ content: "^"; display: block; font-family: 'symbolsfont'; - font-size: 1.2em; + font-size: 0.9em; position: absolute; right: $interiorMargin; text-transform: none; diff --git a/platform/commonUI/general/res/sass/forms/_elems.scss b/platform/commonUI/general/res/sass/forms/_elems.scss index 8bb559a216..a47cdc2484 100644 --- a/platform/commonUI/general/res/sass/forms/_elems.scss +++ b/platform/commonUI/general/res/sass/forms/_elems.scss @@ -19,18 +19,19 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ +.section-header { + @include border-radius(3px); + background: rgba(white, 0.1); + font-size: 0.8em; + margin-top: $interiorMargin; + padding: $interiorMargin; + &:first-child { + margin-top: 0; + } +} + .form { // @include test(orange); - .section-header { - @include border-radius(3px); - background: rgba(white, 0.1); - font-size: 0.8em; - margin-top: $interiorMargin; - padding: $interiorMargin; - &:first-child { - margin-top: 0; - } - } .form-section { position: relative; } diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index 4bbfa59069..b70d081289 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -196,11 +196,31 @@ } } +.browse-mode { + .split-layout { + .pane.left { + min-width: 150px; + max-width: 50%; + } + } +} + +.edit-mode { + .split-layout { + .pane.right { + min-width: 150px; + max-width: 50%; + .pane.bottom { + min-height: 50px; + max-height: 80%; + } + } + } +} + .pane { position: absolute; - &.treeview { - min-width: 150px; - max-width: 50%; + &.treeview.left { .create-btn-holder { bottom: auto; top: 0; height: $ueTopBarH; @@ -226,13 +246,6 @@ top: $ueTopBarH + $interiorMarginLg; } } - &.edit-main { - .object-holder { - top: 0; - } - } - &.edit-objects { - } .object-holder { overflow: auto; } diff --git a/platform/commonUI/general/res/templates/containers/accordion.html b/platform/commonUI/general/res/templates/containers/accordion.html index b8348a205f..59db0635b5 100644 --- a/platform/commonUI/general/res/templates/containers/accordion.html +++ b/platform/commonUI/general/res/templates/containers/accordion.html @@ -19,10 +19,16 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> -
+
{{container.title}}
-
+
\ No newline at end of file From 344aa8acc8b6e01da162fb9e6aa1fd7cf1892b57 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 30 Jun 2015 13:26:15 -0700 Subject: [PATCH 07/15] [Frontend] Adding initialization CSS defs for new mct-split-pane WTD-1404 WTD-1399 --- .../general/res/sass/_initialization.scss | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 platform/commonUI/general/res/sass/_initialization.scss diff --git a/platform/commonUI/general/res/sass/_initialization.scss b/platform/commonUI/general/res/sass/_initialization.scss new file mode 100644 index 0000000000..d0f5983457 --- /dev/null +++ b/platform/commonUI/general/res/sass/_initialization.scss @@ -0,0 +1,20 @@ +// Classes for initializing states of objects + +.browse-mode { + .split-layout { + .pane.left { + width: 15%; + } + } +} + +.edit-mode { + .split-layout { + .pane.right { + width: 15%; + .pane.bottom { + height: 30%; + } + } + } +} \ No newline at end of file From 06cf1998729bec53edb78d24f8af260e0c2bf6af Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 30 Jun 2015 13:35:21 -0700 Subject: [PATCH 08/15] [Frontend] Styling for context-available arrow WTD-1404 WTD-1422 --- .../general/res/css/theme-espresso.css | 42 ++++++++++++------- platform/commonUI/general/res/css/tree.css | 28 ++++++------- .../general/res/sass/controls/_controls.scss | 18 ++++++++ .../commonUI/general/res/sass/tree/_tree.scss | 1 - 4 files changed, 60 insertions(+), 29 deletions(-) diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index d695d60a52..66d82a01c5 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -2201,6 +2201,13 @@ label.checkbox.custom { height: auto; } /* line 351, ../sass/controls/_controls.scss */ +.context-available { + color: #0099cc; } + /* line 355, ../sass/controls/_controls.scss */ + .context-available:hover { + color: deepskyblue; } + +/* line 360, ../sass/controls/_controls.scss */ .view-switcher { -moz-transition-property: visibility, opacity, background-color, border-color; -o-transition-property: visibility, opacity, background-color, border-color; @@ -2216,30 +2223,37 @@ label.checkbox.custom { transition-timing-function: ease-in-out; } /******************************************************** OBJECT-HEADER */ -/* line 356, ../sass/controls/_controls.scss */ +/* line 365, ../sass/controls/_controls.scss */ .object-header { display: inline-block; font-size: 1em; } - /* line 360, ../sass/controls/_controls.scss */ + /* line 369, ../sass/controls/_controls.scss */ .object-header .label .title-label { color: white; } - /* line 363, ../sass/controls/_controls.scss */ + /* line 372, ../sass/controls/_controls.scss */ .object-header .label .type-icon { font-size: 120%; margin-right: 5px; vertical-align: middle; } + /* line 377, ../sass/controls/_controls.scss */ + .object-header .label .context-available { + opacity: 0; + font-size: 0.8em; } + /* line 382, ../sass/controls/_controls.scss */ + .object-header .label:hover .context-available { + opacity: 1; } -/* line 373, ../sass/controls/_controls.scss */ +/* line 391, ../sass/controls/_controls.scss */ .top-bar .object-header, .object-browse-bar .object-header { font-size: 1.1em; } - /* line 375, ../sass/controls/_controls.scss */ + /* line 393, ../sass/controls/_controls.scss */ .top-bar .object-header span, .object-browse-bar .object-header span { display: inline-block; } /******************************************************** SLIDERS */ -/* line 387, ../sass/controls/_controls.scss */ +/* line 405, ../sass/controls/_controls.scss */ .slider .slot { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -2260,7 +2274,7 @@ label.checkbox.custom { right: 0; bottom: auto; left: 0; } -/* line 398, ../sass/controls/_controls.scss */ +/* line 416, ../sass/controls/_controls.scss */ .slider .knob { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzUyNTI1MiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQ1NDU0NSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2343,12 +2357,12 @@ label.checkbox.custom { -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; border-color: #0099cc; } - /* line 409, ../sass/controls/_controls.scss */ + /* line 427, ../sass/controls/_controls.scss */ .slider .knob:before { top: 1px; bottom: 3px; left: 5px; } -/* line 416, ../sass/controls/_controls.scss */ +/* line 434, ../sass/controls/_controls.scss */ .slider .range { background: rgba(0, 153, 204, 0.6); cursor: ew-resize; @@ -2359,12 +2373,12 @@ label.checkbox.custom { left: auto; height: auto; width: auto; } - /* line 426, ../sass/controls/_controls.scss */ + /* line 444, ../sass/controls/_controls.scss */ .slider .range:hover { background: rgba(0, 153, 204, 0.7); } /******************************************************** BROWSER ELEMENTS */ -/* line 434, ../sass/controls/_controls.scss */ +/* line 452, ../sass/controls/_controls.scss */ ::-webkit-scrollbar { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -2381,7 +2395,7 @@ label.checkbox.custom { height: 10px; width: 10px; } -/* line 440, ../sass/controls/_controls.scss */ +/* line 458, ../sass/controls/_controls.scss */ ::-webkit-scrollbar-thumb { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzY2NjY2NiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU5NTk1OSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2399,7 +2413,7 @@ label.checkbox.custom { -webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; box-shadow: rgba(0, 0, 0, 0.2) 0 1px 2px; border-top: 1px solid gray; } - /* line 447, ../sass/controls/_controls.scss */ + /* line 465, ../sass/controls/_controls.scss */ ::-webkit-scrollbar-thumb:hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzgwODA4MCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzczNzM3MyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2408,7 +2422,7 @@ label.checkbox.custom { background-image: -webkit-linear-gradient(#808080, #737373 20px); background-image: linear-gradient(#808080, #737373 20px); } -/* line 452, ../sass/controls/_controls.scss */ +/* line 470, ../sass/controls/_controls.scss */ ::-webkit-scrollbar-corner { background: rgba(0, 0, 0, 0.4); } diff --git a/platform/commonUI/general/res/css/tree.css b/platform/commonUI/general/res/css/tree.css index 75b40aa115..ab47fcc739 100644 --- a/platform/commonUI/general/res/css/tree.css +++ b/platform/commonUI/general/res/css/tree.css @@ -190,51 +190,51 @@ ul.tree { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } - /* line 87, ../sass/tree/_tree.scss */ + /* line 86, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.loading { pointer-events: none; } - /* line 89, ../sass/tree/_tree.scss */ + /* line 88, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.loading .label { opacity: 0.5; } - /* line 91, ../sass/tree/_tree.scss */ + /* line 90, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.loading .label .title-label { font-style: italic; } - /* line 95, ../sass/tree/_tree.scss */ + /* line 94, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.loading .wait-spinner { margin-left: 14px; } - /* line 100, ../sass/tree/_tree.scss */ + /* line 99, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.selected { background: #005177; color: #fff; } - /* line 104, ../sass/tree/_tree.scss */ + /* line 103, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.selected .view-control { color: #0099cc; } - /* line 107, ../sass/tree/_tree.scss */ + /* line 106, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.selected .label .type-icon { color: #fff; } - /* line 113, ../sass/tree/_tree.scss */ + /* line 112, ../sass/tree/_tree.scss */ ul.tree li span.tree-item:not(.selected):hover { background: #404040; color: #cccccc; } - /* line 116, ../sass/tree/_tree.scss */ + /* line 115, ../sass/tree/_tree.scss */ ul.tree li span.tree-item:not(.selected):hover .context-trigger { display: block; } - /* line 119, ../sass/tree/_tree.scss */ + /* line 118, ../sass/tree/_tree.scss */ ul.tree li span.tree-item:not(.selected):hover .icon { color: #33ccff; } - /* line 125, ../sass/tree/_tree.scss */ + /* line 124, ../sass/tree/_tree.scss */ ul.tree li span.tree-item:not(.loading) { cursor: pointer; } - /* line 129, ../sass/tree/_tree.scss */ + /* line 128, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .context-trigger { top: -1px; position: absolute; right: 3px; } - /* line 135, ../sass/tree/_tree.scss */ + /* line 134, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .context-trigger .invoke-menu { font-size: 0.75em; height: 0.9rem; line-height: 0.9rem; } - /* line 144, ../sass/tree/_tree.scss */ + /* line 143, ../sass/tree/_tree.scss */ ul.tree ul.tree { margin-left: 15px; } diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index 98a919658e..9296dfc385 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -348,6 +348,15 @@ label.checkbox.custom { } } +.context-available { + $c: $colorKey; + color: $c; + //padding: 0 5px; + &:hover { + color: lighten($c, 10%); + } +} + .view-switcher { @include trans-prop-nice-fade($controlFadeMs); } @@ -365,6 +374,15 @@ label.checkbox.custom { margin-right: $interiorMargin; vertical-align: middle; } + .context-available { + opacity: 0; + font-size: 0.8em; + } + &:hover { + .context-available { + opacity: 1; + } + } } } diff --git a/platform/commonUI/general/res/sass/tree/_tree.scss b/platform/commonUI/general/res/sass/tree/_tree.scss index 356bb8a527..19160a288b 100644 --- a/platform/commonUI/general/res/sass/tree/_tree.scss +++ b/platform/commonUI/general/res/sass/tree/_tree.scss @@ -79,7 +79,6 @@ ul.tree { //right: $treeContextTriggerW + $interiorMargin; overflow: hidden; text-overflow: ellipsis; -// height: $menuLineH; white-space: nowrap; } } From 9b26a896d38df8408b1b0b96d399c3cfa00739ea Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 30 Jun 2015 14:12:24 -0700 Subject: [PATCH 09/15] [Frontend] Fixes for dropdown menu click issues WTD-1404 WTD-1379 Context menu and view switcher menu fixed; Removed with
  • and put ng-click on
  • --- .../general/res/css/theme-espresso.css | 63 +++++++++---------- .../general/res/sass/controls/_menus.scss | 16 ++--- .../res/templates/controls/switcher.html | 18 ++---- .../res/templates/menu/context-menu.html | 17 +++-- 4 files changed, 50 insertions(+), 64 deletions(-) diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 66d82a01c5..e86f9eae85 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -2532,29 +2532,24 @@ label.checkbox.custom { -webkit-box-sizing: border-box; box-sizing: border-box; border-top: 1px solid #737373; + color: #d9d9d9; line-height: 1.4rem; padding: 3px 10px 3px 30px; white-space: nowrap; } - /* line 45, ../sass/controls/_menus.scss */ + /* line 46, ../sass/controls/_menus.scss */ .menu-element .menu ul li:first-child { border: none; } - /* line 48, ../sass/controls/_menus.scss */ + /* line 49, ../sass/controls/_menus.scss */ .menu-element .menu ul li:hover { - background: #737373; } - /* line 50, ../sass/controls/_menus.scss */ - .menu-element .menu ul li:hover a { - color: #fff; } - /* line 53, ../sass/controls/_menus.scss */ + background: #737373; + color: #fff; } + /* line 55, ../sass/controls/_menus.scss */ .menu-element .menu ul li:hover .icon { color: #33ccff; } - /* line 57, ../sass/controls/_menus.scss */ - .menu-element .menu ul li a { - color: #d9d9d9; - display: block; } - /* line 61, ../sass/controls/_menus.scss */ + /* line 63, ../sass/controls/_menus.scss */ .menu-element .menu ul li .type-icon { left: 10px; } - /* line 68, ../sass/controls/_menus.scss */ + /* line 70, ../sass/controls/_menus.scss */ .menu-element .context-menu, .menu-element .super-menu { pointer-events: auto; @@ -2581,32 +2576,32 @@ label.checkbox.custom { .menu-element .context-menu.btn-menu .invoke-menu, .menu-element .super-menu.btn-menu .invoke-menu { color: #b0b0b0; } - /* line 76, ../sass/controls/_menus.scss */ + /* line 78, ../sass/controls/_menus.scss */ .menu-element .context-menu ul li, .menu-element .super-menu ul li { padding-left: 25px; } - /* line 78, ../sass/controls/_menus.scss */ + /* line 80, ../sass/controls/_menus.scss */ .menu-element .context-menu ul li a, .menu-element .super-menu ul li a { color: white; } - /* line 79, ../sass/controls/_menus.scss */ + /* line 81, ../sass/controls/_menus.scss */ .menu-element .context-menu ul li .icon, .menu-element .super-menu ul li .icon { color: #24c8ff; } - /* line 82, ../sass/controls/_menus.scss */ + /* line 84, ../sass/controls/_menus.scss */ .menu-element .context-menu ul li .type-icon, .menu-element .super-menu ul li .type-icon { left: 5px; } - /* line 85, ../sass/controls/_menus.scss */ + /* line 87, ../sass/controls/_menus.scss */ .menu-element .context-menu ul li:hover .icon, .menu-element .super-menu ul li:hover .icon { color: #3dcfff; } - /* line 92, ../sass/controls/_menus.scss */ + /* line 94, ../sass/controls/_menus.scss */ .menu-element .super-menu { display: block; width: 500px; height: 480px; } - /* line 102, ../sass/controls/_menus.scss */ + /* line 104, ../sass/controls/_menus.scss */ .menu-element .super-menu .contents { overflow: hidden; position: absolute; @@ -2616,12 +2611,12 @@ label.checkbox.custom { left: 5px; width: auto; height: auto; } - /* line 105, ../sass/controls/_menus.scss */ + /* line 107, ../sass/controls/_menus.scss */ .menu-element .super-menu .pane { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; } - /* line 107, ../sass/controls/_menus.scss */ + /* line 109, ../sass/controls/_menus.scss */ .menu-element .super-menu .pane.left { border-right: 1px solid rgba(255, 255, 255, 0.2); left: 0; @@ -2630,23 +2625,23 @@ label.checkbox.custom { width: 50%; overflow-x: hidden; overflow-y: auto; } - /* line 117, ../sass/controls/_menus.scss */ + /* line 119, ../sass/controls/_menus.scss */ .menu-element .super-menu .pane.left ul li { -moz-border-radius: 2px; -webkit-border-radius: 2px; border-radius: 2px; padding-left: 30px; border-top: none; } - /* line 124, ../sass/controls/_menus.scss */ + /* line 126, ../sass/controls/_menus.scss */ .menu-element .super-menu .pane.right { left: auto; right: 0; padding: 25px; width: 50%; } - /* line 130, ../sass/controls/_menus.scss */ + /* line 132, ../sass/controls/_menus.scss */ .menu-element .super-menu .pane.right .icon { color: #fff; } - /* line 137, ../sass/controls/_menus.scss */ + /* line 139, ../sass/controls/_menus.scss */ .menu-element .super-menu .menu-item-description .desc-area.icon { position: relative; font-size: 8em; @@ -2655,40 +2650,40 @@ label.checkbox.custom { line-height: 150px; margin-bottom: 25px; text-align: center; } - /* line 147, ../sass/controls/_menus.scss */ + /* line 149, ../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 152, ../sass/controls/_menus.scss */ + /* line 154, ../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 161, ../sass/controls/_menus.scss */ + /* line 163, ../sass/controls/_menus.scss */ .menu-element .context-menu { font-size: 0.80rem; } -/* line 166, ../sass/controls/_menus.scss */ +/* line 168, ../sass/controls/_menus.scss */ .context-menu-holder { pointer-events: none; position: absolute; height: 200px; width: 170px; z-index: 70; } - /* line 172, ../sass/controls/_menus.scss */ + /* line 174, ../sass/controls/_menus.scss */ .context-menu-holder .context-menu-wrapper { position: absolute; height: 100%; width: 100%; } - /* line 179, ../sass/controls/_menus.scss */ + /* line 181, ../sass/controls/_menus.scss */ .context-menu-holder.go-left .context-menu { right: 0; } - /* line 180, ../sass/controls/_menus.scss */ + /* line 182, ../sass/controls/_menus.scss */ .context-menu-holder.go-up .context-menu { bottom: 0; } -/* line 183, ../sass/controls/_menus.scss */ +/* line 185, ../sass/controls/_menus.scss */ .btn-bar.right .menu, .menus-to-left .menu { left: auto; diff --git a/platform/commonUI/general/res/sass/controls/_menus.scss b/platform/commonUI/general/res/sass/controls/_menus.scss index 31922238ee..59312a46a2 100644 --- a/platform/commonUI/general/res/sass/controls/_menus.scss +++ b/platform/commonUI/general/res/sass/controls/_menus.scss @@ -39,6 +39,7 @@ li { @include box-sizing(border-box); border-top: 1px solid lighten($bg, 20%); + color: lighten($bg, 60%); line-height: $menuLineH; padding: $interiorMarginSm $interiorMargin * 2 $interiorMarginSm ($interiorMargin * 2) + $treeTypeIconW; white-space: nowrap; @@ -47,17 +48,18 @@ } &:hover { background: $bgHover; - a { - color: $colorKeyFg; - } + color: $colorKeyFg; + //a { + // color: $colorKeyFg; + //} .icon { color: lighten($iconColor, 20%); } } - a { - color: lighten($bg, 60%); - display: block; - } + //a { + // color: lighten($bg, 60%); + // display: block; + //} .type-icon { left: $interiorMargin * 2; } diff --git a/platform/commonUI/general/res/templates/controls/switcher.html b/platform/commonUI/general/res/templates/controls/switcher.html index 59e9c87c85..3dec71ab6c 100644 --- a/platform/commonUI/general/res/templates/controls/switcher.html +++ b/platform/commonUI/general/res/templates/controls/switcher.html @@ -20,7 +20,6 @@ at runtime from the About dialog for additional information. --> -
    • - - - - \ No newline at end of file diff --git a/platform/commonUI/general/res/templates/menu/context-menu.html b/platform/commonUI/general/res/templates/menu/context-menu.html index ed6e742f32..8267a8ccb1 100644 --- a/platform/commonUI/general/res/templates/menu/context-menu.html +++ b/platform/commonUI/general/res/templates/menu/context-menu.html @@ -23,15 +23,14 @@
    From 2054dd84977a1f5be098731509e68871c8344478 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 30 Jun 2015 15:42:32 -0700 Subject: [PATCH 10/15] [Frontend] Removed pulse effect from pause-play button WTD-1404 WTD-1412 (cherry picked from commit 1b9521a) --- .../general/res/css/theme-espresso.css | 108 +++++++++++------- .../commonUI/general/res/sass/_constants.scss | 2 +- .../general/res/sass/controls/_buttons.scss | 8 +- 3 files changed, 70 insertions(+), 48 deletions(-) diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index e86f9eae85..5800e17aa4 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -1726,35 +1726,25 @@ mct-container { .icon-btn.labeled .title-label, .s-icon-btn.labeled .title-label { margin-left: 5px; } - /* line 133, ../sass/controls/_buttons.scss */ - .icon-btn.pause-play.paused, - .s-icon-btn.pause-play.paused { - -moz-animation-name: pulse; - -webkit-animation-name: pulse; - animation-name: pulse; - -moz-animation-duration: 500ms; - -webkit-animation-duration: 500ms; - animation-duration: 500ms; - -moz-animation-direction: alternate; - -webkit-animation-direction: alternate; - animation-direction: alternate; - -moz-animation-iteration-count: infinite; - -webkit-animation-iteration-count: infinite; - animation-iteration-count: infinite; - -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 */ - .icon-btn.pause-play .icon:before, - .s-icon-btn.pause-play .icon:before { - content: "\0000F1"; } - /* line 142, ../sass/controls/_buttons.scss */ + /* line 132, ../sass/controls/_buttons.scss */ + .icon-btn.pause-play, + .s-icon-btn.pause-play { + /* &.paused { + .icon { + @include pulse(500ms); + } + }*/ } + /* line 138, ../sass/controls/_buttons.scss */ + .icon-btn.pause-play .icon:before, + .s-icon-btn.pause-play .icon:before { + content: "\0000F1"; } + /* line 144, ../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 151, ../sass/controls/_buttons.scss */ span.btn, span.btn span, span.l-btn, @@ -2930,11 +2920,11 @@ label.checkbox.custom { /* line 18, ../sass/features/_imagery.scss */ .l-image-main-wrapper .l-image-main { background-color: rgba(255, 255, 255, 0.1); - bottom: 25px; } + bottom: 27px; } /* line 22, ../sass/features/_imagery.scss */ .l-image-main-wrapper .l-image-main-controlbar { top: auto; - height: 20px; } + height: 22px; } /* line 28, ../sass/features/_imagery.scss */ .l-image-thumbs-wrapper { @@ -2958,7 +2948,7 @@ label.checkbox.custom { /* line 53, ../sass/features/_imagery.scss */ .l-image-main-controlbar { font-size: 0.8em; - line-height: 20px; } + line-height: 22px; } /* line 57, ../sass/features/_imagery.scss */ .l-image-main-controlbar .left, .l-image-main-controlbar .right { direction: rtl; @@ -4847,28 +4837,58 @@ input[type="text"] { /* line 22, ../sass/_autoflow.scss */ .autoflow { font-size: 0.75rem; } - /* line 30, ../sass/_autoflow.scss */ + /* line 32, ../sass/_autoflow.scss */ + .autoflow:hover .l-autoflow-header .l-btn.change-column-width { + -moz-transition-property: visibility, opacity, background-color, border-color; + -o-transition-property: visibility, opacity, background-color, border-color; + -webkit-transition-property: visibility, opacity, background-color, border-color; + transition-property: visibility, opacity, background-color, border-color; + -moz-transition-duration: 50ms; + -o-transition-duration: 50ms; + -webkit-transition-duration: 50ms; + transition-duration: 50ms; + -moz-transition-timing-function: ease-in-out; + -o-transition-timing-function: ease-in-out; + -webkit-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; + opacity: 1; } + /* line 40, ../sass/_autoflow.scss */ .autoflow .l-autoflow-header { bottom: auto; height: 22px; line-height: 22px; min-width: 225px; } - /* line 35, ../sass/_autoflow.scss */ + /* line 45, ../sass/_autoflow.scss */ .autoflow .l-autoflow-header span { vertical-align: middle; } - /* line 38, ../sass/_autoflow.scss */ + /* line 48, ../sass/_autoflow.scss */ + .autoflow .l-autoflow-header .l-btn.change-column-width { + -moz-transition-property: visibility, opacity, background-color, border-color; + -o-transition-property: visibility, opacity, background-color, border-color; + -webkit-transition-property: visibility, opacity, background-color, border-color; + transition-property: visibility, opacity, background-color, border-color; + -moz-transition-duration: 500ms; + -o-transition-duration: 500ms; + -webkit-transition-duration: 500ms; + transition-duration: 500ms; + -moz-transition-timing-function: ease-in-out; + -o-transition-timing-function: ease-in-out; + -webkit-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; + opacity: 0; } + /* line 52, ../sass/_autoflow.scss */ .autoflow .l-autoflow-header .l-filter { margin-left: 5px; } - /* line 40, ../sass/_autoflow.scss */ + /* line 54, ../sass/_autoflow.scss */ .autoflow .l-autoflow-header .l-filter input.t-filter-input { width: 100px; } - /* line 46, ../sass/_autoflow.scss */ + /* line 60, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items { overflow-x: scroll; overflow-y: hidden; top: 32px; white-space: nowrap; } - /* line 52, ../sass/_autoflow.scss */ + /* line 66, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -4879,7 +4899,7 @@ input[type="text"] { padding-right: 5px; vertical-align: top; width: 225px; } - /* line 62, ../sass/_autoflow.scss */ + /* line 76, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -4891,37 +4911,37 @@ input[type="text"] { margin-bottom: 1px; margin-top: 1px; position: relative; } - /* line 71, ../sass/_autoflow.scss */ + /* line 85, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row:first-child { border-top: none; } - /* line 74, ../sass/_autoflow.scss */ + /* line 88, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row:hover { background: rgba(255, 255, 255, 0.1); } - /* line 79, ../sass/_autoflow.scss */ + /* line 93, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row.s-stale .l-autoflow-item.l { color: rgba(255, 255, 255, 0.3) !important; font-style: italic; } - /* line 80, ../sass/_autoflow.scss */ + /* line 94, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row.s-stale .l-autoflow-item.r { color: rgba(255, 255, 255, 0.5) !important; font-style: italic; } - /* line 83, ../sass/_autoflow.scss */ + /* line 97, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row:not(.s-stale) .l-autoflow-item.r { color: #b3b3b3; } - /* line 87, ../sass/_autoflow.scss */ + /* line 101, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row.first-in-group { border-top: 1px solid gray; } - /* line 90, ../sass/_autoflow.scss */ + /* line 104, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row .l-autoflow-item { display: block; } - /* line 92, ../sass/_autoflow.scss */ + /* line 106, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row .l-autoflow-item.l { float: none; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; width: auto; } - /* line 99, ../sass/_autoflow.scss */ + /* line 113, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row .l-autoflow-item.r { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -4931,7 +4951,7 @@ input[type="text"] { padding-left: 5px; padding-right: 5px; text-align: right; } - /* line 110, ../sass/_autoflow.scss */ + /* line 124, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col:first-child { border-left: none; padding-left: 0; } diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss index 8a8fed19d1..e44e29df47 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -118,7 +118,7 @@ $tabularHeaderH: 18px; $tabularTdPadLR: $itemPadLR; $tabularTdPadTB: 2px; // Imagery -$imageMainControlBarH: 20px; +$imageMainControlBarH: 22px; $imageThumbsD: 120px; $imageThumbsWrapperH: $imageThumbsD * 1.4; $imageThumbPad: 1px; diff --git a/platform/commonUI/general/res/sass/controls/_buttons.scss b/platform/commonUI/general/res/sass/controls/_buttons.scss index 1534694f79..ab2285ab5c 100644 --- a/platform/commonUI/general/res/sass/controls/_buttons.scss +++ b/platform/commonUI/general/res/sass/controls/_buttons.scss @@ -130,9 +130,11 @@ $pad: $interiorMargin * $baseRatio; } &.pause-play { - &.paused { - @include pulse(500ms); - } +/* &.paused { + .icon { + @include pulse(500ms); + } + }*/ .icon:before { content:"\0000F1"; } From f03a9bcc08ca0540cacb0a4a0604a0ccbc393ed3 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 30 Jun 2015 15:51:22 -0700 Subject: [PATCH 11/15] [Frontend] Merge mods for autoflow col width button WTD-1404 WTD-1411 --- platform/commonUI/general/res/sass/_autoflow.scss | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/platform/commonUI/general/res/sass/_autoflow.scss b/platform/commonUI/general/res/sass/_autoflow.scss index 0d04d619e8..417ba3a699 100644 --- a/platform/commonUI/general/res/sass/_autoflow.scss +++ b/platform/commonUI/general/res/sass/_autoflow.scss @@ -27,6 +27,16 @@ $valPad: 5px; $rowH: 15px; font-size: 0.75rem; + + &:hover { + .l-autoflow-header .l-btn.change-column-width { + @include trans-prop-nice-fade(50ms); + opacity: 1; + } + } + + + .l-autoflow-header { bottom: auto; height: $headerH; @@ -35,6 +45,10 @@ span { vertical-align: middle; } + .l-btn.change-column-width { + @include trans-prop-nice-fade(500ms); + opacity: 0; + } .l-filter { margin-left: $interiorMargin; input.t-filter-input { From 9f38914faaa702e51a67ee483abf6c7529786199 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 30 Jun 2015 16:01:53 -0700 Subject: [PATCH 12/15] [Frontend] Fixed styles that were breaking Create menu WTD-1404 --- platform/commonUI/general/res/css/theme-espresso.css | 12 ++++++------ .../commonUI/general/res/sass/_initialization.scss | 4 ++-- .../general/res/sass/user-environ/_layout.scss | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 5800e17aa4..be8bfc063b 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -612,16 +612,16 @@ mct-container { padding: 5px 0; } /* line 201, ../sass/user-environ/_layout.scss */ -.browse-mode .split-layout .pane.left { +.browse-mode .split-layout .split-pane-component.pane.left { min-width: 150px; max-width: 50%; } /* line 210, ../sass/user-environ/_layout.scss */ -.edit-mode .split-layout .pane.right { +.edit-mode .split-layout .split-pane-component.pane.right { min-width: 150px; max-width: 50%; } /* line 213, ../sass/user-environ/_layout.scss */ - .edit-mode .split-layout .pane.right .pane.bottom { + .edit-mode .split-layout .split-pane-component.pane.right .split-pane-component.pane.bottom { min-height: 50px; max-height: 80%; } @@ -4985,14 +4985,14 @@ input[type="text"] { width: 100%; } /* line 5, ../sass/_initialization.scss */ -.browse-mode .split-layout .pane.left { +.browse-mode .split-layout .split-pane-component.pane.left { width: 15%; } /* line 13, ../sass/_initialization.scss */ -.edit-mode .split-layout .pane.right { +.edit-mode .split-layout .split-pane-component.pane.right { width: 15%; } /* line 15, ../sass/_initialization.scss */ - .edit-mode .split-layout .pane.right .pane.bottom { + .edit-mode .split-layout .split-pane-component.pane.right .pane.bottom { height: 30%; } /***************************************************************************** diff --git a/platform/commonUI/general/res/sass/_initialization.scss b/platform/commonUI/general/res/sass/_initialization.scss index d0f5983457..bd5f003b9b 100644 --- a/platform/commonUI/general/res/sass/_initialization.scss +++ b/platform/commonUI/general/res/sass/_initialization.scss @@ -2,7 +2,7 @@ .browse-mode { .split-layout { - .pane.left { + .split-pane-component.pane.left { width: 15%; } } @@ -10,7 +10,7 @@ .edit-mode { .split-layout { - .pane.right { + .split-pane-component.pane.right { width: 15%; .pane.bottom { height: 30%; diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index b70d081289..a07ed38953 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -198,7 +198,7 @@ .browse-mode { .split-layout { - .pane.left { + .split-pane-component.pane.left { min-width: 150px; max-width: 50%; } @@ -207,10 +207,10 @@ .edit-mode { .split-layout { - .pane.right { + .split-pane-component.pane.right { min-width: 150px; max-width: 50%; - .pane.bottom { + .split-pane-component.pane.bottom { min-height: 50px; max-height: 80%; } From 6a8cc6d9daa3767d97aa894177e261761123561b Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 30 Jun 2015 16:07:55 -0700 Subject: [PATCH 13/15] [Frontend] Fixed line-height in .btn WTD-1404 --- platform/commonUI/general/res/css/theme-espresso.css | 2 +- platform/commonUI/general/res/sass/controls/_controls.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index be8bfc063b..d108dbf130 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -2017,7 +2017,7 @@ a.l-btn span { display: inline-block; font-size: 11.25px; height: 25px; - line-height: 25px; } + line-height: 22px; } /* line 194, ../sass/controls/_controls.scss */ label.checkbox.custom { diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index 9296dfc385..3f15a69491 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -182,7 +182,7 @@ display: inline-block; font-size: $h * $btnFontSizeToH; height: $h; - line-height: $h; + line-height: $h - 3; .icon:not(.invoke-menu) { // position: relative; // top: -0.04em; From 793d39b969826717b6066c7569b50b8f94f55fe8 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 1 Jul 2015 09:48:35 -0700 Subject: [PATCH 14/15] [Frontend] CSS and font updates ONLY from open1423 WTD-1404 CSS has error at this point due to missing $colorIconLink in _constants.scss; (cherry picked from commit 2a032bf) --- .../symbols/iconmoon.io-WTD-Symbols-v2.0.json | 154 +++++++++--------- .../general/res/fonts/symbols/wtdsymbols.eot | Bin 10120 -> 10072 bytes .../general/res/fonts/symbols/wtdsymbols.svg | 2 +- .../general/res/fonts/symbols/wtdsymbols.ttf | Bin 9944 -> 9896 bytes .../general/res/fonts/symbols/wtdsymbols.woff | Bin 10020 -> 9972 bytes .../commonUI/general/res/sass/_icons.scss | 73 ++++----- .../commonUI/general/res/sass/_mixins.scss | 10 ++ .../general/res/sass/items/_item.scss | 34 +++- .../commonUI/general/res/sass/tree/_tree.scss | 49 +++--- 9 files changed, 181 insertions(+), 141 deletions(-) diff --git a/platform/commonUI/general/res/fonts/symbols/iconmoon.io-WTD-Symbols-v2.0.json b/platform/commonUI/general/res/fonts/symbols/iconmoon.io-WTD-Symbols-v2.0.json index d2486a1eec..e2215bed12 100644 --- a/platform/commonUI/general/res/fonts/symbols/iconmoon.io-WTD-Symbols-v2.0.json +++ b/platform/commonUI/general/res/fonts/symbols/iconmoon.io-WTD-Symbols-v2.0.json @@ -1,8 +1,8 @@ { "metadata": { "name": "WTD Symbols v2.", - "lastOpened": 1435266597671, - "created": 1435266594435 + "lastOpened": 1435765696898, + "created": 1435764071891 }, "iconSets": [ { @@ -10,7 +10,7 @@ { "order": 1, "id": 75, - "prevSize": 16, + "prevSize": 32, "code": 123, "name": "icon-pointer-left", "tempChar": "" @@ -18,7 +18,7 @@ { "order": 3, "id": 74, - "prevSize": 16, + "prevSize": 32, "code": 125, "name": "icon-pointer-right", "tempChar": "" @@ -26,7 +26,7 @@ { "order": 4, "id": 73, - "prevSize": 16, + "prevSize": 32, "code": 80, "name": "icon-person", "tempChar": "" @@ -34,7 +34,7 @@ { "order": 5, "id": 72, - "prevSize": 16, + "prevSize": 32, "code": 232, "name": "icon-chain-links", "tempChar": "" @@ -42,7 +42,7 @@ { "order": 6, "id": 71, - "prevSize": 16, + "prevSize": 32, "code": 115, "name": "icon-database-in-brackets", "tempChar": "" @@ -50,7 +50,7 @@ { "order": 7, "id": 70, - "prevSize": 16, + "prevSize": 32, "code": 114, "name": "icon-refresh", "tempChar": "" @@ -58,7 +58,7 @@ { "order": 8, "id": 69, - "prevSize": 16, + "prevSize": 32, "code": 108, "name": "icon-lock", "tempChar": "" @@ -66,7 +66,7 @@ { "order": 9, "id": 68, - "prevSize": 16, + "prevSize": 32, "code": 51, "name": "icon-box-with-dashed-lines", "tempChar": "" @@ -74,7 +74,7 @@ { "order": 10, "id": 67, - "prevSize": 16, + "prevSize": 32, "code": 58880, "name": "icon-box-with-arrow-cursor", "tempChar": "" @@ -82,7 +82,7 @@ { "order": 11, "id": 66, - "prevSize": 16, + "prevSize": 32, "code": 65, "name": "icon-activity-mode", "tempChar": "" @@ -90,7 +90,7 @@ { "order": 12, "id": 65, - "prevSize": 16, + "prevSize": 32, "code": 97, "name": "icon-activity", "tempChar": "" @@ -98,7 +98,7 @@ { "order": 13, "id": 64, - "prevSize": 16, + "prevSize": 32, "code": 33, "name": "icon-alert-rect", "tempChar": "" @@ -106,7 +106,7 @@ { "order": 14, "id": 63, - "prevSize": 16, + "prevSize": 32, "code": 58883, "name": "icon-alert-triangle", "tempChar": "" @@ -114,7 +114,7 @@ { "order": 15, "id": 62, - "prevSize": 16, + "prevSize": 32, "code": 238, "name": "icon-arrow-double-down", "tempChar": "" @@ -122,7 +122,7 @@ { "order": 16, "id": 61, - "prevSize": 16, + "prevSize": 32, "code": 235, "name": "icon-arrow-double-up", "tempChar": "" @@ -130,7 +130,7 @@ { "order": 2, "id": 60, - "prevSize": 16, + "prevSize": 32, "code": 118, "name": "icon-arrow-down", "tempChar": "" @@ -138,7 +138,7 @@ { "order": 19, "id": 59, - "prevSize": 16, + "prevSize": 32, "code": 60, "name": "icon-arrow-left", "tempChar": "" @@ -146,7 +146,7 @@ { "order": 20, "id": 58, - "prevSize": 16, + "prevSize": 32, "code": 62, "name": "icon-arrow-right", "tempChar": "" @@ -154,7 +154,7 @@ { "order": 21, "id": 57, - "prevSize": 16, + "prevSize": 32, "code": 236, "name": "icon-arrow-tall-down", "tempChar": "" @@ -162,7 +162,7 @@ { "order": 22, "id": 56, - "prevSize": 16, + "prevSize": 32, "code": 237, "name": "icon-arrow-tall-up", "tempChar": "" @@ -170,7 +170,7 @@ { "order": 23, "id": 55, - "prevSize": 16, + "prevSize": 32, "code": 94, "name": "icon-arrow-up", "tempChar": "" @@ -178,7 +178,7 @@ { "order": 24, "id": 54, - "prevSize": 16, + "prevSize": 32, "code": 73, "name": "icon-arrows-out", "tempChar": "" @@ -186,7 +186,7 @@ { "order": 25, "id": 53, - "prevSize": 16, + "prevSize": 32, "code": 58893, "name": "icon-arrows-right-left", "tempChar": "" @@ -194,7 +194,7 @@ { "order": 33, "id": 52, - "prevSize": 16, + "prevSize": 32, "code": 53, "name": "icon-arrows-up-down", "tempChar": "" @@ -202,7 +202,7 @@ { "order": 26, "id": 51, - "prevSize": 16, + "prevSize": 32, "code": 42, "name": "icon-asterisk", "tempChar": "" @@ -210,7 +210,7 @@ { "order": 27, "id": 50, - "prevSize": 16, + "prevSize": 32, "code": 72, "name": "icon-autoflow-tabular", "tempChar": "" @@ -218,7 +218,7 @@ { "order": 28, "id": 49, - "prevSize": 16, + "prevSize": 32, "code": 224, "name": "icon-box-round-corners", "tempChar": "" @@ -226,7 +226,7 @@ { "order": 29, "id": 48, - "prevSize": 16, + "prevSize": 32, "code": 50, "name": "icon-check", "tempChar": "" @@ -234,7 +234,7 @@ { "order": 30, "id": 47, - "prevSize": 16, + "prevSize": 32, "code": 67, "name": "icon-clock", "tempChar": "" @@ -242,7 +242,7 @@ { "order": 31, "id": 46, - "prevSize": 16, + "prevSize": 32, "code": 46, "name": "icon-connectivity", "tempChar": "" @@ -250,7 +250,7 @@ { "order": 32, "id": 45, - "prevSize": 16, + "prevSize": 32, "code": 100, "name": "icon-database-query", "tempChar": "" @@ -258,7 +258,7 @@ { "order": 17, "id": 44, - "prevSize": 16, + "prevSize": 32, "code": 68, "name": "icon-database", "tempChar": "" @@ -266,7 +266,7 @@ { "order": 35, "id": 43, - "prevSize": 16, + "prevSize": 32, "code": 81, "name": "icon-dictionary", "tempChar": "" @@ -274,7 +274,7 @@ { "order": 36, "id": 42, - "prevSize": 16, + "prevSize": 32, "code": 242, "name": "icon-duplicate", "tempChar": "" @@ -282,7 +282,7 @@ { "order": 37, "id": 41, - "prevSize": 16, + "prevSize": 32, "code": 102, "name": "icon-folder-new", "tempChar": "" @@ -290,7 +290,7 @@ { "order": 38, "id": 40, - "prevSize": 16, + "prevSize": 32, "code": 70, "name": "icon-folder", "tempChar": "" @@ -298,7 +298,7 @@ { "order": 39, "id": 39, - "prevSize": 16, + "prevSize": 32, "code": 95, "name": "icon-fullscreen-collapse", "tempChar": "" @@ -306,7 +306,7 @@ { "order": 40, "id": 38, - "prevSize": 16, + "prevSize": 32, "code": 122, "name": "icon-fullscreen-expand", "tempChar": "" @@ -314,7 +314,7 @@ { "order": 41, "id": 37, - "prevSize": 16, + "prevSize": 32, "code": 71, "name": "icon-gear", "tempChar": "" @@ -322,7 +322,7 @@ { "order": 49, "id": 34, - "prevSize": 16, + "prevSize": 32, "code": 227, "name": "icon-image", "tempChar": "" @@ -330,7 +330,7 @@ { "order": 42, "id": 33, - "prevSize": 16, + "prevSize": 32, "code": 225, "name": "icon-layers", "tempChar": "" @@ -338,7 +338,7 @@ { "order": 43, "id": 32, - "prevSize": 16, + "prevSize": 32, "code": 76, "name": "icon-layout", "tempChar": "" @@ -346,15 +346,15 @@ { "order": 44, "id": 31, - "prevSize": 16, + "prevSize": 32, "code": 226, "name": "icon-line-horz", "tempChar": "" }, { - "order": 45, + "order": 75, "id": 30, - "prevSize": 16, + "prevSize": 32, "code": 244, "name": "icon-link", "tempChar": "" @@ -362,7 +362,7 @@ { "order": 46, "id": 29, - "prevSize": 16, + "prevSize": 32, "code": 88, "name": "icon-magnify-in", "tempChar": "" @@ -370,7 +370,7 @@ { "order": 47, "id": 28, - "prevSize": 16, + "prevSize": 32, "code": 89, "name": "icon-magnify-out", "tempChar": "" @@ -378,7 +378,7 @@ { "order": 48, "id": 27, - "prevSize": 16, + "prevSize": 32, "code": 77, "name": "icon-magnify", "tempChar": "" @@ -386,7 +386,7 @@ { "order": 34, "id": 26, - "prevSize": 16, + "prevSize": 32, "code": 109, "name": "icon-menu", "tempChar": "" @@ -394,7 +394,7 @@ { "order": 50, "id": 25, - "prevSize": 16, + "prevSize": 32, "code": 243, "name": "icon-move", "tempChar": "" @@ -402,7 +402,7 @@ { "order": 51, "id": 24, - "prevSize": 16, + "prevSize": 32, "code": 121, "name": "icon-new-window", "tempChar": "" @@ -410,7 +410,7 @@ { "order": 52, "id": 23, - "prevSize": 16, + "prevSize": 32, "code": 111, "name": "icon-object", "tempChar": "" @@ -418,7 +418,7 @@ { "order": 73, "id": 77, - "prevSize": 16, + "prevSize": 32, "code": 63, "name": "icon-object-unknown", "tempChar": "" @@ -426,7 +426,7 @@ { "order": 53, "id": 22, - "prevSize": 16, + "prevSize": 32, "code": 86, "name": "icon-packet", "tempChar": "" @@ -434,7 +434,7 @@ { "order": 54, "id": 21, - "prevSize": 16, + "prevSize": 32, "code": 234, "name": "icon-page", "tempChar": "" @@ -442,7 +442,7 @@ { "order": 55, "id": 20, - "prevSize": 16, + "prevSize": 32, "code": 241, "name": "icon-pause", "tempChar": "" @@ -450,7 +450,7 @@ { "order": 56, "id": 19, - "prevSize": 16, + "prevSize": 32, "code": 112, "name": "icon-pencil", "tempChar": "" @@ -458,7 +458,7 @@ { "order": 65, "id": 18, - "prevSize": 16, + "prevSize": 32, "code": 79, "name": "icon-people", "tempChar": "" @@ -466,7 +466,7 @@ { "order": 57, "id": 17, - "prevSize": 16, + "prevSize": 32, "code": 239, "name": "icon-play", "tempChar": "" @@ -474,7 +474,7 @@ { "order": 58, "id": 16, - "prevSize": 16, + "prevSize": 32, "code": 233, "name": "icon-plot-resource", "tempChar": "" @@ -482,7 +482,7 @@ { "order": 59, "id": 15, - "prevSize": 16, + "prevSize": 32, "code": 43, "name": "icon-plus", "tempChar": "" @@ -490,7 +490,7 @@ { "order": 60, "id": 76, - "prevSize": 16, + "prevSize": 32, "code": 45, "name": "icon-minus", "tempChar": "" @@ -498,7 +498,7 @@ { "order": 61, "id": 11, - "prevSize": 16, + "prevSize": 32, "code": 54, "name": "icon-sine", "tempChar": "" @@ -506,7 +506,7 @@ { "order": 62, "id": 10, - "prevSize": 16, + "prevSize": 32, "code": 228, "name": "icon-T", "tempChar": "" @@ -514,7 +514,7 @@ { "order": 63, "id": 9, - "prevSize": 16, + "prevSize": 32, "code": 116, "name": "icon-telemetry-panel", "tempChar": "" @@ -522,7 +522,7 @@ { "order": 64, "id": 8, - "prevSize": 16, + "prevSize": 32, "code": 84, "name": "icon-telemetry", "tempChar": "" @@ -530,7 +530,7 @@ { "order": 18, "id": 7, - "prevSize": 16, + "prevSize": 32, "code": 246, "name": "icon-thumbs-strip", "tempChar": "" @@ -538,7 +538,7 @@ { "order": 67, "id": 6, - "prevSize": 16, + "prevSize": 32, "code": 83, "name": "icon-timeline", "tempChar": "" @@ -546,7 +546,7 @@ { "order": 68, "id": 5, - "prevSize": 16, + "prevSize": 32, "code": 245, "name": "icon-timer", "tempChar": "" @@ -554,7 +554,7 @@ { "order": 69, "id": 4, - "prevSize": 16, + "prevSize": 32, "code": 90, "name": "icon-trash", "tempChar": "" @@ -562,7 +562,7 @@ { "order": 70, "id": 3, - "prevSize": 16, + "prevSize": 32, "code": 229, "name": "icon-two-parts-both", "tempChar": "" @@ -570,7 +570,7 @@ { "order": 71, "id": 2, - "prevSize": 16, + "prevSize": 32, "code": 231, "name": "icon-two-parts-one-only", "tempChar": "" @@ -578,7 +578,7 @@ { "order": 72, "id": 1, - "prevSize": 16, + "prevSize": 32, "code": 120, "name": "icon-x-heavy", "tempChar": "" @@ -586,7 +586,7 @@ { "order": 66, "id": 0, - "prevSize": 16, + "prevSize": 32, "code": 58946, "name": "icon-x", "tempChar": "" @@ -1297,7 +1297,7 @@ { "id": 30, "paths": [ - "M832 0h-640c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h640c105.6 0 192-86.4 192-192v-640c0-105.6-86.4-192-192-192zM832 640l-128-128-512 320 320-512-128-128h448v448z" + "M1024 512l-512-512v307.2l-512 204.8v256h512v256z" ], "attrs": [ {} diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot index de50409f28dffd2e389abbe738db0f274fa11031..278460b5a892863f3aa8a67a1b5d1bce9938b561 100755 GIT binary patch delta 251 zcmeD1zv0Ikq0YdtVj`6)H*=&49v`%^BH%^sWCDz{6E0Lzc~e}?~?>lJ=7$ym%-TOZGF^Ob>{1!NM##hu$* fVf5xH%D)+T=kVR(x8u*@-@t!NKxFeA)i;a)O;$$J delta 284 zcmccN*Wu6Fq0Yc?VZsE_c^1`07{Ffb@YWTYmhu=NXtGcYI}U|?V{ z%K!?nA7J4F@_zvNDjB&Y6>99vK(?|B0|TQ;PJVKtd8&OFP$~c@KPNY_qJSZqp&ZD6 z1LP~@CFZ8eUwIqHz@W+lRKKbqzqo{f87RY`wgV*3z|6ckpK+HQFB1d9{{t)x%m)|* z7{n)kkP - + diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf index d3ce41072429cbcdf867c2667e161b02447f7600..b113a531a4551bf778e4357d799af1542a883677 100755 GIT binary patch delta 235 zcmccNyTW&ZL;b|)YzGDgrVIuK1&xf<#1yuPo4XkplqN7RFqmZk1=tU;@B#TJfP9sV z+>#14cIF>I{u>4cMw6WUyKg`#1)%(#+{B6khG>RzAb$^#uaK9Rn<{_hZ5)t) z2dI8kL4I)w12a&DL9GKM&%n&QasMtkHAV)8{|8tYm=7?pF)(m43bG0+3bHW#141SS z#sf?Y|IVKM&+vcqdHJ7AG8Qw|*2nYPd}ZKf0U5+_ap(3{7`^$4(r-rIIed5c?f7%} PH}D@55ZU}jCqeBDZ0pQK&UVO1O-x~6P`U$D zUB`N=?aDmg$kb3oW! z*6v$wVnqQ1gDMA*uK>o;4CQ%=xv4-gpq-4XKv@0?*W0*){NfUz+pcWObq|dp8e18f3vj0PbL|Q8Efm~`E9;3aI*j{ mU|_hob9*a{-fW=!n~`@8-yMEC{v7@d{Ko`DHe0B^VFUolNk%6C delta 321 zcmez3yTnhd+~3WOfsp|S)KwU`LA2Tp2Byh{Okxvt-0LG47!)ER{Ik_FQWH}c7?gQ{ z@@62+)-M#E0Tcv^xd8bpAk2P%g)bwwqyi|G!N9<10>WzS%s+DSlY#0~<^a`zv3aU} zSZ-oP0Rw}o1yD=@jH4OK^AdAYfnq>A8CQX@{1vXZaRvFsB|x{aZ2WUlE{utR;r{^^ z2Id0{0u16nC5lRHqJkn~#)?K}rh+DF%7W^gjOvPl%npAW{0j^HnZRVjKL$pJ2F3%- z2MYZW;(r?&{vBXqX!z&Au=%z8PbQgFs&8+`^V@u7;AR0jh=JkajdXw^RM&2!a VU--lLTli1#-xJW;%%S>*5dal$R7?N> diff --git a/platform/commonUI/general/res/sass/_icons.scss b/platform/commonUI/general/res/sass/_icons.scss index 71be99d43a..e37aaba143 100644 --- a/platform/commonUI/general/res/sass/_icons.scss +++ b/platform/commonUI/general/res/sass/_icons.scss @@ -20,68 +20,63 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ .triangle { - $myColor: $colorKey; - $mySize: 10px; - @include triangle-right($mySize, $myColor); - &.triangle-down { - @include triangle-down($mySize, $myColor); - } + $myColor: $colorKey; + $mySize: 10px; + @include triangle-right($mySize, $myColor); + &.triangle-down { + @include triangle-down($mySize, $myColor); + } } .ui-symbol { - $c: $colorKey; - &.icon { - color: $c; - @include txtShdwSubtle(); - &.alert { - color: $colorAlert; - &:hover { - color: lighten($colorAlert, $ltGamma); - } - } - &.major { - font-size: 1.65em; - } - } + $c: $colorKey; + &.icon { + color: $c; + @include txtShdwSubtle(); + &.alert { + color: $colorAlert; + &:hover { + color: lighten($colorAlert, $ltGamma); + } + } + &.major { + font-size: 1.65em; + } + } } .bar .icon { - display: inline-block; + display: inline-block; } .invoke-menu { - //@include invokeMenu(); // $colorKey text-shadow: none; - display: inline-block; - //font-size: 0.8rem;// Normalizing for new icomoon symbols font - //vertical-align: middle;// Normalizing for new icomoon symbols font + display: inline-block; } .btn-menu .invoke-menu, .icon.major .invoke-menu { - margin-left: $interiorMarginSm; + margin-left: $interiorMarginSm; } -/* -.object-header .type-icon { - color: $colorKey; - margin-right: $interiorMarginSm; -} -*/ - .menu .type-icon, .tree-item .type-icon, .super-menu.menu .type-icon { - //font-size: $menuLineH * 0.8; //.93 // Normalizing for new icomoon symbols font - //line-height: $menuLineH * 1.13; // Normalizing for new icomoon symbols font - position: absolute; + position: absolute; } .tree-item .type-icon { - font-size: 16px; // 16px is crisp size + font-size: 16px; // 16px is crisp size } -.super-menu.menu.dropdown .icon { - //font-size: $menuLineH * 0.95 // Normalizing for new icomoon symbols font +.l-icon-link:before { + content: "\f4"; } +.l-icon-alert { + display: none !important; // Remove this when alerts are enabled + &:before { + color: $colorAlert; + content: "!"; + } +} \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/_mixins.scss b/platform/commonUI/general/res/sass/_mixins.scss index 2674bc8527..dc37d94fb6 100644 --- a/platform/commonUI/general/res/sass/_mixins.scss +++ b/platform/commonUI/general/res/sass/_mixins.scss @@ -26,6 +26,16 @@ width: auto; height: auto; } +@mixin ancillaryIcon($d, $c) { + // Used for small icons used in combination with larger icons, + // like the link and alert icons in tree items. + color: $c; + font-size: $d; + line-height: $d; + height: $d; + width: $d; +} + @mixin trans-prop-nice($props, $t: 500ms) { @if $t == 0 { @include transition-property(none); diff --git a/platform/commonUI/general/res/sass/items/_item.scss b/platform/commonUI/general/res/sass/items/_item.scss index 5a5cdaf9a3..86592f77de 100644 --- a/platform/commonUI/general/res/sass/items/_item.scss +++ b/platform/commonUI/general/res/sass/items/_item.scss @@ -29,6 +29,9 @@ &.grid-item { //div { @include test() } $d: $ueBrowseGridItemLg; + //$iconD: 100px; + $iconMargin: 40px; + $iconD: ($d - ($iconMargin * 2)) * 0.85; $transTime: 200ms; @include btnSubtle($colorItemBase); box-sizing: border-box; @@ -39,12 +42,12 @@ margin-bottom: $interiorMarginSm; margin-right: $interiorMarginSm; position: relative; - .item-main .item-type { - @include trans-prop-nice("color", $transTime); - } &:hover .item-main { .item-type { color: $colorKey !important; + .l-icon-link { + color: $colorIconLink; + } } .item-open { //display: block; @@ -63,7 +66,10 @@ .left, .right { width: auto; .icon { - margin-left: $interiorMargin; + margin-left: $interiorMarginSm; + &.l-icon-link { + color: $colorIconLink; + } } } } @@ -80,10 +86,28 @@ line-height: $lh; z-index: 1; .item-type { + //@include trans-prop-nice("color", $transTime); + @include absPosDefault($iconMargin, false); + //@include test(red); color: $colorItemFg; text-align: center; - font-size: 6em; + font-size: $iconD * 0.95; //6em; + line-height: $iconD; + bottom: auto; + height: $iconD; + top: $iconMargin - 10; //line-height: $lh; + .l-icon-link { + // When the link icon is in the item-type icon holder + color: darken($colorIconLink, 25%); + height: 36px; + line-height: 36px; + position: absolute; + font-size: 32px; + left: 0px; + bottom: 10px; + z-index: 2; + } } .item-open { //@include test(); diff --git a/platform/commonUI/general/res/sass/tree/_tree.scss b/platform/commonUI/general/res/sass/tree/_tree.scss index 19160a288b..d20ba8dfa5 100644 --- a/platform/commonUI/general/res/sass/tree/_tree.scss +++ b/platform/commonUI/general/res/sass/tree/_tree.scss @@ -19,6 +19,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ + ul.tree { @include menuUlReset(); li { @@ -29,7 +30,7 @@ ul.tree { @include border-radius($basicCr); @include single-transition(background-color, 0.25s); display: block; - font-size: 0.80em; + font-size: 0.8em; height: $menuLineH; line-height: $menuLineH; margin-bottom: $interiorMarginSm; @@ -48,34 +49,44 @@ ul.tree { .label { display: block; -// border: 1px solid rgba(blue, 0.5); +// @include test(orange); @include absPosDefault(); - left: $runningItemW + $interiorMargin; + //left: $runningItemW + $interiorMargin; // Adding pad to left to make room for link icon + left: $runningItemW; .type-icon { - @include absPosDefault(); + @include absPosDefault(0, false); @include txtShdwSubtle(0.6); color: $colorItemTreeIcon; - .alert { - @include txtShdwSubtle(0.3); - background: $colorBodyBg; - color: $colorAlert; - font-size: 0.7em; - margin-top: -3px; - top: 0; - right: auto; - bottom: auto; - left: 9px; - height: auto; - width: auto; - position: absolute; - z-index: 2; + left: $interiorMargin; + right: auto; width: 1em; + + .icon { + &.l-icon-link, + &.l-icon-alert { + @include txtShdwSubtle(1); + position: absolute; + z-index: 2; + } + &.l-icon-alert { + $d: 8px; + @include ancillaryIcon($d, $colorAlert); + top: 1px; + right: -2px; + } + &.l-icon-link { + $d: 8px; + @include ancillaryIcon($d, $colorIconLink); + left: -3px; + bottom: 5px; + + } } } .title-label { @include absPosDefault(); display: block; - left: $runningItemW + ($interiorMargin); + left: $runningItemW + ($interiorMargin * 3); //right: $treeContextTriggerW + $interiorMargin; overflow: hidden; text-overflow: ellipsis; From fd98bdae4cf0e3d78918763d870c8feefe17ae18 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 1 Jul 2015 10:07:47 -0700 Subject: [PATCH 15/15] [Frontend] Added $colorIconLink in _constants WTD-1404 --- platform/commonUI/general/res/css/forms.css | 6 +- platform/commonUI/general/res/css/items.css | 90 ++++++++------ .../general/res/css/theme-espresso.css | 110 +++++++++--------- platform/commonUI/general/res/css/tree.css | 101 +++++++++------- .../commonUI/general/res/sass/_constants.scss | 1 + 5 files changed, 170 insertions(+), 138 deletions(-) diff --git a/platform/commonUI/general/res/css/forms.css b/platform/commonUI/general/res/css/forms.css index a21995d9f3..ec41844773 100644 --- a/platform/commonUI/general/res/css/forms.css +++ b/platform/commonUI/general/res/css/forms.css @@ -392,7 +392,7 @@ input[type="text"] { margin: 0 0 2px 2px; overflow: hidden; position: relative; } - /* line 152, ../sass/_mixins.scss */ + /* line 162, ../sass/_mixins.scss */ .form-control.select:not(.disabled):hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzYzNjM2MyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU3NTc1NyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -401,10 +401,10 @@ input[type="text"] { background-image: -webkit-linear-gradient(#636363, #575757); background-image: linear-gradient(#636363, #575757); color: #bdbdbd; } - /* line 155, ../sass/_mixins.scss */ + /* line 165, ../sass/_mixins.scss */ .form-control.select:not(.disabled):hover.btn-menu .invoke-menu { color: #878787; } - /* line 160, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .form-control.select.btn-menu .invoke-menu { color: #757575; } /* line 29, ../sass/forms/_selects.scss */ diff --git a/platform/commonUI/general/res/css/items.css b/platform/commonUI/general/res/css/items.css index c40b3f7bd9..c0ba5edecf 100644 --- a/platform/commonUI/general/res/css/items.css +++ b/platform/commonUI/general/res/css/items.css @@ -136,7 +136,7 @@ margin-bottom: 3px; margin-right: 3px; position: relative; } - /* line 152, ../sass/_mixins.scss */ + /* line 162, ../sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzcwNzA3MCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzYzNjM2MyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -145,65 +145,79 @@ background-image: -webkit-linear-gradient(#707070, #636363); background-image: linear-gradient(#707070, #636363); color: #bdbdbd; } - /* line 155, ../sass/_mixins.scss */ + /* line 165, ../sass/_mixins.scss */ .items-holder .item.grid-item:not(.disabled):hover.btn-menu .invoke-menu { color: #949494; } - /* line 160, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .items-holder .item.grid-item.btn-menu .invoke-menu { color: #828282; } - /* line 42, ../sass/items/_item.scss */ - .items-holder .item.grid-item .item-main .item-type { - -moz-transition-property: "color"; - -o-transition-property: "color"; - -webkit-transition-property: "color"; - transition-property: "color"; - -moz-transition-duration: 200ms; - -o-transition-duration: 200ms; - -webkit-transition-duration: 200ms; - transition-duration: 200ms; - -moz-transition-timing-function: ease-in-out; - -o-transition-timing-function: ease-in-out; - -webkit-transition-timing-function: ease-in-out; - transition-timing-function: ease-in-out; } /* line 46, ../sass/items/_item.scss */ .items-holder .item.grid-item:hover .item-main .item-type { color: #0099cc !important; } - /* line 49, ../sass/items/_item.scss */ + /* line 48, ../sass/items/_item.scss */ + .items-holder .item.grid-item:hover .item-main .item-type .l-icon-link { + color: #49dedb; } + /* line 52, ../sass/items/_item.scss */ .items-holder .item.grid-item:hover .item-main .item-open { opacity: 1; } - /* line 54, ../sass/items/_item.scss */ + /* line 57, ../sass/items/_item.scss */ .items-holder .item.grid-item .contents { top: 5px; right: 5px; bottom: 5px; left: 5px; } - /* line 58, ../sass/items/_item.scss */ + /* line 61, ../sass/items/_item.scss */ .items-holder .item.grid-item .bar.top-bar.abs { bottom: auto; height: 20px; line-height: 20px; z-index: 5; } - /* line 63, ../sass/items/_item.scss */ + /* line 66, ../sass/items/_item.scss */ .items-holder .item.grid-item .bar.top-bar.abs .left, .items-holder .item.grid-item .bar.top-bar.abs .right { width: auto; } - /* line 65, ../sass/items/_item.scss */ + /* line 68, ../sass/items/_item.scss */ .items-holder .item.grid-item .bar.top-bar.abs .left .icon, .items-holder .item.grid-item .bar.top-bar.abs .right .icon { - margin-left: 5px; } - /* line 70, ../sass/items/_item.scss */ + margin-left: 3px; } + /* line 70, ../sass/items/_item.scss */ + .items-holder .item.grid-item .bar.top-bar.abs .left .icon.l-icon-link, .items-holder .item.grid-item .bar.top-bar.abs .right .icon.l-icon-link { + color: #49dedb; } + /* line 76, ../sass/items/_item.scss */ .items-holder .item.grid-item .bar.bottom-bar.abs { top: auto; height: 30px; padding: 5px; } - /* line 76, ../sass/items/_item.scss */ + /* line 82, ../sass/items/_item.scss */ .items-holder .item.grid-item .item-main { line-height: 160px; z-index: 1; } - /* line 82, ../sass/items/_item.scss */ + /* line 88, ../sass/items/_item.scss */ .items-holder .item.grid-item .item-main .item-type { + overflow: false; + position: absolute; + top: 40px; + right: 40px; + bottom: 40px; + left: 40px; + width: auto; + height: auto; color: #737373; text-align: center; - font-size: 6em; } - /* line 88, ../sass/items/_item.scss */ + font-size: 96.9px; + line-height: 102px; + bottom: auto; + height: 102px; + top: 30px; } + /* line 100, ../sass/items/_item.scss */ + .items-holder .item.grid-item .item-main .item-type .l-icon-link { + color: #1a8e8b; + height: 36px; + line-height: 36px; + position: absolute; + font-size: 32px; + left: 0px; + bottom: 10px; + z-index: 2; } + /* line 112, ../sass/items/_item.scss */ .items-holder .item.grid-item .item-main .item-open { -moz-transition-property: "opacity"; -o-transition-property: "opacity"; @@ -223,17 +237,17 @@ width: 50px; pointer-events: none; text-align: right; } - /* line 100, ../sass/items/_item.scss */ + /* line 124, ../sass/items/_item.scss */ .items-holder .item.grid-item .title { text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; color: #cccccc; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; } - /* line 108, ../sass/items/_item.scss */ + /* line 132, ../sass/items/_item.scss */ .items-holder .item.grid-item .details { font-size: 0.8em; } - /* line 111, ../sass/items/_item.scss */ + /* line 135, ../sass/items/_item.scss */ .items-holder .item.grid-item.selected { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzBhYzJmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwYjRmMCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -255,7 +269,7 @@ color: #999; display: inline-block; color: #80dfff; } - /* line 152, ../sass/_mixins.scss */ + /* line 162, ../sass/_mixins.scss */ .items-holder .item.grid-item.selected:not(.disabled):hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzJlY2JmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzE0YzRmZiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -264,21 +278,21 @@ background-image: -webkit-linear-gradient(#2ecbff, #14c4ff); background-image: linear-gradient(#2ecbff, #14c4ff); color: #bdbdbd; } - /* line 155, ../sass/_mixins.scss */ + /* line 165, ../sass/_mixins.scss */ .items-holder .item.grid-item.selected:not(.disabled):hover.btn-menu .invoke-menu { color: #75ddff; } - /* line 160, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .items-holder .item.grid-item.selected.btn-menu .invoke-menu { color: #52d4ff; } - /* line 116, ../sass/items/_item.scss */ + /* line 140, ../sass/items/_item.scss */ .items-holder .item.grid-item.selected .item-type, .items-holder .item.grid-item.selected .top-bar .icon:not(.alert) { color: #80dfff; } - /* line 117, ../sass/items/_item.scss */ + /* line 141, ../sass/items/_item.scss */ .items-holder .item.grid-item.selected .item-main .item-open { color: #80dfff; } - /* line 118, ../sass/items/_item.scss */ + /* line 142, ../sass/items/_item.scss */ .items-holder .item.grid-item.selected .title { color: white; } - /* line 120, ../sass/items/_item.scss */ + /* line 144, ../sass/items/_item.scss */ .items-holder .item.grid-item.selected:hover .item-main .item-type { color: white !important; } diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index d108dbf130..e3bbcd7448 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -92,7 +92,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 5, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 5, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -113,38 +113,38 @@ time, mark, audio, video { font-size: 100%; vertical-align: baseline; } -/* line 22, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 22, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html { line-height: 1; } -/* line 24, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 24, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ ol, ul { list-style: none; } -/* line 26, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 26, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ table { border-collapse: collapse; border-spacing: 0; } -/* line 28, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 28, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; } -/* line 30, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 30, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q, blockquote { quotes: none; } - /* line 103, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ + /* line 103, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; } -/* line 32, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 32, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ a img { border: none; } -/* line 116, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 116, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } @@ -1075,27 +1075,33 @@ mct-container { text-shadow: none; display: inline-block; } -/* line 60, ../sass/_icons.scss */ +/* line 57, ../sass/_icons.scss */ .btn-menu .invoke-menu, .icon.major .invoke-menu { margin-left: 3px; } -/* -.object-header .type-icon { - color: $colorKey; - margin-right: $interiorMarginSm; -} -*/ -/* line 72, ../sass/_icons.scss */ +/* line 62, ../sass/_icons.scss */ .menu .type-icon, .tree-item .type-icon, .super-menu.menu .type-icon { position: absolute; } -/* line 80, ../sass/_icons.scss */ +/* line 68, ../sass/_icons.scss */ .tree-item .type-icon { font-size: 16px; } +/* line 72, ../sass/_icons.scss */ +.l-icon-link:before { + content: "\f4"; } + +/* line 76, ../sass/_icons.scss */ +.l-icon-alert { + display: none !important; } + /* line 78, ../sass/_icons.scss */ + .l-icon-alert:before { + color: #ff3c00; + content: "!"; } + /*.s-limit-upr, .s-limit-lwr { $a: 0.5; @@ -1446,7 +1452,7 @@ mct-container { color: #999; display: inline-block; color: #ccf2ff; } - /* line 152, ../sass/_mixins.scss */ + /* line 162, ../sass/_mixins.scss */ .btn.major:not(.disabled):hover, .s-btn.major:not(.disabled):hover, .major.icon-btn:not(.disabled):hover, @@ -1458,13 +1464,13 @@ mct-container { background-image: -webkit-linear-gradient(#2ecbff, #14c4ff); background-image: linear-gradient(#2ecbff, #14c4ff); color: #bdbdbd; } - /* line 155, ../sass/_mixins.scss */ + /* line 165, ../sass/_mixins.scss */ .btn.major:not(.disabled):hover.btn-menu .invoke-menu, .s-btn.major:not(.disabled):hover.btn-menu .invoke-menu, .major.icon-btn:not(.disabled):hover.btn-menu .invoke-menu, .major.s-icon-btn:not(.disabled):hover.btn-menu .invoke-menu { color: #75ddff; } - /* line 160, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .btn.major.btn-menu .invoke-menu, .s-btn.major.btn-menu .invoke-menu, .major.btn-menu.icon-btn .invoke-menu, @@ -1494,7 +1500,7 @@ mct-container { border-top: 1px solid #2ecbff; color: #ccf2ff; display: inline-block; } - /* line 152, ../sass/_mixins.scss */ + /* line 162, ../sass/_mixins.scss */ .btn.major:hover:not(.disabled):hover, .s-btn.major:hover:not(.disabled):hover, .major.icon-btn:hover:not(.disabled):hover, @@ -1506,13 +1512,13 @@ mct-container { background-image: -webkit-linear-gradient(#47d1ff, #2ecbff); background-image: linear-gradient(#47d1ff, #2ecbff); color: white; } - /* line 155, ../sass/_mixins.scss */ + /* line 165, ../sass/_mixins.scss */ .btn.major:hover:not(.disabled):hover.btn-menu .invoke-menu, .s-btn.major:hover:not(.disabled):hover.btn-menu .invoke-menu, .major.icon-btn:hover:not(.disabled):hover.btn-menu .invoke-menu, .major.s-icon-btn:hover:not(.disabled):hover.btn-menu .invoke-menu { color: #8fe3ff; } - /* line 160, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .btn.major:hover.btn-menu .invoke-menu, .s-btn.major:hover.btn-menu .invoke-menu, .major.icon-btn:hover.btn-menu .invoke-menu, @@ -1548,7 +1554,7 @@ mct-container { border-top: 1px solid #8a8a8a; color: #cccccc; display: inline-block; } - /* line 152, ../sass/_mixins.scss */ + /* line 162, ../sass/_mixins.scss */ .btn.subtle:not(.disabled):hover, .s-btn.subtle:not(.disabled):hover, .subtle.icon-btn:not(.disabled):hover, @@ -1560,13 +1566,13 @@ mct-container { background-image: -webkit-linear-gradient(#969696, #8a8a8a); background-image: linear-gradient(#969696, #8a8a8a); color: #f0f0f0; } - /* line 155, ../sass/_mixins.scss */ + /* line 165, ../sass/_mixins.scss */ .btn.subtle:not(.disabled):hover.btn-menu .invoke-menu, .s-btn.subtle:not(.disabled):hover.btn-menu .invoke-menu, .subtle.icon-btn:not(.disabled):hover.btn-menu .invoke-menu, .subtle.s-icon-btn:not(.disabled):hover.btn-menu .invoke-menu { color: #bababa; } - /* line 160, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .btn.subtle.btn-menu .invoke-menu, .s-btn.subtle.btn-menu .invoke-menu, .subtle.btn-menu.icon-btn .invoke-menu, @@ -1599,7 +1605,7 @@ mct-container { border-top: 1px solid #575757; color: #999; display: inline-block; } - /* line 152, ../sass/_mixins.scss */ + /* line 162, ../sass/_mixins.scss */ .btn.very-subtle:not(.disabled):hover, .btn.s-very-subtle:not(.disabled):hover, .s-btn.very-subtle:not(.disabled):hover, .very-subtle.icon-btn:not(.disabled):hover, @@ -1614,7 +1620,7 @@ mct-container { background-image: -webkit-linear-gradient(#636363, #575757); background-image: linear-gradient(#636363, #575757); color: #bdbdbd; } - /* line 155, ../sass/_mixins.scss */ + /* line 165, ../sass/_mixins.scss */ .btn.very-subtle:not(.disabled):hover.btn-menu .invoke-menu, .btn.s-very-subtle:not(.disabled):hover.btn-menu .invoke-menu, .s-btn.very-subtle:not(.disabled):hover.btn-menu .invoke-menu, .very-subtle.icon-btn:not(.disabled):hover.btn-menu .invoke-menu, @@ -1623,7 +1629,7 @@ mct-container { .s-very-subtle.icon-btn:not(.disabled):hover.btn-menu .invoke-menu, .s-very-subtle.s-icon-btn:not(.disabled):hover.btn-menu .invoke-menu { color: #878787; } - /* line 160, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .btn.very-subtle.btn-menu .invoke-menu, .btn.s-very-subtle.btn-menu .invoke-menu, .s-btn.very-subtle.btn-menu .invoke-menu, .very-subtle.btn-menu.icon-btn .invoke-menu, @@ -1659,7 +1665,7 @@ mct-container { border-top: 1px solid #fe9510; color: #fff; display: inline-block; } - /* line 152, ../sass/_mixins.scss */ + /* line 162, ../sass/_mixins.scss */ .btn.very-subtle.paused:not(.disabled):hover, .btn.s-very-subtle.paused:not(.disabled):hover, .s-btn.very-subtle.paused:not(.disabled):hover, .very-subtle.paused.icon-btn:not(.disabled):hover, @@ -1674,7 +1680,7 @@ mct-container { background-image: -webkit-linear-gradient(#fea029, #fe9510); background-image: linear-gradient(#fea029, #fe9510); color: white; } - /* line 155, ../sass/_mixins.scss */ + /* line 165, ../sass/_mixins.scss */ .btn.very-subtle.paused:not(.disabled):hover.btn-menu .invoke-menu, .btn.s-very-subtle.paused:not(.disabled):hover.btn-menu .invoke-menu, .s-btn.very-subtle.paused:not(.disabled):hover.btn-menu .invoke-menu, .very-subtle.paused.icon-btn:not(.disabled):hover.btn-menu .invoke-menu, @@ -1683,7 +1689,7 @@ mct-container { .s-very-subtle.paused.icon-btn:not(.disabled):hover.btn-menu .invoke-menu, .s-very-subtle.paused.s-icon-btn:not(.disabled):hover.btn-menu .invoke-menu { color: #fec070; } - /* line 160, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .btn.very-subtle.paused.btn-menu .invoke-menu, .btn.s-very-subtle.paused.btn-menu .invoke-menu, .s-btn.very-subtle.paused.btn-menu .invoke-menu, .very-subtle.paused.btn-menu.icon-btn .invoke-menu, @@ -2135,7 +2141,7 @@ label.checkbox.custom { color: lighten($c, 10%); } }*/ } - /* line 152, ../sass/_mixins.scss */ + /* line 162, ../sass/_mixins.scss */ .btn-menu:not(.disabled):hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzYzNjM2MyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU3NTc1NyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2144,10 +2150,10 @@ label.checkbox.custom { background-image: -webkit-linear-gradient(#636363, #575757); background-image: linear-gradient(#636363, #575757); color: #bdbdbd; } - /* line 155, ../sass/_mixins.scss */ + /* line 165, ../sass/_mixins.scss */ .btn-menu:not(.disabled):hover.btn-menu .invoke-menu { color: #878787; } - /* line 160, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .btn-menu.btn-menu .invoke-menu { color: #757575; } /* line 285, ../sass/controls/_controls.scss */ @@ -2293,7 +2299,7 @@ label.checkbox.custom { auto: 0; bottom: auto; left: auto; } - /* line 152, ../sass/_mixins.scss */ + /* line 162, ../sass/_mixins.scss */ .slider .knob:not(.disabled):hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzYzNjM2MyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU3NTc1NyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -2302,13 +2308,13 @@ label.checkbox.custom { background-image: -webkit-linear-gradient(#636363, #575757); background-image: linear-gradient(#636363, #575757); color: #bdbdbd; } - /* line 155, ../sass/_mixins.scss */ + /* line 165, ../sass/_mixins.scss */ .slider .knob:not(.disabled):hover.btn-menu .invoke-menu { color: #878787; } - /* line 160, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .slider .knob.btn-menu .invoke-menu { color: #757575; } - /* line 176, ../sass/_mixins.scss */ + /* line 186, ../sass/_mixins.scss */ .slider .knob:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -2332,7 +2338,7 @@ label.checkbox.custom { left: 2px; bottom: 5px; top: 5px; } - /* line 198, ../sass/_mixins.scss */ + /* line 208, ../sass/_mixins.scss */ .slider .knob:not(.disabled):hover:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -2504,14 +2510,14 @@ label.checkbox.custom { padding: 3px 0; position: absolute; z-index: 10; } - /* line 160, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .menu-element .menu.btn-menu .invoke-menu { color: #828282; } /* line 37, ../sass/controls/_menus.scss */ .menu-element .menu ul { margin: 0; padding: 0; } - /* line 266, ../sass/_mixins.scss */ + /* line 276, ../sass/_mixins.scss */ .menu-element .menu ul li { list-style-type: none; margin: 0; @@ -2562,7 +2568,7 @@ label.checkbox.custom { border-top: 1px solid #919191; color: #999; display: inline-block; } - /* line 160, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .menu-element .context-menu.btn-menu .invoke-menu, .menu-element .super-menu.btn-menu .invoke-menu { color: #b0b0b0; } @@ -3436,7 +3442,7 @@ input[type="text"] { margin: 0 0 2px 2px; overflow: hidden; position: relative; } - /* line 152, ../sass/_mixins.scss */ + /* line 162, ../sass/_mixins.scss */ .form-control.select:not(.disabled):hover { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzYzNjM2MyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU3NTc1NyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -3445,10 +3451,10 @@ input[type="text"] { background-image: -webkit-linear-gradient(#636363, #575757); background-image: linear-gradient(#636363, #575757); color: #bdbdbd; } - /* line 155, ../sass/_mixins.scss */ + /* line 165, ../sass/_mixins.scss */ .form-control.select:not(.disabled):hover.btn-menu .invoke-menu { color: #878787; } - /* line 160, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .form-control.select.btn-menu .invoke-menu { color: #757575; } /* line 29, ../sass/forms/_selects.scss */ @@ -4067,7 +4073,7 @@ input[type="text"] { bottom: 15%; left: 15%; z-index: 101; } - /* line 160, ../sass/_mixins.scss */ + /* line 170, ../sass/_mixins.scss */ .overlay > .holder.btn-menu .invoke-menu { color: #757575; } /* line 45, ../sass/overlay/_overlay.scss */ @@ -4574,7 +4580,7 @@ input[type="text"] { right: 0; width: auto; height: 5px; } - /* line 176, ../sass/_mixins.scss */ + /* line 186, ../sass/_mixins.scss */ .split-layout.horizontal > .splitter:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -4598,7 +4604,7 @@ input[type="text"] { top: 2px; left: 5px; right: 5px; } - /* line 198, ../sass/_mixins.scss */ + /* line 208, ../sass/_mixins.scss */ .split-layout.horizontal > .splitter:not(.disabled):hover:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -4628,7 +4634,7 @@ input[type="text"] { bottom: 0; cursor: col-resize; width: 5px; } - /* line 176, ../sass/_mixins.scss */ + /* line 186, ../sass/_mixins.scss */ .split-layout.vertical > .splitter:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; @@ -4652,7 +4658,7 @@ input[type="text"] { left: 2px; bottom: 5px; top: 5px; } - /* line 198, ../sass/_mixins.scss */ + /* line 208, ../sass/_mixins.scss */ .split-layout.vertical > .splitter:not(.disabled):hover:before { -moz-transition-property: "border-color"; -o-transition-property: "border-color"; diff --git a/platform/commonUI/general/res/css/tree.css b/platform/commonUI/general/res/css/tree.css index ab47fcc739..f45504233e 100644 --- a/platform/commonUI/general/res/css/tree.css +++ b/platform/commonUI/general/res/css/tree.css @@ -99,20 +99,20 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 22, ../sass/tree/_tree.scss */ +/* line 23, ../sass/tree/_tree.scss */ ul.tree { margin: 0; padding: 0; } - /* line 266, ../sass/_mixins.scss */ + /* line 276, ../sass/_mixins.scss */ ul.tree li { list-style-type: none; margin: 0; padding: 0; } - /* line 24, ../sass/tree/_tree.scss */ + /* line 25, ../sass/tree/_tree.scss */ ul.tree li { display: block; position: relative; } - /* line 27, ../sass/tree/_tree.scss */ + /* line 28, ../sass/tree/_tree.scss */ ul.tree li span.tree-item { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -122,21 +122,21 @@ ul.tree { -webkit-transition: background-color 0.25s; transition: background-color 0.25s; display: block; - font-size: 0.80em; + font-size: 0.8em; height: 1.4rem; line-height: 1.4rem; margin-bottom: 3px; position: relative; } - /* line 38, ../sass/tree/_tree.scss */ + /* line 39, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .view-control { display: inline-block; margin-left: 5px; font-size: 0.75em; width: 10px; } - /* line 44, ../sass/tree/_tree.scss */ + /* line 45, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .view-control:hover { color: #ffc700; } - /* line 49, ../sass/tree/_tree.scss */ + /* line 50, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .label { display: block; overflow: hidden; @@ -147,35 +147,46 @@ ul.tree { left: 0px; width: auto; height: auto; - left: 20px; } - /* line 55, ../sass/tree/_tree.scss */ + left: 15px; } + /* line 57, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .label .type-icon { - overflow: hidden; + overflow: false; position: absolute; - top: 0px; - right: 0px; - bottom: 0px; - left: 0px; + top: 0; + right: 0; + bottom: 0; + left: 0; width: auto; height: auto; text-shadow: rgba(0, 0, 0, 0.6) 0 1px 2px; - color: #0099cc; } - /* line 59, ../sass/tree/_tree.scss */ - ul.tree li span.tree-item .label .type-icon .alert { - text-shadow: rgba(0, 0, 0, 0.3) 0 1px 2px; - background: #333; - color: #ff3c00; - font-size: 0.7em; - margin-top: -3px; - top: 0; - right: auto; - bottom: auto; - left: 9px; - height: auto; - width: auto; + color: #0099cc; + left: 5px; + right: auto; + width: 1em; } + /* line 65, ../sass/tree/_tree.scss */ + ul.tree li span.tree-item .label .type-icon .icon.l-icon-link, ul.tree li span.tree-item .label .type-icon .icon.l-icon-alert { + text-shadow: black 0 1px 2px; position: absolute; z-index: 2; } - /* line 75, ../sass/tree/_tree.scss */ + /* line 71, ../sass/tree/_tree.scss */ + ul.tree li span.tree-item .label .type-icon .icon.l-icon-alert { + color: #ff3c00; + font-size: 8px; + line-height: 8px; + height: 8px; + width: 8px; + top: 1px; + right: -2px; } + /* line 77, ../sass/tree/_tree.scss */ + ul.tree li span.tree-item .label .type-icon .icon.l-icon-link { + color: #49dedb; + font-size: 8px; + line-height: 8px; + height: 8px; + width: 8px; + left: -3px; + bottom: 5px; } + /* line 86, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .label .title-label { overflow: hidden; position: absolute; @@ -186,55 +197,55 @@ ul.tree { width: auto; height: auto; display: block; - left: 20px; + left: 30px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } - /* line 86, ../sass/tree/_tree.scss */ + /* line 97, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.loading { pointer-events: none; } - /* line 88, ../sass/tree/_tree.scss */ + /* line 99, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.loading .label { opacity: 0.5; } - /* line 90, ../sass/tree/_tree.scss */ + /* line 101, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.loading .label .title-label { font-style: italic; } - /* line 94, ../sass/tree/_tree.scss */ + /* line 105, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.loading .wait-spinner { margin-left: 14px; } - /* line 99, ../sass/tree/_tree.scss */ + /* line 110, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.selected { background: #005177; color: #fff; } - /* line 103, ../sass/tree/_tree.scss */ + /* line 114, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.selected .view-control { color: #0099cc; } - /* line 106, ../sass/tree/_tree.scss */ + /* line 117, ../sass/tree/_tree.scss */ ul.tree li span.tree-item.selected .label .type-icon { color: #fff; } - /* line 112, ../sass/tree/_tree.scss */ + /* line 123, ../sass/tree/_tree.scss */ ul.tree li span.tree-item:not(.selected):hover { background: #404040; color: #cccccc; } - /* line 115, ../sass/tree/_tree.scss */ + /* line 126, ../sass/tree/_tree.scss */ ul.tree li span.tree-item:not(.selected):hover .context-trigger { display: block; } - /* line 118, ../sass/tree/_tree.scss */ + /* line 129, ../sass/tree/_tree.scss */ ul.tree li span.tree-item:not(.selected):hover .icon { color: #33ccff; } - /* line 124, ../sass/tree/_tree.scss */ + /* line 135, ../sass/tree/_tree.scss */ ul.tree li span.tree-item:not(.loading) { cursor: pointer; } - /* line 128, ../sass/tree/_tree.scss */ + /* line 139, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .context-trigger { top: -1px; position: absolute; right: 3px; } - /* line 134, ../sass/tree/_tree.scss */ + /* line 145, ../sass/tree/_tree.scss */ ul.tree li span.tree-item .context-trigger .invoke-menu { font-size: 0.75em; height: 0.9rem; line-height: 0.9rem; } - /* line 143, ../sass/tree/_tree.scss */ + /* line 154, ../sass/tree/_tree.scss */ ul.tree ul.tree { margin-left: 15px; } diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss index e44e29df47..714338637f 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -42,6 +42,7 @@ $colorKeySelectedBg: #005177; $colorKeyFg: #fff; $colorAlt1: #ffc700; $colorAlert: #ff3c00; +$colorIconLink: #49dedb; $colorPausedBg: #c56f01; $colorPausedFg: #fff; $colorCreateBtn: $colorKey;