Bug 682412 - Theme settings on Honeycomb. r=mfinkle
authorSriram Ramasubramanian <sriram@mozilla.com>
Wed, 28 Sep 2011 12:30:12 -0700
changeset 77776 ed87178d3ee2582609d91e173a5692bb587d3fbc
parent 77775 b045aa0216fb37e1ba9a90114ac6615ccd20a180
child 77777 482cba26ee79172237cf82c0450e0e886b47d2ae
push id3
push userfelipc@gmail.com
push dateFri, 30 Sep 2011 20:09:13 +0000
reviewersmfinkle
bugs682412
milestone10.0a1
Bug 682412 - Theme settings on Honeycomb. r=mfinkle
mobile/chrome/content/downloads.js
mobile/chrome/content/extensions.js
mobile/themes/core/honeycomb/browser.css
mobile/themes/core/honeycomb/defines.inc
mobile/themes/core/honeycomb/images/addons-default-hdpi.png
mobile/themes/core/honeycomb/images/check-selected-hdpi.png
mobile/themes/core/honeycomb/images/check-selected-tap-hdpi.png
mobile/themes/core/honeycomb/images/check-unselected-hdpi.png
mobile/themes/core/honeycomb/images/check-unselected-tap-hdpi.png
mobile/themes/core/honeycomb/images/downloads-default-hdpi.png
mobile/themes/core/honeycomb/images/preferences-default-hdpi.png
mobile/themes/core/honeycomb/platform.css
mobile/themes/core/jar.mn
--- a/mobile/chrome/content/downloads.js
+++ b/mobile/chrome/content/downloads.js
@@ -84,16 +84,17 @@ var DownloadsView = {
         item.setAttribute(attr, aAttrs[attr]);
   
       // Initialize other attributes
       item.setAttribute("typeName", "download");
       item.setAttribute("id", "dl-" + aAttrs.id);
       item.setAttribute("downloadID", aAttrs.id);
       item.setAttribute("iconURL", "moz-icon://" + aAttrs.file + "?size=32");
       item.setAttribute("lastSeconds", Infinity);
+      item.setAttribute("class", "panel-listitem");
   
       // Initialize more complex attributes
       this._updateTime(item);
       this._updateStatus(item);
     }
     return item;
   },
 
--- a/mobile/chrome/content/extensions.js
+++ b/mobile/chrome/content/extensions.js
@@ -84,16 +84,17 @@ var ExtensionsView = {
     item.setAttribute("id", PREFIX_ITEM_URI + aAddon.id);
     item.setAttribute("addonID", aAddon.id);
     item.setAttribute("typeName", aTypeName);
     item.setAttribute("type", aAddon.type);
     item.setAttribute("typeLabel", this._strings["addonType." + aAddon.type]);
     item.setAttribute("name", aAddon.name);
     item.setAttribute("version", aAddon.version);
     item.setAttribute("iconURL", aAddon.iconURL);
+    item.setAttribute("class", "panel-listitem");
     return item;
   },
 
   clearSection: function ev_clearSection(aSection) {
     let start = null;
     let end = null;
 
     if (aSection == "local") {
@@ -615,16 +616,17 @@ var ExtensionsView = {
     let formatter = Cc["@mozilla.org/toolkit/URLFormatterService;1"].getService(Ci.nsIURLFormatter);
     let browseURL = formatter.formatURLPref("extensions.getAddons.browseAddons");
 
     let strings = Strings.browser;
     let brandShortName = Strings.brand.GetStringFromName("brandShortName");
 
     let whatare = document.createElement("richlistitem");
     whatare.setAttribute("typeName", "banner");
+    whatare.setAttribute("class", "panel-listitem");
     whatare.setAttribute("label", strings.GetStringFromName("addonsWhatAre.label"));
 
     let desc = strings.GetStringFromName("addonsWhatAre.description");
     desc = desc.replace(/#1/g, brandShortName);
     whatare.setAttribute("description", desc);
 
     whatare.setAttribute("button", strings.GetStringFromName("addonsWhatAre.button"));
     whatare.setAttribute("onbuttoncommand", "BrowserUI.newTab('" + browseURL + "', Browser.selectedTab);");
--- a/mobile/themes/core/honeycomb/browser.css
+++ b/mobile/themes/core/honeycomb/browser.css
@@ -404,16 +404,20 @@ toolbarbutton.urlbar-button {
 #tool-back2 {
   margin: @margin_small@ @margin_snormal@;
   /* adjust the min-width of this button to account for padding */
   min-width: -moz-calc(@touch_button_small@ - 2 * @margin_snormal@) !important;
   min-height: -moz-calc(@touch_button_small@ - 2 * @margin_snormal@) !important;
   border: @border_width_small@ solid @color_url_border@;
   -moz-border-radius: 100%;
 }
+ 
+#tool-back2 image {
+  -moz-margin-end: 0;
+}
 
 #tool-forward2 {
   margin: 0px;
   padding: 0px;
   -moz-margin-start: -@margin_xxxnormal@;
   -moz-margin-end: -@padding_tiny@;
   -moz-padding-start: @padding_xxxnormal@ !important;
   -moz-padding-end: @margin_xnormal@ !important;
@@ -543,22 +547,37 @@ remotetabslist[message] > .remotetabs-li
  */
 #browsers > notificationbox {
   -moz-user-focus: ignore;
 }
 
 /* browser tools panel UI   ------------------------------------------------ */
 .panel-header {
   margin: 0;
-  padding: @padding_small@ @padding_normal@ @padding_normal@ @padding_normal@;
-  font-weight: bold;
-  background-color: @color_background_header@;
-  color: @color_text_header@ !important;
-  background-repeat: repeat-x;
-  background-size: auto 100%;
+  padding: @padding_small@ @padding_normal@ @padding_xlarge@ @padding_normal@;
+  border-bottom: @border_width_tiny@ solid @color_text_default@;
+  background-color: transparent;
+  color: @color_text_panel_header@ !important;
+  font-size: @font_snormal@;
+}
+
+.panel-listitem {
+  padding-top: @padding_xxxnormal@;
+  padding-bottom: @padding_tiny@;
+  -moz-padding-start: @padding_xlarge@; 
+  -moz-padding-end: 0;
+}
+
+.panel-listitem:not([class="section-header"])[selected="true"] {
+  background-color: @color_background_settings@;
+}
+
+.panel-listitem label.normal,
+.panel-listitem description.normal {
+  color: @color_subtext_settings@;
 }
 
 #tool-addons {
   list-style-image: url("chrome://browser/skin/images/addons-default-hdpi.png");
 }
 
 #tool-downloads {
   list-style-image: url("chrome://browser/skin/images/downloads-default-hdpi.png");
@@ -578,16 +597,20 @@ remotetabslist[message] > .remotetabs-li
 }
 
 /* bug 597296 - The language.properties file is LTR and never translated */
 #prefs-languages .menulist-label {
   direction: ltr !important;
 }
 
 /* addons panel UI   ------------------------------------------------------- */
