From cdd74c496b4a2884ee9e635d00a46759c2a2e88e Mon Sep 17 00:00:00 2001 From: "ben%netscape.com" Date: Tue, 16 May 2000 04:46:53 +0000 Subject: [PATCH] fixing navigation buttons git-svn-id: svn://10.0.0.236/trunk@69983 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/themes/modern/communicator/MANIFEST | 3 ++ .../themes/modern/communicator/Makefile.in | 3 ++ .../themes/modern/communicator/makefile.win | 3 ++ .../themes/modern/communicator/menubutton.css | 35 +++++++++++++++++- .../communicator/menubuttonBindings.xml | 20 ++++++++++ .../tb-menubutton-dm-disabled.gif | Bin 0 -> 55 bytes .../modern/communicator/tb-menubutton-dm.gif | Bin 0 -> 64 bytes .../modern/global/button32-bg-active.gif | Bin 321 -> 299 bytes .../modern/global/button32-bg-disabled.gif | Bin 263 -> 247 bytes .../modern/global/button32-bg-hover.gif | Bin 349 -> 322 bytes mozilla/themes/modern/global/button32-bg.gif | Bin 336 -> 310 bytes mozilla/themes/modern/navigator/navigator.css | 6 ++- .../browser/resources/content/navigator.xul | 35 ++++++++---------- 13 files changed, 83 insertions(+), 22 deletions(-) create mode 100644 mozilla/themes/modern/communicator/menubuttonBindings.xml create mode 100644 mozilla/themes/modern/communicator/tb-menubutton-dm-disabled.gif create mode 100644 mozilla/themes/modern/communicator/tb-menubutton-dm.gif diff --git a/mozilla/themes/modern/communicator/MANIFEST b/mozilla/themes/modern/communicator/MANIFEST index dde1ec79ba9..308ff9e4ef9 100644 --- a/mozilla/themes/modern/communicator/MANIFEST +++ b/mozilla/themes/modern/communicator/MANIFEST @@ -9,3 +9,6 @@ menubutton.css navbar-endbox.gif splitter.css toolbar.css +menubuttonBindings.xml +tb-menubutton-dm.gif +tb-menubutton-dm-disabled.gif diff --git a/mozilla/themes/modern/communicator/Makefile.in b/mozilla/themes/modern/communicator/Makefile.in index a2fad35f8c9..c8e8d8148b5 100644 --- a/mozilla/themes/modern/communicator/Makefile.in +++ b/mozilla/themes/modern/communicator/Makefile.in @@ -35,10 +35,13 @@ EXPORT_RESOURCE = \ $(srcdir)/communicator.css \ $(srcdir)/formatting.css \ $(srcdir)/menu.css \ + $(srcdir)/menubuttonBindings.xml \ $(srcdir)/menubutton.css \ $(srcdir)/splitter.css \ $(srcdir)/toolbar.css \ $(srcdir)/navbar-endbox.gif \ + $(srcdir)/tb-menubutton-dm.gif \ + $(srcdir)/tb-menubutton-dm-disabled.gif \ $(NULL) DIRS = search xpinstall sidebar bookmarks directory profile regviewer related wallet diff --git a/mozilla/themes/modern/communicator/makefile.win b/mozilla/themes/modern/communicator/makefile.win index e16170ee02f..0db5a4d5782 100644 --- a/mozilla/themes/modern/communicator/makefile.win +++ b/mozilla/themes/modern/communicator/makefile.win @@ -29,6 +29,7 @@ include <$(THEME_ROOT_DEPTH)\theme.mk> install:: $(MAKE_INSTALL) box.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin + $(MAKE_INSTALL) menubuttonBindings.xml $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin $(MAKE_INSTALL) brand.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin $(MAKE_INSTALL) button.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin $(MAKE_INSTALL) communicator.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin @@ -37,6 +38,8 @@ install:: $(MAKE_INSTALL) menubutton.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin $(MAKE_INSTALL) navbar-endbox.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin $(MAKE_INSTALL) splitter.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin + $(MAKE_INSTALL) tb-menubutton-dm.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin + $(MAKE_INSTALL) tb-menubutton-dm-disabled.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin $(MAKE_INSTALL) toolbar.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin clobber:: diff --git a/mozilla/themes/modern/communicator/menubutton.css b/mozilla/themes/modern/communicator/menubutton.css index 09978f2d12c..5adc45c9925 100644 --- a/mozilla/themes/modern/communicator/menubutton.css +++ b/mozilla/themes/modern/communicator/menubutton.css @@ -52,4 +52,37 @@ border-bottom : 1px solid #CCCCCC; } - \ No newline at end of file +/** + * Navigation bar style menubuttons + **/ +.toolbar.menubutton-dual, +.toolbar.menubutton-dual + { + border : none ! important; + } + +.button-toolbar-1.menubutton-dual-button + { + list-style-image : inherit; + } + +.menubutton-dual-dropmarker + { + background : transparent; + list-style-image : url("chrome://communicator/skin/tb-menubutton-dm.gif"); + } + +.menubutton-dual-dropmarker[disabled="true"] + { + background : transparent; + list-style-image : url("chrome://communicator/skin/tb-menubutton-dm-disabled.gif"); + } + +.menubutton-dual-dropmarker-box + { + margin-left : 32px; + margin-bottom : 1px; + } + + + \ No newline at end of file diff --git a/mozilla/themes/modern/communicator/menubuttonBindings.xml b/mozilla/themes/modern/communicator/menubuttonBindings.xml new file mode 100644 index 00000000000..d377b7a47e4 --- /dev/null +++ b/mozilla/themes/modern/communicator/menubuttonBindings.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mozilla/themes/modern/communicator/tb-menubutton-dm-disabled.gif b/mozilla/themes/modern/communicator/tb-menubutton-dm-disabled.gif new file mode 100644 index 0000000000000000000000000000000000000000..9109b11fd69bb66387731032bc4d4bd9f3c399f8 GIT binary patch literal 55 zcmZ?wbhEHbWM^PunE0Pz=9x49|NlR5-~a;ygW^vXMg|5Z1|1-q0VL1B#L*+aXgA}@ I2u22L0Q7bbdH?_b literal 0 HcmV?d00001 diff --git a/mozilla/themes/modern/communicator/tb-menubutton-dm.gif b/mozilla/themes/modern/communicator/tb-menubutton-dm.gif new file mode 100644 index 0000000000000000000000000000000000000000..060ccc51fbd5ce036619de9ebad3086c6dcff166 GIT binary patch literal 64 zcmZ?wbhEHbWM^PunE0Pz=9x49|NlR5-~a;ygW^vXMg|5Z1|1-q0VL1B#ML7&bU>5q RPVi<125VN+TR9>O)&Phu5wZXP literal 0 HcmV?d00001 diff --git a/mozilla/themes/modern/global/button32-bg-active.gif b/mozilla/themes/modern/global/button32-bg-active.gif index b214d961dcaae8a289923f005ddefc89faf617a0..ee08f30082649fb1587b73924f03cef5bdf41847 100644 GIT binary patch literal 299 zcmZ?wbhEHbRAEqI*v!C?mNs+d%rj@s{5MRVW1Kb<#`_NhAkqK-8Bl@ZPZmZ71}+92 zkTA#$29_HECq0iV98@_HXw>N1`@}*ddig3(!zmkD)_u9P@1qGz>3+7BIZX)*WcyC2 z=nA$72F+a(l9fHH>*C6=n~9SuZm#{YfGdz;)y7$OG+!)uT`C^#as0T}cBZ=UavtZh z+9WNOQkmu=8RL%53K>SG#J;H5rYXUJ(`UrE&6#OBe*p*kq~1jyu{A5)Wf|L-tXbR5 zGJ8&I_2l{WM%(%-g_u`wm*KSF%GlL;KqO)L>2=2sMw~C#2@~WoSBw3(-?%(43p;o6)+$H#sA!n zF8)rgR-QqIdIn7Q-ZCiuWMO1r;AYSPsREhGz;dVHq~}zpR-OX~6%QFD_i>3x>3*?}J4}uXSo=<>*C6=n~9SuZmzXhz!k{1 zYU8XshA$SpE)`GrIDTB~J5ybFIfrvuZITv8sZ4W`jB!V2g$yfGVqa8j)0E)A=`&*7 z=FF6x)H{DJQ_T{OSl5&lb6MIM)~@X4m_4VJJ7VM7dZCQTGql)+xR!61VYcAjzj(?a z<%F}%sVbbic3-aNRQ1;`4>e>CI1pmS?DWX)mE3bDp_i|9-o6ul^w{>>7lUsf{(LqR IWMHrc0G#!Q@c;k- diff --git a/mozilla/themes/modern/global/button32-bg-disabled.gif b/mozilla/themes/modern/global/button32-bg-disabled.gif index 6dfa1c7f511b8454c57b2446d108f583869da1e1..b02f8109d900815c4eaa07a01053435ac3831b84 100644 GIT binary patch literal 247 zcmZ?wbhEHbRAEqI*!-U%Ep6t^nP<+N`EQs!$2e`~fddDO)8JzN&j8{7|3GO57*PDl z!pOkD%Af-h0GZ*yvSh;v&!-lROScMfvj_GHA5hF#wQkL+f`%+!{#kpw{73CbJy-Yd-rYFwExiIBS()NUoXgD4FK)kZp8oq literal 263 zcmZ?wbhEHbRAEqI*!-X2|NsAIKf*(q_&~OPgs7LTQG{bAW0XU_kLd zx1)={ldF|ykfELd)4jJ0ia%Kx85npNbU;c#rZTWBnsCzdsZ|>b1Cyb9P;W}+JPoG; zSw|5A9Uh&H3o7QRvwlBzAR&iUqoc&*?xJuJtNB}+lst76EzZB0+_9ocwY{(G%^jJ2 zS6HTctxMuUJ9PrhT<)~-(KN!zm|=j^TxI--qlH#0WnIa=Hh zncp1L=x{~kkc8t^Pp$P4&vdJd$^^pJRP5CKy6^Fp8#g(hh&4=g@ZGU0oa`>zU0vENjWQe)yJbye5@%$FFfxVCD-CH~Qa5eFiW0juYt7bY z#V?w(DQVfV?UA`tIj8UT>S1G9eQWoSBw3(-?%(43p;o6)+$H#sA!n zF8)rgR-QqIdIn7Q-ZCiuWMO1r;AYSPsREhG!1ANuq~}zpR-OX~6^>f zx7@g?`9!RJs)O(TO+3P^qA~BcC$Q<()`l=ta91}s=P*q0&cxPUPPJg2y`}f%VpKg$eG@&t$}u~C j`YX|qa)PCiIhw)5gVA%hGOOgQ0t*K*iFP(+1_o;Y-Fu3* diff --git a/mozilla/themes/modern/global/button32-bg.gif b/mozilla/themes/modern/global/button32-bg.gif index 0b9936475b17bda456f06804d6e02d6eca548081..37507c7c86ee63b93fe7c30b6ae2a73d2452a43d 100644 GIT binary patch literal 310 zcmZ?wbhEHbRAEqI*v!C?mNs+d%rj@s{5MRVW1KeAI1MiF{|pfR{|}P;|DOQ{6o0ZX zGBEHk=zs)3W-zcko^aChsX?OR(hFQ{fxS;kbYoU6Yd4%?&`@-*=uWxPlGEJ5%?xMT zw8c#4H1NAw6m%TZ$SV_=%AwI;5?vFe&AhzH``BB))`znoY>Bsxd}`ork5kqeOT20Z*y(#UAt`}Puni`E}@;fn#C%&)e0Bwn_niHy((WhaoMc&Oy!6Tv*LV` tX4VwPt2#R8dT@E!ix_E|x>?zHzgJ^3*4Ebj{v*L)!)Jy^F`XO?)&N8hd6fVF literal 336 zcmZ?wbhEHbRAEqI*!-X2|NsAIKf*(q_&~OPgs7LTQG{bAW0XU_kLd zx1)={ldF|ykfELd)4jJ0ia%Kx85npNbU;c#rZTX+o^aChsZ|>b1Cyb9Q16ox!I)Lc zj&7V{&{QNBcxSu8k|W%~+{|a&w8czin)#<`6m%TZ$O{vgDx}e05?vFe&8^%`W6u)fl6}%EMXQQ6j@x&)8qm?9@IrNJBDb zRw{$X{9M_-#W7mTQ%vTq3S?leTo+h5W3yY=OC^yRC&$A@29 W8)k1zI(nc%mF?f^gMRTW4AubtZiDXt diff --git a/mozilla/themes/modern/navigator/navigator.css b/mozilla/themes/modern/navigator/navigator.css index c775fd122d8..3122099766a 100644 --- a/mozilla/themes/modern/navigator/navigator.css +++ b/mozilla/themes/modern/navigator/navigator.css @@ -43,12 +43,16 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome { */ #back-button { + behavior : url("chrome://communicator/skin/menubuttonBindings.xml#menubutton-dual-foo"); list-style-image : url("chrome://navigator/skin/back.gif"); + margin : 0px; } #forward-button { + behavior : url("chrome://communicator/skin/menubuttonBindings.xml#menubutton-dual-foo"); list-style-image : url("chrome://navigator/skin/forward.gif"); + margin : 0px; } #stop-button @@ -116,4 +120,4 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome { .menuitem-iconic { padding : 2px; - } \ No newline at end of file + } diff --git a/mozilla/xpfe/browser/resources/content/navigator.xul b/mozilla/xpfe/browser/resources/content/navigator.xul index 2edc4e40668..24591793751 100644 --- a/mozilla/xpfe/browser/resources/content/navigator.xul +++ b/mozilla/xpfe/browser/resources/content/navigator.xul @@ -221,18 +221,15 @@ Contributor(s): ______________________________________. --> - - + - +