From aa0bb409fe04d2229e1666f447d33618c75ced32 Mon Sep 17 00:00:00 2001 From: Javi Rueda Date: Tue, 12 Jul 2011 20:02:10 +0200 Subject: [PATCH] Bug 652536 - Remove workaround for bug 133527. r=ventron --- toolkit/components/alerts/resources/content/alert.js | 8 -------- toolkit/themes/gnomestripe/global/alerts/alert.css | 2 +- toolkit/themes/winstripe/global/alerts/alert.css | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/toolkit/components/alerts/resources/content/alert.js b/toolkit/components/alerts/resources/content/alert.js index 40d5ab80672..95cd631a2e0 100644 --- a/toolkit/components/alerts/resources/content/alert.js +++ b/toolkit/components/alerts/resources/content/alert.js @@ -127,14 +127,6 @@ function onAlertLoad() var alertBox = document.getElementById("alertBox"); alertBox.orient = (gOrigin & NS_ALERT_HORIZONTAL) ? "vertical" : "horizontal"; - // The above doesn't cause the labels in alertTextBox to reflow, - // see bug 311557. As the theme's -moz-box-align css rule gets ignored, - // we work around the bug by setting the align property. - if (gOrigin & NS_ALERT_HORIZONTAL) - { - document.getElementById("alertTextBox").align = "center"; - } - sizeToContent(); // Work around a bug where sizeToContent() leaves a border outside of the content diff --git a/toolkit/themes/gnomestripe/global/alerts/alert.css b/toolkit/themes/gnomestripe/global/alerts/alert.css index c30a08ade5a..f0e6073a793 100644 --- a/toolkit/themes/gnomestripe/global/alerts/alert.css +++ b/toolkit/themes/gnomestripe/global/alerts/alert.css @@ -90,5 +90,5 @@ label { -moz-padding-start: 5px; -moz-padding-end: 5px; margin-bottom: 8px; - -moz-box-align: center; /* also hard-coded in alert.js, see bug 311557 */ + -moz-box-align: center; } diff --git a/toolkit/themes/winstripe/global/alerts/alert.css b/toolkit/themes/winstripe/global/alerts/alert.css index b5b1c4643b3..792eef2388d 100644 --- a/toolkit/themes/winstripe/global/alerts/alert.css +++ b/toolkit/themes/winstripe/global/alerts/alert.css @@ -95,5 +95,5 @@ label { -moz-padding-start: 5px; -moz-padding-end: 5px; margin-bottom: 8px; - -moz-box-align: center; /* also hard-coded in alert.js, see bug 311557 */ + -moz-box-align: center; }