+#addons-list .addon-options {
+  -moz-margin-start: @margin_xlarge@;
+}
+
 #addons-repo {
   -moz-box-orient: horizontal;
   -moz-box-align: center;
 }
 
 @media (@orientation@: portrait) {
   #addons-repo {
     -moz-box-orient: vertical;
@@ -595,18 +618,17 @@ remotetabslist[message] > .remotetabs-li
   }
 }
 
 .addon-image,
 .searchplugin-image {
   list-style-image: url("chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png");
   width: 32px;
   height: 32px;
-  -moz-margin-start: @margin_normal@;
-  -moz-margin-end: @margin_normal@;
+  -moz-margin-end: @margin_xxxnormal@;
 }
 
 .addon-rating[rating] {
   width: 78px;
   height: 18px;
   list-style-image: url("chrome://browser/skin/images/ratings-18.png");
 }
 
@@ -638,44 +660,40 @@ remotetabslist[message] > .remotetabs-li
 .addon-banner-image {
   width: 32px;
   height: 32px;
   list-style-image: url("chrome://browser/skin/images/addons-32.png");
   -moz-margin-start: @margin_normal@;
   -moz-margin-end: @margin_normal@;
 }
 
-richlistitem[isDisabled="true"] .title,
-richlistitem[isDisabled="true"] .normal {
-  color: @color_text_disabled@;
+/* downloads panel UI   ---------------------------------------------------- */
+#downloads-list image {
+  -moz-margin-end: @margin_xxxnormal@;
 }
 
-richlistitem[isDisabled="true"] image {
-  opacity: 0.25;
-}
-
-/* downloads panel UI   ---------------------------------------------------- */
 .download-retry-failed {
   color: red !important;
   display: none;
 }
 
 .download-retry-failed[state="2"] {
   display: -moz-box;
 }
 
 /* special "no downloads" items */
 #dl-empty-message {
   margin-top: -moz-calc(2 * @touch_row@); /* 2 times row height */
   font-style: italic;
   border-bottom: none;
+  background-color: @color_background_settings@;
 }
 
 #dl-empty-message:active {
-  background-color: @color_background_default@;
+  background-color: @color_background_settings@;
 }
 
 #dl-empty-message > label {
   text-align: center;
   color: @color_text_placeholder@;
 }
 
 /* console panel UI   ------------------------------------------------------ */
@@ -1404,38 +1422,53 @@ pageaction:not([image]) > hbox >.pageact
 
 #search-engines-list > .action-button[image=""] > .button-box > .button-icon {
   list-style-image: url("chrome://browser/skin/images/favicon-default-32.png");
 }
 
 /* Preferences window   ---------------------------------------------------- */
 .settings-title {
   min-height: 0;
-  color: @color_text_header@;
-  background-color: @color_background_header@;
-  font-size: smaller;
+  color: @color_text_panel_subheader@;
+  background-color: @color_background_button@;
+  font-size: @font_xtiny@;
   font-weight: bold;
   margin: 0;
-  padding: @autocompleteresult_padding@ @padding_xnormal@;
-  border-bottom: @border_width_tiny@ solid @color_divider_border@;
+  padding: @padding_xxnormal@ @padding_large@;
+  border-top: @border_width_tiny@ solid @color_background_settings@;
+  border-bottom: @border_width_large@ solid;
+  -moz-border-bottom-colors: @color_background_button@ @color_background_settings@; 
 }
 
 .setting {
-  padding-left: @padding_xnormal@;
-  border-bottom: @border_width_tiny@ solid #cacdd5;
+  -moz-padding-start: @padding_xxlarge@;
+  border-bottom: @border_width_tiny@ solid @color_background_button@;
 }
 
 setting {
   padding: @padding_xsmall@;
-  border-bottom: @border_width_tiny@ solid @color_divider_border@;
+  -moz-padding-start: @padding_xxlarge@;
+  border-bottom: @border_width_tiny@ solid @color_background_button@;
   min-height: @touch_row@; /* row size */
   -moz-box-align: center;
   -moz-box-orient: horizontal;
 }
 
