From a0885fa2d9ce75ad3952b3fe05395dcf4cc96c42 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Sun, 13 Feb 2011 20:34:36 +0100 Subject: [PATCH] incorporate toolkit winstripe changes until 2011-02-13 --- .../global/icons/information-tabmodal-64.png | Bin 1176 -> 0 bytes .../global/icons/question-tabmodal-64.png | Bin 1590 -> 0 bytes EarlyBlue/global/tabprompts.css | 25 +++------ EarlyBlue/global/webConsole.css | 53 +++++++++++------- EarlyBlue/mozapps/extensions/extensions.css | 4 +- .../global/icons/information-tabmodal-64.png | Bin 1129 -> 0 bytes .../global/icons/question-tabmodal-64.png | Bin 1440 -> 0 bytes LCARStrek/global/tabprompts.css | 25 +++------ LCARStrek/global/webConsole.css | 52 ++++++++++------- LCARStrek/mozapps/extensions/extensions.css | 4 +- 10 files changed, 90 insertions(+), 73 deletions(-) delete mode 100644 EarlyBlue/global/icons/information-tabmodal-64.png delete mode 100644 EarlyBlue/global/icons/question-tabmodal-64.png delete mode 100644 LCARStrek/global/icons/information-tabmodal-64.png delete mode 100644 LCARStrek/global/icons/question-tabmodal-64.png diff --git a/EarlyBlue/global/icons/information-tabmodal-64.png b/EarlyBlue/global/icons/information-tabmodal-64.png deleted file mode 100644 index 8f8a2eea2abd12ff7f7669c95bedb5473a53952e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1176 zcmV;J1ZVq+P)Px#24YJ`L;z+0W&oKgxTW9#000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ign; z7Y!Lj^XsAj00bCGL_t(|+U=V`Xd6cqhQCdOA*l&SL?VeH$Oh4qdy&9RLkfZ9kU%aD zfdqUsyS?~oUwy0XYcAE`V-AH-(?h5aHWXT@YmhIoFU25%id|}%4LCx?uB`1r)8Yul zJFA_M<+Xm$#XNcDeR}ie&Fov~tFH?!s~dyZcK#kP28;q3U*No_dO55w(~cEDPR&vYMyHaSOi`Q;r!K80Bk!y z0L%i@z-7Zxdkic9vqCsWXAVGy`aE#E%lWGe%!FMUR!HZ+1DrEX}G4ggb+^AH~`zu=YSv1Ammk+#8V-hf-wNn`JW7Ac%3`N;~)^MfMNf$j$i)a z!!O9?Mo6bq939o!-E}Dxima@>)fEZ%RhL67z(0N!*7-zY5Zivh@Nnw?zYPq;NT*Yz z(4_I&M1r9E8*(MctxPs$N6ZelSCv3e?mQfUt%R!!xC@gSApBNH=l-70f) zKbkIu3F4F0Cj9RKzYtA*-Fng5E&|3(jUJ0#A|4+k7Hhw`)a%E*dsn4iZU83D=UHE!I9w*_EXO&f#C zr~nu;H-6J=%L1#F0A43|G(k0_vJEDPt`aH$u0|NZ)s8MiqO5iRY7zFgrUJl?FaTEt zz)pk#?5F_Pjxd026#$zN2C%6DU_HVB)_noU(^55p&R5&D++zg|M$XMY}8CpUpy*x6jUGC(?= zq|xxGRzH07dH?J%6~``TPzef8DXh1S2h`h=;$w4PJ|0000Px#24YJ`L;z+0W&oKgxTW9#000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ign; z7Y!$blJ*Gz00p*5L_t(|+U=WNOcYlX$A7aQAm5_9g(6Z>F$TJ7)o5!%8>}{grY|`CTj?wvXJ|G(#+bMBopke0N}X%Uj4L=-*Mz(&9YQ~-;B1wbwk27*98 z@C3LIbOARc$=x<<2@plkPGB2QD+ARd0pJpFL6Y3x&UgYu(epNN2si*Z4IZl>XaY`1 zlKa_=B0v;989*a&6tJ3XwISd*&?rgnv6K@aoBG#4S(5#i4>*?S(hw2^{|(?yu_O0L zlKWs%2@plkQs4~m!3>FJUZ7r*+>cBrKomXef$vga@@kgE=aS^UWf}o8_=_fZcq1c4 zofZ-Vjb{JD44nCBmQbU1IoLG3_)H?;Gcs(fTvmX9h-1E z^Aldwfxrl7&$iLg(WA#7R48SPmN+kH)C0b_cs>mc9~%N5AUAg&4GmjZvu24Nf6%DZ z!4hX=dxM}b3nHZ~4N9?O>($7~-N8Kb$m zjX+@Jjr*0ArEJ~03X3K7s?5&Lq@W<1{{DcLAz5WCUuq@bfOd~>WzU}KnC;RPAV%)W43p6Jc0>fvT!f#Xfy~f9Z~e;7Y|7P7q-8=6B6j<5Cj_E0PU9 zJ3E8jyQ^8YtSDxm;o&iwo3Clj0pendM!=$Ef-fp6;NZbeC@Cpa?04?m&$PEcN>tq< zH3Te3-pprm_;4)_N4}!hKYjWqZr*%ggvteK!eDl?z#lpCsUmoQix)fadVe=et=8S3 zX%27y{u;{49E$xqJ0H{9+HUGtqAh_S`oHC=-YvRZWeOXnaV}rJ&6O*^7_B;}hJb#v z3D~eRHeo1n_rNshZvLNXTGc3UA%%`}xa2f%EFxhT`G{tIA(sqK$f+VAN0v7~d zJdbf>ioAAukw|39^=7*P;!#sWsLJKal@?wjMl~@J#_u2E*|ULZm)}2RR1V-(TRW(w zMyMVGilhbx0<^STS4@NqSoihXVvbX7$jaM zYXfg-eQ?efODB|g%ZhiUXi4~hU5S8Cn1CsHLIsnxgrOt=56QYJjQEWv{mYD5(=;c4 ono=NR#{M>!mb9cLEpuA_2E!=q(@@R`_y7O^07*qoM6N<$f~bSvWB>pF diff --git a/EarlyBlue/global/tabprompts.css b/EarlyBlue/global/tabprompts.css index 1773c328..7b762894 100644 --- a/EarlyBlue/global/tabprompts.css +++ b/EarlyBlue/global/tabprompts.css @@ -1,29 +1,22 @@ /* Tab Modal Prompt boxes */ tabmodalprompt { - background-color: hsla(0,0%,97%,.15); - background-image: -moz-radial-gradient(center 40%, circle closest-side, hsla(0,0%,90%,.5), hsla(0,0%,90%,0)); + background-color: hsla(0,0%,10%,.5); + font-family: sans-serif; /* use content font not system UI font */ } .mainContainer { - padding: 20px; color: #000000; background-color: #CCD0DD; + background-clip: padding-box; border: 1px outset #CCD0DD; } -.buttonContainer { - margin-top: 10px; -} - -.info\.icon { - width: 64px !important; - height: 64px !important; -} - -.alert-icon { - list-style-image: url("chrome://global/skin/icons/information-tabmodal-64.png") !important; +.topContainer { + padding: 20px; } -.question-icon { - list-style-image: url("chrome://global/skin/icons/question-tabmodal-64.png") !important; +.buttonContainer { + padding: 12px 20px 15px; + background-color: #9999CC; + border-top: 1px solid #666699; } diff --git a/EarlyBlue/global/webConsole.css b/EarlyBlue/global/webConsole.css index d12e7d8d..a468233d 100644 --- a/EarlyBlue/global/webConsole.css +++ b/EarlyBlue/global/webConsole.css @@ -62,14 +62,11 @@ } .webconsole-msg-icon { - list-style-image: url(chrome://global/skin/icons/webconsole.png); - margin: 2px 3px; - width: 10px; - height: 10px; -} - -.webconsole-msg-log > .webconsole-msg-icon-container > .webconsole-msg-icon { - visibility: hidden; + list-style-image: url("chrome://global/skin/icons/webconsole.png"); + -moz-image-region: rect(0, 1px, 0, 0); + margin: 3px 4px; + width: 8px; + height: 8px; } .hud-output-node div { @@ -90,6 +87,14 @@ -moz-margin-end: 6px; } +.webconsole-msg-body-piece { + margin: 0; +} + +.webconsole-msg-url { + margin: 0 6px; +} + .webconsole-location { margin-top: 0; margin-bottom: 0; @@ -133,7 +138,7 @@ /* Network styles */ .webconsole-filter-button[category="net"] { - -moz-image-region: rect(0, 40px, 10px, 30px); + -moz-image-region: rect(0, 8px, 8px, 0); } .webconsole-msg-network > .webconsole-msg-icon-container { @@ -141,12 +146,12 @@ } .webconsole-msg-network.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon { - -moz-image-region: rect(0, 10px, 10px, 0); + -moz-image-region: rect(0, 16px, 8px, 8px); } /* CSS styles */ .webconsole-filter-button[category="css"] { - -moz-image-region: rect(10px, 40px, 20px, 30px); + -moz-image-region: rect(8px, 8px, 16px, 0); } .webconsole-msg-cssparser > .webconsole-msg-icon-container { @@ -154,16 +159,16 @@ } .webconsole-msg-cssparser.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon { - -moz-image-region: rect(10px, 10px, 20px, 0); + -moz-image-region: rect(8px, 16px, 16px, 8px); } .webconsole-msg-cssparser.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon { - -moz-image-region: rect(10px, 20px, 20px, 10px); + -moz-image-region: rect(8px, 24px, 16px, 16px); } /* JS styles */ .webconsole-filter-button[category="js"] { - -moz-image-region: rect(20px, 40px, 30px, 30px); + -moz-image-region: rect(16px, 8px, 24px, 0); } .webconsole-msg-exception > .webconsole-msg-icon-container { @@ -171,16 +176,16 @@ } .webconsole-msg-exception.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon { - -moz-image-region: rect(20px, 10px, 30px, 0); + -moz-image-region: rect(16px, 16px, 24px, 8px); } .webconsole-msg-exception.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon { - -moz-image-region: rect(20px, 20px, 30px, 10px); + -moz-image-region: rect(16px, 24px, 24px, 16px); } /* Web Developer styles */ .webconsole-filter-button[category="webdev"] { - -moz-image-region: rect(30px, 40px, 40px, 30px); + -moz-image-region: rect(24px, 8px, 32px, 0); } .webconsole-msg-console > .webconsole-msg-icon-container { @@ -189,15 +194,15 @@ .webconsole-msg-console.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon, .webconsole-msg-output.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon { - -moz-image-region: rect(30px, 10px, 40px, 0); + -moz-image-region: rect(24px, 16px, 32px, 8px); } .webconsole-msg-console.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon { - -moz-image-region: rect(30px, 20px, 40px, 10px); + -moz-image-region: rect(24px, 24px, 32px, 16px); } .webconsole-msg-console.webconsole-msg-info > .webconsole-msg-icon-container > .webconsole-msg-icon { - -moz-image-region: rect(30px, 30px, 40px, 20px); + -moz-image-region: rect(24px, 32px, 32px, 24px); } /* Input and output styles */ @@ -206,6 +211,14 @@ border-left: solid #808080 6px; } +.webconsole-msg-input > .webconsole-msg-icon-container > .webconsole-msg-icon { + -moz-image-region: rect(24px, 40px, 32px, 32px); +} + +.webconsole-msg-output > .webconsole-msg-icon-container > .webconsole-msg-icon { + -moz-image-region: rect(24px, 48px, 32px, 40px); +} + .webconsole-close-button { border: none; padding: 3px; diff --git a/EarlyBlue/mozapps/extensions/extensions.css b/EarlyBlue/mozapps/extensions/extensions.css index 992786d7..f668e777 100644 --- a/EarlyBlue/mozapps/extensions/extensions.css +++ b/EarlyBlue/mozapps/extensions/extensions.css @@ -217,6 +217,8 @@ } .category[disabled] { + border-top: 0; + border-bottom: 0; height: 0; opacity: 0; -moz-transition-property: height, opacity; @@ -402,7 +404,7 @@ .icon-container { width: 48px; height: 48px; - margin: 22px 7px 7px 7px; + margin: 3px 7px; } .addon[active="false"] .icon { diff --git a/LCARStrek/global/icons/information-tabmodal-64.png b/LCARStrek/global/icons/information-tabmodal-64.png deleted file mode 100644 index 4602abf45a96fe3043115c509a66a0bf1e15b998..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1129 zcmV-v1eW`WP)Px#24YJ`L;z+0W&oKgxTW9#000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ign; z7ZV;2)WLm*(IT(%;%hZ#!aWhYt4x& zDm((vh_g*v02^^G4hR)gx~p&l;Hx;>WCP%rIPUe3kb@j z{E1NRR8d-|@D9B@;`)ySV+~+4oznAv1wgU-Ie;qxfU1DanmTc@MqY0XUQ@4Uk-=h{NCq?pMzuouSt=VSLHVxLp;%|fXMH2O<;fwz(A{qa;5G&XN>Ki~WA%S5 zk}GO!o+>)V-2%9Y0f7>fpNRiw^~uPX!vWmIfItb#L)>(hGb%^MA9X%KAW)+6H>Iua z$%gA#5GYmo7_0LYz5}=b@CCpVfO`N78skS|ObVVK)l{CZ@BzRAz?osl62JwG@mLE4 z=Ac-k_!y;H-l06iZ;Q~2in+)q!JU}vM9jUhRiVss-H`|~rvOeww4Wu?{>)?OnHU=j z!c5HdM4A662!Kwa(*SrDk$!E-;#_i3Xl%ETlJk647eOWcb5vxn)m(-|XHjUZ%@t%( zW^BeVM>*;$U;T@Ymn3KDF?1P|5P5W#v>-4C{j(_FiS9NKmI+S)7YJH6=rZ8A5d9?! z9%+mTfJ*?s#n(^b^CgWj3C#i{+~8Opcce*;B|6&z3;@O=U6Wb5DBkO9dq{onbxmeyB}FYY2Q($P;Ye-91g~ozIa*1Q zI`0%@+xeWwE|kh^a+sT<$Dtx z@-{gS5DtH%qy>cGY?U>DFs#kehDXk@w#!@ma5yhac=+VuzcOQC!*E`jGO%HIugy84 v_Ap+Y42oO%lWJl500000NkvXXu0mjf=>72# diff --git a/LCARStrek/global/icons/question-tabmodal-64.png b/LCARStrek/global/icons/question-tabmodal-64.png deleted file mode 100644 index 461e6e7a6e5e9f0959018573256c890428ce02c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1440 zcmV;R1z-A!P)Px#24YJ`L;z+0W&oKgxTW9#000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ign; z7ZU*W*?heK00kgPL_t(|+U=W7h#W-}$A8s~I~#&%6c5S-F>_En*&-w&CQL$F z`t0i7HIoO;Fw-?%^?&t$uikrAE$C1t6DfS!ZEOhH)tE$wfcwBeecEIW%+zP=3K1=W zt^ytaFRD+Q%z!u5=aNEFD?=m(u7j=uj%9$Zkc;u+U+!k;&MhT(; z_=D>INo_LH=SbjWj1oix@TgA5DZO%}|Ix=2qy*6r{L!{&-IEQYSS5(2;Jcdjw#FyA z0xt{p0{5%uT?1TYY5o^*OyvB~wi1McVng69;9k`>*xSm2zFNMX18xeO;4gq9BIjJh z>Lh{hfMiQan>*F2`@oKQfO% zX8>#~Pd~Lpan+fBL>5ee&l`r^cLJwm!C{ZKb8Vd4YV4c9A%)4U07d;l&GIrIa3GPdyB_#N7Ch=vNGX|mQvH0eoXEO@Ox6k^yTr zdlK53y@+7I8t_i#x8GD~`-g`Q=>ZQqnw^edz@i4YY39h-$KsE{4e{yN}G;1);l^pwc?uxWRp>2Md| zzjlBJcva-Q-_|&?9Ri;LAE;E`YG1 zkFww=%YE6E{a<1N7C(@5B~Uv>Llyg1uc5l1ngPZHujg4uOJWAHpq!OAxUgp+D&}_v zcu5wVNx%fJ`eqhWM@uj;BLh+}E~LJhdF0Q-R0FF-WTNIu6@^yEZLDvY7!b6-wwok$ zUo*2*QM~upb`kjCea*~JN{ZTQ-USl8ubDYYNo|;dtOO;p5}?Q~sP9xjjVVY)t5HKG zl#2bi=JMWzHGnUV$Vfc5^gBN!r2?J(22+{?zlz*n39TNI^6iAcV{$4WY7`20c1+Gg z377vtNsAIz=cuef39EHj+OXuT)^T}@9j?v`6CO5s`M)w_VZ-XYG-Y7J>b*AS@Y<{K u;$)yl4`IOn>($u+h2TiUuE-VXK>h=wQZO0WSQ2ai0000 .webconsole-msg-icon-container > .webconsole-msg-icon { - visibility: hidden; + -moz-image-region: rect(0, 1px, 0, 0); + margin: 3px 4px; + width: 8px; + height: 8px; } .hud-output-node div { @@ -90,6 +87,14 @@ -moz-margin-end: 6px; } +.webconsole-msg-body-piece { + margin: 0; +} + +.webconsole-msg-url { + margin: 0 6px; +} + .webconsole-location { margin-top: 0; margin-bottom: 0; @@ -126,13 +131,14 @@ display: none; } +.webconsole-filter-button > .toolbarbutton-menubutton-button { -moz-box-orient: horizontal; list-style-image: url("chrome://global/skin/icons/webconsole.png"); } /* Network styles */ .webconsole-filter-button[category="net"] { - -moz-image-region: rect(0, 40px, 10px, 30px); + -moz-image-region: rect(0, 8px, 8px, 0); } .webconsole-msg-network > .webconsole-msg-icon-container { @@ -140,12 +146,12 @@ } .webconsole-msg-network.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon { - -moz-image-region: rect(0, 10px, 10px, 0); + -moz-image-region: rect(0, 16px, 8px, 8px); } /* CSS styles */ .webconsole-filter-button[category="css"] { - -moz-image-region: rect(10px, 40px, 20px, 30px); + -moz-image-region: rect(8px, 8px, 16px, 0); } .webconsole-msg-cssparser > .webconsole-msg-icon-container { @@ -153,16 +159,16 @@ } .webconsole-msg-cssparser.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon { - -moz-image-region: rect(10px, 10px, 20px, 0); + -moz-image-region: rect(8px, 16px, 16px, 8px); } .webconsole-msg-cssparser.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon { - -moz-image-region: rect(10px, 20px, 20px, 10px); + -moz-image-region: rect(8px, 24px, 16px, 16px); } /* JS styles */ .webconsole-filter-button[category="js"] { - -moz-image-region: rect(20px, 40px, 30px, 30px); + -moz-image-region: rect(16px, 8px, 24px, 0); } .webconsole-msg-exception > .webconsole-msg-icon-container { @@ -170,16 +176,16 @@ } .webconsole-msg-exception.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon { - -moz-image-region: rect(20px, 10px, 30px, 0); + -moz-image-region: rect(16px, 16px, 24px, 8px); } .webconsole-msg-exception.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon { - -moz-image-region: rect(20px, 20px, 30px, 10px); + -moz-image-region: rect(16px, 24px, 24px, 16px); } /* Web Developer styles */ .webconsole-filter-button[category="webdev"] { - -moz-image-region: rect(30px, 40px, 40px, 30px); + -moz-image-region: rect(24px, 8px, 32px, 0); } .webconsole-msg-console > .webconsole-msg-icon-container { @@ -188,15 +194,15 @@ .webconsole-msg-console.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon, .webconsole-msg-output.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon { - -moz-image-region: rect(30px, 10px, 40px, 0); + -moz-image-region: rect(24px, 16px, 32px, 8px); } .webconsole-msg-console.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon { - -moz-image-region: rect(30px, 20px, 40px, 10px); + -moz-image-region: rect(24px, 24px, 32px, 16px); } .webconsole-msg-console.webconsole-msg-info > .webconsole-msg-icon-container > .webconsole-msg-icon { - -moz-image-region: rect(30px, 30px, 40px, 20px); + -moz-image-region: rect(24px, 32px, 32px, 24px); } /* Input and output styles */ @@ -205,6 +211,14 @@ border-left: solid #808080 6px; } +.webconsole-msg-input > .webconsole-msg-icon-container > .webconsole-msg-icon { + -moz-image-region: rect(24px, 40px, 32px, 32px); +} + +.webconsole-msg-output > .webconsole-msg-icon-container > .webconsole-msg-icon { + -moz-image-region: rect(24px, 48px, 32px, 40px); +} + .webconsole-close-button { border: none; padding: 3px; diff --git a/LCARStrek/mozapps/extensions/extensions.css b/LCARStrek/mozapps/extensions/extensions.css index 8c883845..1ecdb250 100644 --- a/LCARStrek/mozapps/extensions/extensions.css +++ b/LCARStrek/mozapps/extensions/extensions.css @@ -227,6 +227,8 @@ } .category[disabled] { + border-top: 0; + border-bottom: 0; height: 0; opacity: 0; -moz-transition-property: height, opacity; @@ -433,7 +435,7 @@ .icon-container { width: 48px; height: 48px; - margin: 22px 7px 7px 7px; + margin: 3px 7px; } .icon { -- 2.35.3