# HG changeset patch # Parent e10ffdb9c5c71470d60ececa2f7ea70f9ce00466 # User Lucas Rocha Bug 680077 - Update tabs pane for Honeycomb theme (r=mbrubeck) diff --git a/mobile/chrome/content/tabs.xml b/mobile/chrome/content/tabs.xml --- a/mobile/chrome/content/tabs.xml +++ b/mobile/chrome/content/tabs.xml @@ -7,17 +7,17 @@ xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - + false document.getAnonymousElementByAttribute(this, "anonid", "thumbnail"); @@ -26,20 +26,34 @@ this.parentNode.parentNode; 0) width = Math.min(width, browser.contentDocumentWidth); if (browser.contentDocumentHeight > 0) height = Math.min(height, browser.contentDocumentHeight); diff --git a/mobile/themes/core/gingerbread/browser.css b/mobile/themes/core/gingerbread/browser.css --- a/mobile/themes/core/gingerbread/browser.css +++ b/mobile/themes/core/gingerbread/browser.css @@ -930,16 +930,17 @@ documenttab[selected="true"] { documenttab:hover:active > stack > .documenttab-thumbnail, documenttab[selected="true"] > stack > .documenttab-thumbnail { opacity: 1.0; } .documenttab-close-container { position: relative; left: -16px; + -moz-margin-start: -16px; -moz-margin-end: 49px; } .documenttab-close { width: 40px; height: 40px; list-style-image: url("chrome://browser/skin/images/close-inactive-tab-hdpi.png"); } diff --git a/mobile/themes/core/honeycomb/browser.css b/mobile/themes/core/honeycomb/browser.css --- a/mobile/themes/core/honeycomb/browser.css +++ b/mobile/themes/core/honeycomb/browser.css @@ -950,107 +950,111 @@ autocompleteresult.noresults:hover:activ autocompleteresult.noresults > .autocomplete-item-container { text-align: center; color: @color_text_placeholder@; } /* Left sidebar (tabs) ---------------------------------------------------- */ #tabs-container { - -moz-border-end: @border_width_large@ solid #262629; - background: @color_toolbar_background@; + background: @color_tabs_background@; } #tabs:-moz-locale-dir(rtl) { -moz-box-align: start; } #tabs > scrollbox { - max-width: 350px; + max-width: 200px; + padding: 0px; } #tabs .tabs-list { display: block; - -moz-column-width: 121px; + -moz-column-width: 200px; -moz-column-gap: 0; -moz-user-focus: ignore; padding: 0; background-color: transparent; margin: 0; - -moz-padding-end: @padding_normal@; /* core spacing */ - -moz-padding-start: @padding_small@; /* allow the thumbnails to get close to the edge */ } #tabs-controls { margin-top: @margin_normal@; /* core spacing */ -moz-box-pack: center; } documenttab { - -moz-margin-start: @margin_xnormal@; margin-bottom: @documenttab_margin_bottom@; - width: 121px; - padding: @padding_normal@; - padding-bottom: @padding_xnormal@; - background: url("chrome://browser/skin/images/tab-inactive-hdpi.png") bottom repeat-x; - background-clip: padding-box; + width: 200px; + padding: @padding_xxnormal@; border: @border_width_tiny@ solid rgba(0,0,0,0.1); - border-bottom-width: @border_width_small@; line-height: 0; } documenttab[selected="true"] { border-bottom-color: rgba(0,0,0,0.2); - background: url("chrome://browser/skin/images/tab-active-hdpi.png") bottom repeat-x; } .documenttab-thumbnail { background-color: white; opacity: 0.5; /* if there is no border, blank thumbnail are invisible */ border: 1px solid white; + border-radius: @border_radius_tiny@; margin: -1px; } documenttab:hover:active > stack > .documenttab-thumbnail, documenttab[selected="true"] > stack > .documenttab-thumbnail { opacity: 1.0; } .documenttab-close-container { position: relative; - left: -16px; - -moz-margin-end: 49px; + -moz-box-pack: end; + -moz-box-align: center; } .documenttab-close { - width: 40px; - height: 40px; + width: 30px; + height: 44px; list-style-image: url("chrome://browser/skin/images/close-inactive-tab-hdpi.png"); } +documenttab[selected="true"] > stack > .documenttab-close-container { + background: url("chrome://browser/skin/images/close-background-hdpi.png"); + background-repeat: no-repeat; + background-position: right; + -moz-margin-end: -@padding_xxnormal@; + padding-right: 2px; +} + documenttab[selected="true"] > stack > hbox > .documenttab-close { list-style-image: url("chrome://browser/skin/images/close-default-hdpi.png"); } .documenttab-close-container:hover:active > .documenttab-close { list-style-image: url("chrome://browser/skin/images/close-active-hdpi.png"); } documenttab:only-child > stack > hbox > .documenttab-close { display: none; } documenttab[reload="true"] { - background: url("chrome://browser/skin/images/tab-closed-hdpi.png") bottom repeat-x; + background: url("chrome://browser/skin/images/tab-closed-hdpi.png"); + background-repeat: repeat; } .documenttab-reload { background: url("chrome://browser/skin/images/tab-reopen-hdpi.png"); + background-repeat: no-repeat; + background-position: center; display: none; } documenttab[reload="true"] > stack > .documenttab-close-container { display: none; } documenttab[reload="true"] > stack > .documenttab-reload { diff --git a/mobile/themes/core/honeycomb/defines.inc b/mobile/themes/core/honeycomb/defines.inc --- a/mobile/themes/core/honeycomb/defines.inc +++ b/mobile/themes/core/honeycomb/defines.inc @@ -1,16 +1,17 @@ %filter substitution %define color_background_active #fff %define color_text_active #222222 %define color_background_default_window #fff %define color_background_default rgba(255,255,255,0.95) %define color_text_default #222222 %define color_toolbar_background #eaeaea +%define color_tabs_background #000 %define color_divider_border #333333 %define color_button_border rgb(207,207,207) %define color_background_dialog #fff %define color_text_dialog #000 %define color_dialog_border #5a5a5a %define color_background_dlgbuttons #9a9a9a %define color_background_panel #d6d6d6 %define color_text_panel #000 diff --git a/mobile/themes/core/honeycomb/images/close-active-hdpi.png b/mobile/themes/core/honeycomb/images/close-active-hdpi.png index 935b7555e4d8aceb67a15f9eb137b6ddade69522..1e616b6698a5fc77fbf709cf62af43e7aeb949df GIT binary patch literal 626 zc$@)p0*(ENP)|Su(NjQU+`YtyJ_KZ5D^sw#lq6C_u&0tjNF!k z?C|@+2Y%bWd*8kHd%tb&e!uS;#TavqXmDe0%#FD*H~#;|f(^|$FiGtR8fP#*a3oOv8^)3wR(-m<25{Jx7%CE zWU@jf4G?m%Sln+k8U@s(QmIoab;n7@BFm^$Djoiic{H2Np0P|ZYt+&`9<$hP8~Ot<`D=Ec0P9wY$b_^k@rd znM~$dQIuPD!Rz%t=kxgs+B)x+nf~(4B~c^!pt+7zRgH+E_>O3rCZ*HqlUA#>NZU=e z712gnWMCQC#HPa1VyUs@NH`pR!gG;GL~S;kyQGz^;#!%`0AUP>f%T@i-oT3fn!#Lh zVmt?I#A30VA50Zi4Wl_$2M9PZ#+x@W7-BFL^h?3a@!{}oM;$)&KE|e+H+&?XXs`Bk zI++^F_>p)R6xhxSL^6C9pDlEPPS|Su(NjQU+`YtyJ_KZ5D^sw#lq6C_u&0tjNF!k z?C|@+2Y%bWd*8kHd%tb&e!uS;#TavqXmDe0%#FD*H~#;|f(^|$FiGtR8fP#*a3oOv8^)3wR(-m<25{Jx7%CE zWU@jf4G?m%Sln+k8U@s(QmIoab;n7@BFm^$Djoiic{H2Np0P|ZYt+&`9<$hP8~Ot<`D=Ec0P9wY$b_^k@rd znM~$dQIuPD!Rz%t=kxgs+B)x+nf~(4B~c^!pt+7zRgH+E_>O3rCZ*HqlUA#>NZU=e z712gnWMCQC#HPa1VyUs@NH`pR!gG;GL~S;kyQGz^;#!%`0AUP>f%T@i-oT3fn!#Lh zVmt?I#A30VA50Zi4Wl_$2M9PZ#+x@W7-BFL^h?3a@!{}oM;$)&KE|e+H+&?XXs`Bk zI++^F_>p)R6xhxSL^6C9pDlEPPS`$nJlm9@}MW}<5xcCSB2kPYFYA1(^sI&#a(pn`F-@`X}grvDP zU>)w@fnM*;_ws%B-6cuabrZc9eTg0oZLE#8u{PGm|KHe9)TO`xf49I_gwCMuBaX4q z*kFY7H}DGTK3xWkQJ1FfG0a@W*aQ~HbAADa7_=^#+SF}=EI0x0;3+Vw_z;L-0<43E z`!lY<5|{?Vpr4vWP;`IC2AB+stI}L8mhF`DHE_t1=7`923v5$!%x7AmQ57;yOBwA2 zWG*<9GA&Xop2>v8O)7qKd5t47TLuSU5L`=D@G?CI74Ge4oQypTV1orvkTUNm(@yr- z8xFg;0d7G_TC0Ie9-U^}OuM+bOg55es(mm|lP1@Wz!Z;?6&X#j%odmht86Nlr7n;v z|0{z$wN|^BDyE}gh5^eyQ?cK3zBSq0jANVyE8s4`)RwB@Hy72(#c8e-dqG^24`3JE z@VHdSGq?vk)R?@lL$73&b1Z_4`(6@N8ak5BVq^JV5-;5vd*~i77@Fc@sM=J!($unkx3nHD%(BeXC9{ zGM&1>Nh>72LrD0)c=0nE3l3GaeM?R}R+uuQLgdBY2MVFpPnOvH-YoRx-`{P@8>^V> z+IFaGPxxHZCcNd>`eW-~@n|i1$E#d6!TDPk_fft_an+GAOgs#;BNY2GFZ%8RI-0@L L)z4*}Q$iB}x3+FW diff --git a/mobile/themes/core/jar.mn b/mobile/themes/core/jar.mn --- a/mobile/themes/core/jar.mn +++ b/mobile/themes/core/jar.mn @@ -355,16 +355,17 @@ chrome.jar: skin/honeycomb/images/next-disabled-hdpi.png (honeycomb/images/next-disabled-hdpi.png) skin/honeycomb/images/identity-default-hdpi.png (honeycomb/images/identity-default-hdpi.png) skin/honeycomb/images/identity-ssl-hdpi.png (honeycomb/images/identity-ssl-hdpi.png) skin/honeycomb/images/identity-ev-hdpi.png (honeycomb/images/identity-ev-hdpi.png) skin/honeycomb/images/unlocked-hdpi.png (honeycomb/images/unlocked-hdpi.png) skin/honeycomb/images/locked-hdpi.png (honeycomb/images/locked-hdpi.png) skin/honeycomb/images/close-default-hdpi.png (honeycomb/images/close-default-hdpi.png) skin/honeycomb/images/close-active-hdpi.png (honeycomb/images/close-active-hdpi.png) + skin/honeycomb/images/close-background-hdpi.png (honeycomb/images/close-background-hdpi.png) skin/honeycomb/images/close-inactive-tab-hdpi.png (honeycomb/images/close-inactive-tab-hdpi.png) skin/honeycomb/images/check-30.png (images/check-30.png) skin/honeycomb/images/check-selected-hdpi.png (honeycomb/images/check-selected-hdpi.png) skin/honeycomb/images/check-unselected-hdpi.png (honeycomb/images/check-unselected-hdpi.png) skin/honeycomb/images/search-glass-30.png (honeycomb/images/search-glass-30.png) skin/honeycomb/images/search-clear-30.png (honeycomb/images/search-clear-30.png) skin/honeycomb/images/section-expanded-16.png (images/section-expanded-16.png) skin/honeycomb/images/section-collapsed-16.png (images/section-collapsed-16.png)