+setting:hover:active {
+  background-color: @color_background_highlight@;
+}
+
+setting[type="bool"]:hover:active .setting-input > checkbox > .checkbox-spacer-box > .checkbox-check {
+  background-image: url("chrome://browser/skin/images/check-unselected-tap-hdpi.png");
+}
+
+setting[type="bool"]:hover:active .setting-input > checkbox[checked="true"] > .checkbox-spacer-box > .checkbox-check {
+  background-image: url("chrome://browser/skin/images/check-selected-tap-hdpi.png");
+}
+ 
 .setting-label {
   -moz-box-flex: 1;
 }
 
 .setting-group > setting {
   border-bottom: none;
 }
 
@@ -1459,32 +1492,32 @@ setting {
   setting[type="integer"] > .setting-input > textbox,
   setting[type="string"] > .setting-input > textbox {
     width: 499px; /* textboxes seem to need a width in order to flex */
     -moz-box-flex: 1;
   }
 }
 
 .options-box {
-  -moz-margin-start: 28px;  /* sized based on the 32px addon image */
+  -moz-margin-start: @margin_xlarge@;
 }
 
 .options-box > setting:last-child {
   border-bottom: 0;
 }
 
 /* XXX should be a richlistitem description.title */
 .preferences-title {
-  font-size: @font_normal@ !important;
+  font-size: @font_snormal@ !important;
 }
 
 /* XXX should be a richlistitem description.normal */
 .preferences-description {
-  font-size: @font_small@ !important;
-  color: @color_subtext_default@;
+  font-size: @font_xtiny@ !important;
+  color: @color_subtext_settings@;
 }
 
 /* alerts popup ----------------------------------------------------------- */
 #alerts-container {
   color: @color_text_default@;
   background-color: #5e6166;
   border: @border_width_small@ solid #767973;
   border-radius: @border_radius_normal@;
@@ -1661,20 +1694,16 @@ setting {
 
 #appmenu-popup-appcommands richlistitem {
   -moz-box-align: center;
   border-top: @border_width_tiny@ solid @color_button_border@;
   border-bottom: none;
   background-color: transparent;
 }
 
-#appmenu-popup-appcommands richlistitem:hover:active {
-  background-color: @color_background_highlight_overlay@;
-}
-
 #appmenu-popup-sitecommands {
   display: block;
   max-width: -moz-calc(4.51 * @touch_button_xlarge@ + 2 * @padding_normal@) !important;
   width: -moz-calc(4.51 * @touch_button_xlarge@ + 2 * @padding_normal@) !important;
 }
 
 #appmenu-popup-sitecommands > .appmenu-pageaction {
   font-size: @font_tiny@;
--- a/mobile/themes/core/honeycomb/defines.inc
+++ b/mobile/themes/core/honeycomb/defines.inc
@@ -4,77 +4,90 @@
 %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_toolbar_border #d9d9d9
 %define color_divider_border #6699ff
 %define color_url_border #737373
+%define color_background_button #d9d9d9
+%define color_background_button_disabled #e3e3e3
+%define color_background_button_overlay rgba(217, 217, 217, 0.8)
 %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
 %define color_background_header #6699ff
 %define color_text_header #fff
 %define color_background_scroller #9a9a9a
 %define color_background_textbox #fff
 %define color_text_textbox #000
-%define color_text_button #000
 %define color_text_disabled #808080
+%define color_text_button #222
+%define color_text_button_disabled #999
 %define color_text_placeholder #808080
 %define color_text_as_link #69f
 %define color_background_panelrow #c8c8c8
 %define color_text_panelrow #222222
 %define color_text_toolbutton_inverse #666666
+%define color_background_settings #efefef
+%define color_text_panel_header #999
+%define color_text_panel_subheader #333
 
 %define color_background_highlight #a7c5f4
 %define color_background_highlight_overlay rgba(167, 197, 244, 0.8)
 %define color_text_highlight #000
 %define color_selection #c0e49a
 %define color_shadow #6699ff
 %define color_shadow_light rgba(102,153,255, 0.2)
 %define color_shadow_green rgba(137,251,21, 0.2)
 %define color_shadow_grey rgba(200,200,200, 0.5)
 
 %define color_subtext_default #aaaaaa
+%define color_subtext_settings #666666
 
 %define font_xlarge 6.08mozmm
 %define font_xnormal 3.75mozmm
 %define font_normal 3.54mozmm
 %define font_snormal 3mozmm
 %define font_small 2.91mozmm
 %define font_xsmall 2.69mozmm
 %define font_tiny 2.48mozmm
 %define font_xtiny 2.27mozmm
 %define font_xxtiny 1.93mozmm
 
-%define touch_row 10.41mozmm
+%define touch_row 10.478mozmm
 %define touch_button_xlarge 10.62mozmm
 %define touch_button_large 9.77mozmm
 %define touch_button_small 8.93mozmm
 %define touch_button_minwidth 11.86mozmm
 %define touch_action_minwidth 21.17mozmm
+%define touch_button_tiny 3.75mozmm
+%define touch_button_minwidth 16.30mozmm
+%define touch_button_minwidth 11.86mozmm
 %define touch_normal 6.77mozmm
 
 %define margin_context_popup 3.39mozmm
 %define margin_xlarge 3.39mozmm
 %define margin_large 2.54mozmm
 %define margin_xxxnormal 1.69mozmm
 %define margin_xxnormal 1.27mozmm
 %define margin_xnormal 1.06mozmm
 %define margin_normal 0.85mozmm
 %define margin_snormal 0.64mozmm
 %define margin_small 0.42mozmm
 %define margin_tiny 0.21mozmm
 %define margin_xtiny 0.11mozmm
 
