From 749ee10941a6eba7ea637e683d4968a4aee067ee Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Tue, 23 Dec 2008 23:49:52 +0100 Subject: [PATCH] EarlyBlue 2.0a1 -> 2.0a2, navigator part, also remove now unused old gif versions of LCARStrek navigator icons --- EarlyBlue/navigator/icons/back-disabled.gif | Bin 174 -> 0 bytes EarlyBlue/navigator/icons/back.gif | Bin 174 -> 0 bytes .../navigator/icons/forward-disabled.gif | Bin 173 -> 0 bytes EarlyBlue/navigator/icons/forward.gif | Bin 173 -> 0 bytes .../navigator/icons/navigatoricons-small.png | Bin 0 -> 273 bytes EarlyBlue/navigator/icons/navigatoricons.png | Bin 0 -> 326 bytes EarlyBlue/navigator/icons/reload-disabled.gif | Bin 176 -> 0 bytes EarlyBlue/navigator/icons/reload.gif | Bin 176 -> 0 bytes EarlyBlue/navigator/navigator.css | 191 +++++++++++++----- LCARStrek/navigator/icons/back-disabled.gif | Bin 143 -> 0 bytes LCARStrek/navigator/icons/back-hover.gif | Bin 142 -> 0 bytes LCARStrek/navigator/icons/back.gif | Bin 143 -> 0 bytes .../navigator/icons/forward-disabled.gif | Bin 145 -> 0 bytes LCARStrek/navigator/icons/forward-hover.gif | Bin 145 -> 0 bytes LCARStrek/navigator/icons/forward.gif | Bin 145 -> 0 bytes LCARStrek/navigator/icons/reload-disabled.gif | Bin 102 -> 0 bytes LCARStrek/navigator/icons/reload-hover.gif | Bin 149 -> 0 bytes LCARStrek/navigator/icons/reload.gif | Bin 148 -> 0 bytes 18 files changed, 139 insertions(+), 52 deletions(-) delete mode 100755 EarlyBlue/navigator/icons/back-disabled.gif delete mode 100755 EarlyBlue/navigator/icons/back.gif delete mode 100755 EarlyBlue/navigator/icons/forward-disabled.gif delete mode 100755 EarlyBlue/navigator/icons/forward.gif create mode 100644 EarlyBlue/navigator/icons/navigatoricons-small.png create mode 100644 EarlyBlue/navigator/icons/navigatoricons.png delete mode 100644 EarlyBlue/navigator/icons/reload-disabled.gif delete mode 100755 EarlyBlue/navigator/icons/reload.gif delete mode 100755 LCARStrek/navigator/icons/back-disabled.gif delete mode 100755 LCARStrek/navigator/icons/back-hover.gif delete mode 100755 LCARStrek/navigator/icons/back.gif delete mode 100755 LCARStrek/navigator/icons/forward-disabled.gif delete mode 100755 LCARStrek/navigator/icons/forward-hover.gif delete mode 100755 LCARStrek/navigator/icons/forward.gif delete mode 100644 LCARStrek/navigator/icons/reload-disabled.gif delete mode 100755 LCARStrek/navigator/icons/reload-hover.gif delete mode 100755 LCARStrek/navigator/icons/reload.gif diff --git a/EarlyBlue/navigator/icons/back-disabled.gif b/EarlyBlue/navigator/icons/back-disabled.gif deleted file mode 100755 index e030c9cb1a6b7f589f611258d1b9632b74a55ee8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 174 zcmZ?wbhEHb6lV}+*v!E2|Ns9pXU;Sr0R{$!0|yQONvuHeCkrD313QBbNET#<155OW z6P~NrE}C+t`Tv3f*%-rlLE9GIc*ez~!LF1&|AX(;ThCVRz4h93_SG`y8~QsA%`BO& zY%+EBB(n`Vy0ec?*+Z^fq|Vt2P6wJ!+|CG z!wJvTYZpy9)BJxyfozQ7yr69hZ#?5-(qLE0p8vsj>aAxh_uhJKI{Rvw^9}tShh~;c zS2meCdy?4(9o^YSr);s$OZ#+G%=t;mn>Urq_P@^EcC+d72C2-`xl=#53o=*(04BOb A$p8QV diff --git a/EarlyBlue/navigator/icons/forward-disabled.gif b/EarlyBlue/navigator/icons/forward-disabled.gif deleted file mode 100755 index 85fc056da200c48e9be92328ea3e55e416f3733a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 173 zcmZ?wbhEHb6lV}+*v!E2|Ns9pXU;Sr0R{$!0|yQONvuHeCkrD313QBbNET#<154D0 z6P~N*D!n-C`Z1xf_rCeONeq3G&sW8FoGV$n$aUW8s24NMrW-K)X6)TPk3V9v!E6!6 xFPoB9uA7+Z^fq|Vt2P6wJ!+|C0 z!wJvTbCq74b^Vx7*n8i6-Xw-T$>*!$JI<9XUF14%b<~TQX44HAelzy&p2r_C*^J$r0f^(G^tO1A8K@b1{ diff --git a/EarlyBlue/navigator/icons/navigatoricons-small.png b/EarlyBlue/navigator/icons/navigatoricons-small.png new file mode 100644 index 0000000000000000000000000000000000000000..b5838ebb206e1e595fb838c31207eed5d2edb670 GIT binary patch literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et#0(_4@}`~wQjEnx?oJHr&dIz4a(DuKLR?QW zFr7JbrlFxBE$xhU+13>xMI}Lg!3+-1Zlr-YN#5=*3>~bp9zYIffk$L90|U1(2s1Lw znj--eWH0gbb!ET7BQ7Sda7DsB5GYjW>Eal|aXmS~fq_{ejNxK^!xt`v!{6+go1bY3 zEdIyPoEFABLGXX0qj47F1i^ppj>b8x%*DAc*q5ETz{>My>q5SmnG5-NzJ2}ApOLyY zi^0&2LDE5Ufrhw%vB7`)0|!{9BqlIOonbJVageRUbiy45hJR}mW|wr&&<9%1;OXk; Jvd$@?2>_;AQV{?E literal 0 HcmV?d00001 diff --git a/EarlyBlue/navigator/icons/navigatoricons.png b/EarlyBlue/navigator/icons/navigatoricons.png new file mode 100644 index 0000000000000000000000000000000000000000..a8026757ca40533d915e44bb0534dfe03b044cfa GIT binary patch literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^MnEje#0(@We}t|9QjEnx?oJHr&dIz4a(DuKLR_yf zFr7JbrlFxBE$z(CgOR&Hib{g~f*Bm1-ADs*lDyqr7&=&GJ%Aj}0*}aI1_o|n5N2eU zHAey{$X?><>&kwEM_f!^wx@vG0VuT0)5S4F;&SSQjl4{TJg#e(I0^=RTad)CM5ocR zlPzo730=Xi5Y514J0==21f9G8PT^?(yf^ao?JvGp><+tHe8+`= On8DN4&t;ucLK6VpIdVV% literal 0 HcmV?d00001 diff --git a/EarlyBlue/navigator/icons/reload-disabled.gif b/EarlyBlue/navigator/icons/reload-disabled.gif deleted file mode 100644 index 3952f170634201e3a7eedf0220f1427e1f8f5c56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 176 zcmZ?wbhEHb6lV}+c+9}?|Ns9pXU;TW13)QEp!k!8k%57qL5BedKxQzo#C|yGxq9!9 z&YJHc9mjo7C^jy%;A$6ONwD!!{d8z$*T#3ffA$By{npiLU?%tR>*P>}#)m@7FaJqc un|U#*XIjs>^cP%m?V7O*s_yReOJBZm*DOZv7cvHSCfzFk(;zCyU=0A}Yg&&0 diff --git a/EarlyBlue/navigator/icons/reload.gif b/EarlyBlue/navigator/icons/reload.gif deleted file mode 100755 index 5c8effa58a08690ccf8b5dc286718b8f7539ce5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 176 zcmZ?wbhEHb6lV}+*v!E2|Ns9pXU?RhVL=QG34oDDWh677% zz)8>5d%0K(U4AGuaXfaN*VM3<>v?W+=3FJ8`#I~pUzNPu!>6I3H7je~!wunznNt`a zq#T)&w94v8qq-O4R{z=N>|u}6W*L2PUnscMTyoYIy<5HR>4LMZqbsci85pbqt42V# diff --git a/EarlyBlue/navigator/navigator.css b/EarlyBlue/navigator/navigator.css index 27f1ef1b..ef39f5e8 100644 --- a/EarlyBlue/navigator/navigator.css +++ b/EarlyBlue/navigator/navigator.css @@ -52,7 +52,7 @@ } #back-button[disabled="true"] { - -moz-image-region: rect(42px 50px 63px 25px) !important; + -moz-image-region: rect(42px 50px 63px 25px); } #forward-button { @@ -61,15 +61,16 @@ } #forward-button[disabled="true"] { - -moz-image-region: rect(63px 50px 84px 25px) !important; + -moz-image-region: rect(63px 50px 84px 25px); } #reload-button { - list-style-image: url("chrome://navigator/skin/icons/reload.gif"); + list-style-image: url("chrome://navigator/skin/icons/navigatoricons.png"); + -moz-image-region: rect(0px 25px 21px 0px); } - + #reload-button[disabled="true"] { - list-style-image: url("chrome://navigator/skin/icons/reload-disabled.gif") !important; + -moz-image-region: rect(0px 50px 21px 25px); } #stop-button { @@ -78,7 +79,7 @@ } #stop-button[disabled="true"] { - -moz-image-region: rect(21px 50px 42px 25px) !important; + -moz-image-region: rect(21px 50px 42px 25px); } #print-button { @@ -87,59 +88,36 @@ } #print-button[disabled="true"] { - -moz-image-region: rect(0px 50px 21px 25px) !important; + -moz-image-region: rect(0px 50px 21px 25px); } #clear-button { list-style-image: url("chrome://global/skin/icons/close-button.gif"); } -/* Hides text below the above buttons - should now be configurable */ -/* -.toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-text, -.toolbarbutton-1 > .toolbarbutton-text { - display: none; -} -*/ - -#fullscreen-exit-button { - list-style-image: none; -} - -#fullscreen-exit-button > .toolbarbutton-text { -/* display: normal; */ -} - /* ::::: small primary toolbar buttons ::::: */ -.toolbarbutton-text[toolbarmode="small"] { - display: none; -} - -.toolbarbutton-icon[toolbarmode="small"] { - display: inline; -} - -#nav-bar[mode="text"] > #nav-bar-inner, -#nav-bar[mode="icons"] > #nav-bar-inner, -#nav-bar[toolbarmode="small"] > #nav-bar-inner { - margin: 2px 0px 2px 4px; -} - -toolbar[toolbarmode="small"] > toolbargrippy { - display: none; +#nav-bar[inFullscreen="true"] .toolbar-grippy { + /* display: none; */ } /* ::::: fullscreen window controls ::::: */ #window-controls { -moz-box-align: center; - padding: 0 2px 0 4px; + padding: 0 2px; border-left: 1px solid #9999CC; + -moz-margin-start: 2px; } #window-controls > toolbarbutton { - padding: 2px 0px 2px 2px; + padding: 3px; + -moz-padding-start: 2px; + -moz-padding-end: 1px; +} + +toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-icon { + display: -moz-box; } #minimize-button { @@ -157,15 +135,21 @@ toolbar[toolbarmode="small"] > toolbargrippy { /* ::::: nav-bar-inner ::::: */ #nav-bar-inner { - padding-left: 0px; + -moz-padding-start: 1px; + -moz-padding-end: 1px; min-width: 0px; - margin: 7px 4px 8px 4px; + -moz-box-align: center; } #urlbar { - outline: none; - border: 1px inset #CCD0DD; - margin: 0px 7px 0px 0px; + -moz-border-radius: 5px; + margin: 0; + -moz-margin-start: 3px; +} + +#urlbar > .autocomplete-textbox-container { + -moz-border-radius: 3px 0 0 3px; + padding: 2px; } #urlbar[level="high"] > .autocomplete-textbox-container, @@ -184,7 +168,7 @@ toolbar[toolbarmode="small"] > toolbargrippy { #page-proxy-deck { cursor: -moz-grab; - margin: 1px 1px 1px 2px; + margin: 0; } #page-proxy-button { @@ -235,17 +219,32 @@ toolbar[toolbarmode="small"] > toolbargrippy { #search-button, #go-button { - margin: 0px 3px 0px 0px; -/* min-height: 25px; */ + margin: 0; + padding: 1px 0; + -moz-margin-start: 2px; font-weight: bold; background-color: #9999CC; } +/* care that those buttons base on the same min height of 16px that the urlbar + autocomplete box gets through site icon and urlbar icons at the right */ +#search-button > .button-box , +#go-button > .button-box { + min-height: 16px; +} + #search-button { /* list-style-image: url("chrome://communicator/skin/icons/search.gif"); */ font-weight: bold; } +/* +toolbar[mode="text"] #search-button > .button-box > .button-icon, +toolbar[mode="icons"] #search-button > .button-box > .button-text { + display: none; +} +*/ + /* ::::: security button ::::: */ #security-button { @@ -278,17 +277,36 @@ toolbar[toolbarmode="small"] > toolbargrippy { } #home-button { - list-style-image: url("chrome://communicator/skin/bookmarks/home.gif"); + list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png"); + -moz-image-region: rect(84px 25px 105px 0px); +} + +#home-button[disabled="true"] { + -moz-image-region: rect(84px 50px 105px 25px); } -#bookmarks-chevron { +#toolbarbutton.chevron { list-style-image: url("chrome://navigator/skin/icons/chevron.gif") !important; } -#bookmarks-chevron > .toolbarbutton-menu-dropmarker { +#toolbarbutton.chevron > .toolbarbutton-menu-dropmarker { display: none; } +toolbarbutton.chevron > .toolbarbutton-text { + display: none; /* hide chevron label which has a width even if blank */ +} + +toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon { + display: -moz-box; /* display chevron icon in text mode */ +} + +/* Prevent [mode="icons"|"text"] from hiding the label and icon */ +#bookmarks-ptf .bookmark-item > .toolbarbutton-text, +#bookmarks-ptf .bookmark-item > .toolbarbutton-icon { + display: -moz-box !important; +} + /* ::::: feeds ::::: */ #feedsMenu { @@ -312,3 +330,72 @@ toolbar[toolbarmode="small"] > toolbargrippy { #feedsButton:hover:active { -moz-image-region: rect(48px 32px 64px 16px); } + +toolbar[iconsize="small"] > #back-button { + list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png"); + -moz-image-region: rect(32px 16px 48px 0); +} + +toolbar[iconsize="small"] > #back-button[disabled="true"] { + -moz-image-region: rect(32px 32px 48px 16px) !important; +} + +toolbar[iconsize="small"] > #forward-button { + list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png"); + -moz-image-region: rect(48px 16px 64px 0); +} + +toolbar[iconsize="small"] > #forward-button[disabled="true"] { + -moz-image-region: rect(48px 32px 64px 16px) !important; +} + +toolbar[iconsize="small"] > #reload-button { + list-style-image: url("chrome://navigator/skin/icons/navigatoricons-small.png"); + -moz-image-region: rect(0 16px 16px 0); +} + +toolbar[iconsize="small"] > #reload-button[disabled="true"] { + -moz-image-region: rect(0 32px 16px 16px) !important; +} + +toolbar[iconsize="small"] > #stop-button { + list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png"); + -moz-image-region: rect(16px 16px 32px 0); +} + +toolbar[iconsize="small"] > #stop-button[disabled="true"] { + -moz-image-region: rect(16px 32px 32px 16px) !important; +} + +toolbar[iconsize="small"] > #print-button { + list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png"); + -moz-image-region: rect(0 16px 16px 0); +} + +toolbar[iconsize="small"] > #print-button[disabled="true"] { + -moz-image-region: rect(0 32px 16px 16px) !important; +} + +toolbar[iconsize="small"] > #home-button { + list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png"); + -moz-image-region: rect(64px 16px 80px 0); +} + +toolbar[iconsize="small"] > #home-button[disabled="true"] { + -moz-image-region: rect(64px 32px 80px 16px) !important; +} + +/* ::::: home button on the personal toolbar ::::: */ + +#PersonalToolbar[iconsize="small"] > #home-button > .toolbarbutton-icon { + /* width: 16px; + height: 16px; */ +} + +#PersonalToolbar > #home-button { + cursor: pointer; +} + +#PersonalToolbar > #home-button[disabled="true"] { + cursor: default !important; +} diff --git a/LCARStrek/navigator/icons/back-disabled.gif b/LCARStrek/navigator/icons/back-disabled.gif deleted file mode 100755 index 477f8b2f8699c842cc07e7ee727e512028b58f2b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmZ?wbhEHb6lV}+*v!Dt5U}Ccv18}Xo%>H5Q2fcl$iTqJpu+$JATu0TYz$6#u3oF~ zx<>s)w7S#?s{3Eo@^xg)Kh;} KLY^oigEasLdrSEM diff --git a/LCARStrek/navigator/icons/back-hover.gif b/LCARStrek/navigator/icons/back-hover.gif deleted file mode 100755 index 6b8b97820f255b454566812175f30cce80250df1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 zcmZ?wbhEHb6lV}+*v!Ci?AWn$=gu)OF#IPDDE?$&1gd7x0TCcG7+9!C-kYQ{R{<5er9>ks&BpXPh)?cXH(9_H5Q2fcl$iTqJpu+$JATt

7jWatsH5!&(d*%7=_Re6NLy10jRePJa-B;6iv$o7`Dqm%YTDFN&=gHYtYu9Rp Lb+fuMFjxZsc!o}$ diff --git a/LCARStrek/navigator/icons/forward.gif b/LCARStrek/navigator/icons/forward.gif deleted file mode 100755 index e328606d9f3abee86eb58b4003dcaab13ccec691..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 145 zcmZ?wbhEHb6lV}+*v!Ci?AWn$=g$2<$MByxp!k!8kpT#FKm^DP1{OPk6P~O0hChgH zeKzNNOW)!yc9_tiAstSz&f%2yepmTjWcd2+VZ+O=9? K-K?$*4AuZztx#$J diff --git a/LCARStrek/navigator/icons/reload-disabled.gif b/LCARStrek/navigator/icons/reload-disabled.gif deleted file mode 100644 index ef568ef9e9b33085e33d4193a796ccd9d5008778..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102 zcmZ?wbhEHb6lV}+XkcJy2-xud|9{1wEQ|~cj0`#qKmd|qV6yG$UwN8w?>$D5Wv?{0 zMZV(AynMWK@y!Lt)HVBeO}frKFOSvV{M@O{H_PLLT4EKUX|JXi0vXsG$l zq7dFH<>&JNKVBp!k!8k%57cL5BedKxR0wI2xSrT)meu zWr6np>*`5Qu652eUzGE5Ur^Q|L-&OXdE0jSMDLbA`FzvNp7jdrI@Yk}&wB2%E6H=Y Q!fT-wqIs>75iAVW04=3a>i_@% -- 2.35.3