Backed out changeset cb7f81834560 (bug 980339) since it caused bug 999080, a=lsblakk RELEASE_BASE_20140421
authorGavin Sharp <gavin@gavinsharp.com>
Mon, 21 Apr 2014 16:21:01 -0700
changeset 183808 02556a393ed8
parent 183807 a5688b606883
child 183809 aa70a6ce178a
push id3496
push usergsharp@mozilla.com
push date2014-04-21 23:22 +0000
Treeherderresults
reviewerslsblakk
bugs980339, 999080
milestone29.0
backs outcb7f81834560
Backed out changeset cb7f81834560 (bug 980339) since it caused bug 999080, a=lsblakk
toolkit/themes/windows/global/inContentUI.css
toolkit/themes/windows/mozapps/extensions/extensions.css
--- a/toolkit/themes/windows/global/inContentUI.css
+++ b/toolkit/themes/windows/global/inContentUI.css
@@ -63,28 +63,20 @@ html|html {
 /* Content */
 *|*.main-content {
   /* Needed to allow the radius to clip the inner content, see bug 595656 */
   overflow: hidden;
   background-color: rgba(255, 255, 255, 0.35);
   background-image: linear-gradient(rgba(255, 255, 255, 0),
                                     rgba(255, 255, 255, 0.75));
   border: 1px solid #C3CEDF;
+  border-radius: 5px;
 }
 
 %ifdef WINDOWS_AERO
-@media (-moz-os-version: windows-vista),
-       (-moz-os-version: windows-win7) {
-%endif
-  *|*.main-content {
-    border-radius: 5px;
-  }
-%ifdef WINDOWS_AERO
-}
-
 @media (-moz-windows-glass) {
   /* Buttons */
   *|button,
   menulist,
   colorpicker[type="button"] {
     -moz-appearance: none;
     color: black;
     padding: 0 5px;
--- a/toolkit/themes/windows/mozapps/extensions/extensions.css
+++ b/toolkit/themes/windows/mozapps/extensions/extensions.css
@@ -176,32 +176,25 @@
   padding: 10px 4px;
   border-width: 1px;
   border-style: solid;
   border-color: transparent;
   -moz-box-align: center;
   overflow: hidden;
 }
 
-%ifdef WINDOWS_AERO
-@media (-moz-os-version: windows-vista),
-       (-moz-os-version: windows-win7) {
-%endif
-  .category:-moz-locale-dir(ltr) {
-    border-top-left-radius: 5px;
-    border-bottom-left-radius: 5px;
-  }
+.category:-moz-locale-dir(ltr) {
+  border-top-left-radius: 5px;
+  border-bottom-left-radius: 5px;
+}
 
-  .category:-moz-locale-dir(rtl) {
-    border-top-right-radius: 5px;
-    border-bottom-right-radius: 5px;
-  }
-%ifdef WINDOWS_AERO
+.category:-moz-locale-dir(rtl) {
+  border-top-right-radius: 5px;
+  border-bottom-right-radius: 5px;
 }
-%endif
 
 .category[disabled] {
   border-top: 0;
   border-bottom: 0;
   height: 0;
   opacity: 0;
   transition-property: height, opacity;
   transition-duration: 1s, 0.8s;