Merge cedar into mozilla-central

This commit is contained in:
Boris Zbarsky 2011-04-05 09:19:34 -07:00
commit 2c3272ec4c
3 changed files with 18 additions and 6 deletions

View File

@ -5645,6 +5645,11 @@ then
dnl ========================================================
dnl = GConf support module
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(gconf,
[ --disable-gconf Disable Gconf support ],
MOZ_ENABLE_GCONF=,
MOZ_ENABLE_GCONF=force)
if test "$MOZ_ENABLE_GCONF"
then
PKG_CHECK_MODULES(MOZ_GCONF, gconf-2.0 >= $GCONF_VERSION gobject-2.0 ,[

View File

@ -109,6 +109,16 @@ window.onload = function () {
function populateExtensionsSection() {
AddonManager.getAddonsByTypes(["extension"], function(extensions) {
extensions.sort(function(a,b) {
if (a.isActive != b.isActive)
return b.isActive ? 1 : -1;
let lc = a.name.localeCompare(b.name);
if (lc != 0)
return lc;
if (a.version != b.version)
return a.version > b.version ? 1 : -1;
return 0;
});
let trExtensions = [];
for (let i = 0; i < extensions.length; i++) {
let extension = extensions[i];

View File

@ -375,11 +375,8 @@
@media all and (-moz-windows-default-theme) {
#header-search {
-moz-appearance: none;
border: 1px solid;
border-color: rgba(0, 0, 0, 0.25) rgba(0, 0, 0, 0.32) rgba(0, 0, 0, 0.37);
border-radius: 4px;
box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1) inset,
0 1px 0 rgba(255, 255, 255, 0.4);
border: 1px solid rgba(0, 0, 0, 0.32);
border-radius: 3.5px;
padding-bottom: 2px;
background-color: rgba(255, 255, 255, 0.4);
}
@ -1177,7 +1174,7 @@
background: -moz-linear-gradient(rgba(251, 252, 253, 0.95), rgba(246, 247, 248, 0) 49%,
rgba(211, 212, 213, 0.45) 51%, rgba(225, 226, 229, 0.3));
background-clip: padding-box;
border-radius: 4.5px;
border-radius: 3.5px;
border: 1px solid rgba(31, 64, 100, 0.4);
border-top-color: rgba(31, 64, 100, 0.3);
box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.25) inset,