+%define padding_xxxlarge 13.35mozmm
+%define padding_xxlarge 7.938mozmm
 %define padding_xlarge 3.39mozmm
 %define padding_large 2.54mozmm
 %define padding_xxxnormal 1.69mozmm
 %define padding_xxnormal 1.27mozmm
 %define padding_xnormal 1.06mozmm
 %define padding_normal 0.85mozmm
 %define padding_snormal 0.64mozmm
 %define padding_small 0.42mozmm
@@ -131,17 +144,20 @@
 %define autocompleteresult_padding 0.53mozmm
 
 %define dialog_width 76.2mozmm
 
 %define appmenu_portrait_height 21.17mozmm
 %define appmenu_button_height  10.48mozmm
 
 %define tablet_panel_controls  40mozmm
+%define tablet_panel_controls_wide  55mozmm
 %define tablet_panel_minwidth  124mozmm
+%define tablet_panel_item_width  69mozmm
+%define tablet_panel_item_width_wide  90mozmm
 
 %ifdef MOZ_PLATFORM_MAEMO
 %define orientation -moz-device-orientation
 %elifdef ANDROID
 %define orientation -moz-device-orientation
 %else
 %define orientation orientation
 %endif
index 25f09906e011be78b7feebc4ff9323aaacf99561..90ea938027a99e644b82716390484bc50bf427ba
GIT binary patch
literal 791
zc$@(j1L*vTP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!xk*GpRCwC#S3QpsQ51#6VHO!J#IX=6
z5+ap^!UVD%77~nwk<yQb3bs-T3kwPp8)EnYm}p`A0mcLqHBmzd*}}v|6XS*g9F)bN
z@}Vpvo@?$Tvy)-@SXhePm)!8+-8b*N`_4IUunvbq%QD-FWyx*n0FF$VFCy$5TH8kS
z5x*A=fEJe#N4c*D&_Oh20Wl4LV+bji%iV6ZT0!kcNs>OL)9E`5WD7A^1P27#d7)4^
zSFKiWwA<~oTGZ?HEBSo>I>w!bqnRrJE9GLr<NKw8RRk^O;-K<(;_>(^m&^5BpXhKn
zHY1V93qF5`Va`k(SY@&~x%4}l&*yvEY&I`w-vfcbeXrL`1Uz9#?J!xlb}g-m6VlF4
zXS3P6D7nu#sH&>e>-D_)3fOG6wlOah3T30w=xcNpCg{W!pj`{JIFW2z3H4y~jrp>|
z{5jZGY-K`<^RVJs+9_5?pNZMhb7Cw25Uc~DeV&95X7*hwmHg#$`Lf63*?^2+(j)bb
zX{G`ymkifiBO<xo?rJz3-h>6;A{U%=W%3IEuPcfYhjK{L7Qf$rFOf(*K=&Ks*Qg3m
zdA1>;4ORphjEV<-1b~URuJ;P9Vg5yYJkeXW82}n|YCa&#@|#pD^{`T@T-vYqfgL_T
zf!l6<9*c>hsPNgV3zs3Ba6Oq!p2v0l{{OB7;cGA$e2i|F6*0RE$$r6!w}ZhzqU(56
z9`1-rCX>0!$EvanI}BoW0I^u?CY14kDhRGvb^-C1?*coQo_79Y&rVn@7O&A<X#7m0
z(TI*o|B3j*(jyZZ?im2zl0vOk^Jp5MrwXV{T{zb>EcDK75{N}R>XJzz?~z#!jq$mw
z)4mT7sFVCcVjD3}Bb2~CZ+cU6&i82nXdvuk0Q7l$)Qc#M{~3E#9{x8x@Bsb^FaSVI
V4<wMnYMTH6002ovPDHLkV1k_mXgmM_
index 2fa34331d93149a113646952e9095e3a338f7b1f..10b067f39d5eb6b4cbdcad2e44cbd4acd7051ca7
GIT binary patch
literal 906
zc$@)>19kj~P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#EJ;K`RCwC#ms@KSK@`Vlc4s%cn~RNY
zx0N>0RH!}(KKSN~eGmj`-z#cCDD?~YqCN`hXDAfG8x*lZiv>S`zKNG7r59}_)FzrX
z*S*hprcN{nw%KUygIPGRJ8b6nKWF}PW`h}HXfH1b?eWzXKz3{5$(NWXhehy<)nnqs
zPvha;Frk3+<P;J7*@y5%1a%Q)7vNaTYY<6~8%ke7mLiJn<;#|zE5djcf{JSVT@N(E
zAv!hEebA@X%SHSBvwhlN2A-2Jt~M;o&J~!NnqsDDHi2iT7tg@dE~2=E`Um1@(Z7Dp
z^7F%#`R3Q!>)TN^HDUYtLMQ<oJ~A?bo5-B6wISn3ry|Ew3x52R<*kng)XHFlJ&ef)
zWnSHg;dg<6pkG{Fe<pQ!ge23F6d3~e1)tUiFqSQy^vtSq;!e$5D+v>_Py&RjW%0f&
zh67<HE<gi#mr6R)GS)c!qED?u0I%xAoCgy=EIG?r%G_22Y`x2&8j+%gBFCbPQOTzj
z2OusN0PqCBQ{eicn)i7upmrKcUeQVSyoAYvs+;`)@Ep8bX{iEyw<uCfk4G}58*C0U
z%!n$-UsT*rd_t_qi6p>JLWwU0)ae6w8Q@O`m0P24t%(}|Ux)X~5H9S0+KLBc2`if8
z7fx5b>`gupQ&V>}()B!GPN2xqBQ<wz4DNfN>;N}sA@k|%$Lc6Ge-95MfCbE^3FYuB
z$g;)|H6Z)3n40b)lCe>7SI>gOli%08cSgeUV_1siC{3X4;9(k30PAf7Xrt3OJ}zOE
zuP5T*lCyMv3yvh)P!3FkBOd{LiI*KS9c>41QUI<y-iB6MC_0NP9opbk5RtE&iSP5M
z+J6r*HUo|4hv6_&(01@J72uQD5JfL2XUp!&yAJK>6(Isahns|DdC~~ynKv}NKNBEM
zE?$KiL;*ysLiyh$BAIjh^<!rk3+}^Vvmo4F*{SR;bwVxz8WI;_@ruB9v><XK2~SkW
z;rGqLL!X8XmEbVm)%d~k1!7ZFCltJ;?|}vp!9V#V%jI%tZf>rn&nEuc9rsxKe?eP7
gTfl!W;F|yg0Gb7+$-zFqF#rGn07*qoM6N<$g2<|zeE<Le
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..85c7ff80ff6f1db5f24af1185c40bd4d1efacce0
GIT binary patch
literal 976
zc$@*y126oEP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#a!Eu%RCwC#R!dJ4VH7>{>SJsRtpXNM
ziHceYJ`xv(AQ}k^h#Ob_1y?4<xG`)@*tl?K{0XjH`8FCiz7rFpyy7E@n6^AZwe&fC
zdha(=0x>`bfo{BTI^PUs&bjxV`^~7=?iiqGAzUYPTkDOCFyRH^60cSI*iU#x2w-!9
z6Ff)gBb<=wV`vk}7YB0=$(E8@MIX1IZX@noE|&;pUYHjoiGC$sSVs{ab)(2jr6Nj&
zJc`AFIG1GwilRYQh?3S75$gJrmj!v=$Pm)v$mgoV1&31?P-IzDf<s<^@`51EB!6K(
z7R9&sck%MpMWo`hFfvIL3OTbiR;*fqiSbu(y1mt~i%bi71KIRE+@5;GBA*cb{2WGV
z4x`U*;^@F-l<7OLBY??+ZJjnU|1J7GGdYaN$U|h}VMwwH&E;J%<Kj^5l-F8WM`_`_
z(sL$H{+`Cnj}HisK0-Dgfvh^wxVHzp4);TIxXFm>5)rB$SC@-LaTMlZCzF|27?+)U
zo?!BckBE#uM0P$3MRQ}@?k=<*?1k<Pz~Rzq0JOzpScL$qw?!h!=dvi|3?WESH6eoQ
zk;|q;=ChL@5gvH}BQZ_nx=G&A3$MS)6yV%qjv;JT09KYpI)Uhy*J8H)%^@LzE0D`3
zF&7?3c=$ey<SZ12j)pzmXbqi)H?SRBd|N4dkNCbM$@V=UDnOgc^!In<<{RQ#bLScO
z8rnra)A1;xV~>$f#{@a|yd`uBK7SCpFR(0m)dD1#TWDQVyXb2%pFw2!9#T7x6QKw3
zpKnn#5|A|)8uy(-%l;lg&Yq}m+_@}y)f<tdDB>pU;zI*h;Ly#7XMFMvVqc${<cb5^
z5A>n+z)AQ5&6N38XioQv<kblf4-pxv=7dxCLHGEv@8o%C?)n8Y@tg-c`YH2nGF;Gd
zylJ?V$g8hFMS$A_Pkj^WD8ta{3sece`1_6{Xa6E!EpvMw;JKxd;}-B*rj}^*P&sz?
zsxT;DcTsg1e7#z7TRUMzgi1!MRD>sk$B+f_Iis4guSvjS5egGgmP=kX_=k2zJLGG6
zACQD86<R6l@(5p5fRUlyZ(?{&H|PKTX8~=Yt_^)Fl~LpPFMtKaYsjBu0nchE;0X&D
yB*bb!&YXiRV2p5xaGNl-3B*$t7jusN5nuo~kyPishTl2>0000<MNUMnLSTY?nY#G^
index add20cb42c95c01e48fc327e59b06f03e2d28370..ca1e30df8b78a0aa414a2e56db3eab86a90d151a
GIT binary patch
literal 209
zc%17D@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWu?Bo-U3d6}OW9{Qqx%*nvr{jgf6JpG4__70eMFnlr4+-_;u$
z8gAmL|N2VQxv0oU*_E#$>YPU(b3@gC{=XUxjPddDlX&m%sr;Ow2iD~#Yw)TeF+jF?
vRY<^EH=mt-zWRy>EN<yTB=;~gF!3-Hv`ft{xDdM(Xg!0ctDnm{r-UW|n3YEV
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c478328b9ffde0fceb0c9bff209a09f1dc98b014
GIT binary patch
literal 295
zc%17D@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1GCp}#pLn>}1y}a{fG9$;5#vS4vxeIclnwC4%uyk}g=7=dQ
z<U4Y_A)=$vj^W9{0);Zxq-ZsTi%#yRCo-NmC#JT-n~iHnlgt782EGT0NfHSLuNcId
zW`28D$!5lvw~6Qf*T>q;TQ(`C@-al}X{~je#vEtA*K`(}o2<dBhCucntAs0zhZk6}
zg|0kuC2Pl*pf?OoUw>vuNr>_NuxR*J&uE!&pTR1@`~;(^!=F3`9rl}%%tZ%G6|ONq
p0tz(oiS2K=#k%RUltTj}LzSrd^1VD0rU5<0;OXk;vd$@?2>`q0Y+e8W
index f9afa2cec9fb6e797bd5f8b40c9e8cf84744590f..cdcd2db8b549c65c648b634c0902a08155a672a1
GIT binary patch
literal 486
zc$@*|0U7>@P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzh)G02RCwBA{Qv(y!$1Nih5-hn4qzcc
zEh`Z712G#BYJUOoPaytGO$P`7u`m#G6X}4jQ1)kPH~{2p?lo)HIG;FiVhSO}JUl#?
z8X6j6fXt7hiEz{b<m3WSDrW~`Mk?7Mj3bBq!{z`%Xm;bGQs_uw5&H@?|24=Fj7XIc
z$U@0`_wK1LUAnaS@87>X=sH1S-@kuXB4jHwGxJwYPR_g7<dl__m&eA&t^zWj0r3w;
zwAv6H0y}o>u-U(V|8$^*+|-P3VPWB&m6er+K;}DG2%rb^dr-;c;o))0(a|vz<P#cL
z{ta3>{==0EK#q7zO-G<v{u)Z-%!Yrd=?Hw5<0}WK;s`>P6Do)(as)A!6H^kB<p^Re
zC$=ai$q}SjPD))slp{#BoYcw)uOrB@90VB2=oc_UOH5&4iD?EZF$Dw!j*w$H7=Ro=
z24)6g5g=AScI=oxkk$lZc_8K@)htE|dPdC9Rx&rVhWkO1&nbukY!3NLu4cy3zTt>>
c06>5N0J(4}ALP^;bN~PV07*qoM6N<$f_KivcmMzZ
index 49d89c1df278bb35478c9a740b1a05b20fdad51f..41d0f35acd87eeec65dca94ac9b9fa2ffeed2e35
GIT binary patch
literal 530
zc$@(e0`2{YP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzv`IukRCwBA{Qv(y!$1Nih5-gFL^={#
z9Vp0t<50^+q&lJ<APB@<K+K9H_78}^0r49oF_63f5OWhyN0I|TKIgi3@1FX(bLTW+
zf;>DtpFBJ~jslrKf%r32m>-CR*Q{CNOh6q;4gkrqf-FCA;=~jrgD(LMz5rx?L<@Ru
zBGe7OL^!A&z(|CCc3NdaA!v$b10^O<d?Ll|ZD{rq24YSieobu$FoP^Ve*C!6$&)7o
zK>`8-0_TwxOqejC0z?-S6m$ToAGB})^V6qKWu82F5>G(?WFY=DY!l(IasWFiY2Xhi
zl^YouT?f)R-@kw7ef##U2E5Q`W&JEJE`9^b{R&Mppxp3_h}`lMBd_CV55OxSVEOKi
zUc@#uG{iv5_rJ)w1s8zkmN(ccCS2vfd#LZE@R$p7057GvWi%HIi6$97@HHePWG@h#
zfH=SeYk}4vxrUTme$m1KAE0eNPy&<0(jWolmbXyLKhh!!eiLf*LG%6_Tn*IGL^$9M
zU?k8r6NQ%L$nE`K&{X{zsktoz#e~$6>;P71o1YEMVDz>=vFb>6z-S_*IRFSS02=+O
URV3%76aWAK07*qoM6N<$f<w^Nng9R*
--- a/mobile/themes/core/honeycomb/platform.css
+++ b/mobile/themes/core/honeycomb/platform.css
@@ -137,43 +137,40 @@ dialog > .prompt-header > .prompt-messag
 dialog > .prompt-header > .button-checkbox {
   margin-left: @margin_large@;
 }
 
 /* buttons ----------------------------------------------------------------- */
 .button-text,
 .toolbarbutton-text {
   font-weight: normal;
-  font-size: @font_snormal@ !important;
+  font-size: @font_xtiny@ !important;
 }
 
 button {
   -moz-appearance: none;
   min-width: @touch_button_minwidth@ !important;
-  min-height: @touch_button_small@ !important; /* button size */
+  min-height: @touch_button_tiny@ !important; /* button size */
   color: @color_text_button@;
+  background-image: none;
+  background-color: @color_background_button@; 
   margin: @margin_normal@;
   padding: @padding_xnormal@;
-  background-image: url("chrome://browser/skin/images/button-bg.png");
-  background-size: auto 100%;
-  border: @border_width_tiny@ solid @color_button_border@;
+  border-width: 0px;
+  border-radius: 0px;
 }
 
 button[disabled="true"] {
-  color: @color_text_disabled@ !important;
-  border: @border_width_tiny@ solid @color_button_border@ !important;
-}
-
-button:focus > .button-box {
-  border: @border_width_tiny@ solid transparent;
+  color: @color_text_button_disabled@ !important;
+  background-color: @color_background_button_disabled@; 
 }
 
 button:not([disabled]):hover:active,
 button:not([disabled])[checked="true"] {
-  background-image: url("chrome://browser/skin/images/toggle-off.png");
+  background-color: @color_background_highlight@;
 }
 
 /* Override GTK2 system setting */
 .button-icon {
   display: -moz-initial !important;
 }
 
 /* spinbuttons ------------------------------------------------------------- */
@@ -404,59 +401,66 @@ richlistitem {
 
 richlistitem:last-child,
 richlistitem[selector="last-child"] {
   border-bottom: none;
 }
 
 richlistitem label.title,
 richlistitem description.title {
-  font-size: @font_normal@ !important;
+  font-size: @font_snormal@ !important;
 }
 
 richlistitem label.normal,
 richlistitem description.normal {
   color: @color_subtext_default@;
-  font-size: @font_small@ !important;
+  font-size: @font_xtiny@  !important;
   white-space: pre-wrap;
   word-wrap: break-word;
 }
 
 richlistitem label.normal-black,
 richlistitem description.normal-black {
-  font-size: @font_small@  !important;
+  font-size: @font_xtiny@  !important;
   white-space: pre-wrap;
   word-wrap: break-word;
 }
 
 richlistitem label.normal-bold,
 richlistitem description.normal-bold {
   font-weight: bold;
-  font-size: @font_small@  !important;
+  font-size: @font_xtiny@  !important;
   white-space: pre-wrap;
   word-wrap: break-word;
 }
 
 richlistitem[selected="true"] {
   color: @color_text_default@;
   background-color: @color_background_default@;
 }
 
 richlistitem:hover:active:not([selected="true"]):not([nohighlight="true"]),
+richlistitem:hover:active:not([selected="true"]):not([class="section-header"]),
 richlistitem:hover:active:not([selected="true"]):not([nohighlight="true"]) label.normal,
 richlistitem:hover:active:not([selected="true"]):not([nohighlight="true"]) description.normal {
   background-color: @color_background_highlight@;
   color: @color_text_highlight@;
 }
 
 richlistitem.section-header,
 richlistitem[selected="true"].section-header {
+  font-size: @font_xtiny@;
   font-weight: bold;
-  color: @color_text_header@;
-  background-color: @color_background_header@;
+  color: @color_text_panel_subheader@;
+  background-color: @color_background_button@;
+  margin: 0;
+  padding: @padding_xxnormal@ @padding_large@;
+  border-top: @border_width_tiny@ solid @color_background_settings@;
+  border-bottom: @border_width_large@ solid;
+  -moz-border-bottom-colors: @color_background_button@ @color_background_settings@; 
 }
 
 richlistitem .show-on-select {
   visibility: collapse;
 }
 
 richlistitem[selected="true"] .show-on-select {
   visibility: visible;
@@ -469,16 +473,34 @@ richlistitem .hide-on-select {
 richlistitem[selected="true"] .hide-on-select {
   visibility: collapse;
 }
 
 richlistitem[typeName="message"] {
   border-bottom: 0;
 }
 
+richlistitem setting {
+  -moz-padding-start: 0;
+  -moz-padding-end: 0;
+}
+
+richlistitem setting:first-child {
+  border-top: @border_width_tiny@ solid @color_background_button@;
+}
+
+richlistitem[isDisabled="true"] .title,
+richlistitem[isDisabled="true"] .normal {
+  color: @color_text_disabled@;
+}
+
+richlistitem[isDisabled="true"] image {
+  opacity: 0.25;
+}
+
 /* colorpicker ------------------------------------------------------------- */
 colorpicker > panel {
   background-color: #767973;
 }
 
 colorpicker > vbox {
   background-color: #767973;
 }
@@ -493,40 +515,40 @@ colorpicker > vbox {
   list-style-image: url("chrome://browser/skin/images/search-clear-30.png");
   -moz-image-region: auto;
 }
 
 /* menulist ---------------------------------------------------------------- */
 .menulist-label {
   font-family: "Nokia Sans", Tahoma, sans-serif !important;
   font-weight: normal;
-  font-size: @font_snormal@  !important;
+  font-size: @font_xtiny@;
   background-color: transparent !important;
 }
 
 menulist {
   -moz-appearance: none !important;
   -moz-user-focus: ignore;
   min-width: @touch_button_minwidth@ !important;
-  min-height: @touch_button_small@ !important; /* button size */
+  min-height: @touch_button_tiny@ !important; /* button size */
   color: @color_text_button@ !important;
+  background-color: @color_background_button@;
   margin: @margin_normal@;
-  padding: @padding_small@ @padding_xnormal@;
-  background-image: url("chrome://browser/skin/images/button-bg.png");
-  background-size: auto 100%;
-  border: @border_width_tiny@ solid @color_button_border@;
+  padding: @padding_xnormal@;
+  border-width: 0;
+  border-radius: 0;
 }
 
 menulist[disabled="true"] {
-  color: @color_text_disabled@ !important;
-  border: @border_width_tiny@ solid @color_button_border@ !important;
+  color: @color_text_button_disabled@ !important;
+  background-color: @color_background_button_disabled@; 
 }
 
 menulist:not([disabled="true"]):hover:active {
-  background-image: url("chrome://browser/skin/images/toggle-off.png");
+  background-color: @color_background_highlight@;
 }
 
 menulist > dropmarker {
   height: 32px;
   width: 32px;
   margin-left: @margin_snormal@;
   background-color: transparent; /* for windows */
   border: none;                  /* for windows */
@@ -704,32 +726,57 @@ dialog {
 .panel-row-button:hover:active {
   background-image: none;
   background-color: @color_background_highlight@;
   color: @color_text_highlight@;
 }
 
 .prompt-button {
   min-width: 33%;
+  min-height: @touch_button_small@;
+}
+
+.prompt-button .button-text {
+  font-size: @font_snormal@ !important;
 }
 
 .panel-row-button:first-child {
   -moz-border-start-width: 0 !important;
 }
 
 .panel-row-button:last-child {
   -moz-border-end-width: 0 !important;
 }
 
 @media (@orientation@: portrait) {
   .panel-row-button {
     -moz-box-orient: vertical;
   }
 }
 
+@media (@orientation@: portrait) and (min-width: @tablet_panel_minwidth@) {
+  #panel-controls > .panel-row-button {
+    min-width: @tablet_panel_controls@ !important;
+  }
+  
+  #panel-items {
+    max-width: @tablet_panel_item_width@ !important;
+  }
+}
+
+@media (@orientation@: landscape) and (min-width: @tablet_panel_minwidth@) {
+  #panel-controls > .panel-row-button {
+    min-width: @tablet_panel_controls_wide@ !important;
+  }
+  
+  #panel-items {
+    max-width: @tablet_panel_item_width_wide@ !important;
+  }
+}
+
 .panel-row-button .toolbarbutton-text {
   text-align: left;
   font-size: @font_xtiny@ !important;
 }
 
 .panel-row-button .toolbarbutton-text:-moz-locale-dir(rtl) {
   text-align: right;
 }
@@ -751,55 +798,97 @@ dialog {
   color: @color_text_default@;
 }
 
 .panel-row-button[checked="true"],
 .panel-row-button[disabled="true"] {
   pointer-events: none;
 }
 
+#panel-container {
+  background-color: @color_background_settings@ !important;
+}
+
 #panel-container-inner {
   -moz-box-orient: vertical;
+  background-color: transparent !important;
+}
+
+#panel-container-inner > vbox {
+  border: @border_width_large@ solid @color_background_active@; 
+  box-shadow: 0 0 @shadow_width_tiny@ @shadow_width_medium@ @color_background_button_overlay@;  
 }
 
 #panel-controls {
   -moz-box-orient: horizontal;
+  background-color: transparent !important;
+  padding: @padding_xxxnormal@ 0 !important;
+}
+
+#panel-controls .toolbarbutton-text {
+  font-size: @font_snormal@ !important;
+}
+
+#panel-controls .toolbarbutton-icon[label]:not([label=""]),
+#panel-controls .toolbarbutton-icon[type="menu"] {
+  -moz-margin-start: @margin_xxxnormal@;
+  -moz-margin-end: @margin_xnormal@;
+}
+
+#panel-controls > .panel-row-button {
+  border-top: @border_width_tiny@ solid @color_background_settings@ !important;
+  border-bottom: @border_width_large@ solid !important;
+  -moz-border-bottom-colors: @color_background_button@ @color_background_settings@ !important;
+  -moz-border-start: 0 solid; 
+  -moz-border-end: 0 solid; 
+}
+
+#panel-controls > .panel-row-button[checked="true"] {
+  background-color: @color_background_highlight@;
+  color: @color_text_default@;
+}
+
+.panel-list {
+  background: transparent;
 }
 
 @media (min-width: @tablet_panel_minwidth@) {
   #panel-container-inner {
     -moz-box-orient: horizontal;
     -moz-box-pack: center;
   }
 
   #panel-items {
-    max-width: @tablet_panel_minwidth@;
     min-width: 0px !important;
   }
   
   /* This will affect the prefs screen, but not the awesome screen */
   #panel-controls {
     -moz-box-orient: vertical !important;
     -moz-box-align: start;
   }
   
   #panel-controls > .panel-row-button {
+    margin: 0;
     -moz-box-orient: horizontal;
     -moz-box-flex: 0;
-    min-width: @tablet_panel_controls@ !important;
   }
 
   #panel-controls .toolbarbutton-text {
     display: -moz-box !important;
     -moz-box-flex: 1;
   }
   
   #panel-container {
     -moz-box-pack: center;
-    padding: @padding_xlarge@ 0px;
+    padding: @padding_xxxlarge@ 0 @padding_xlarge@ 0;
+  }
+
+  #panel-container-inner > vbox {
+    padding: @padding_xlarge@ @padding_xxlarge@;
   }
 }
 
 /* because the buttons can wrap, we need to use the margin to create inter-button
   spacing and a bottom margin for the notification */
 notification > button {
   margin-bottom: @margin_normal@;
 }
--- a/mobile/themes/core/jar.mn
+++ b/mobile/themes/core/jar.mn
@@ -386,16 +386,18 @@ chrome.jar:
   skin/honeycomb/images/close-background-hdpi.png     (honeycomb/images/close-background-hdpi.png)
   skin/honeycomb/images/close-background-hdpi-rtl.png (honeycomb/images/close-background-hdpi-rtl.png)
   skin/honeycomb/images/close-inactive-tab-hdpi.png   (honeycomb/images/close-inactive-tab-hdpi.png)
   skin/honeycomb/images/close-inactive-tab-tablet-hdpi.png   (honeycomb/images/close-inactive-tab-tablet-hdpi.png)
   skin/honeycomb/images/checkmark-hdpi.png                 (images/checkmark-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/check-selected-tap-hdpi.png   (honeycomb/images/check-selected-tap-hdpi.png)
+  skin/honeycomb/images/check-unselected-tap-hdpi.png (honeycomb/images/check-unselected-tap-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)
   skin/honeycomb/images/task-switch-hdpi.png          (honeycomb/images/task-switch-hdpi.png)
   skin/honeycomb/images/task-close-hdpi.png           (honeycomb/images/task-close-hdpi.png)
   skin/honeycomb/images/task-back-hdpi.png            (honeycomb/images/task-back-hdpi.png)
   skin/honeycomb/images/task-back-rtl-hdpi.png        (honeycomb/images/task-back-rtl-hdpi.png)