Bug 1149261 - Replace the close icon and adjust the borders. ui-r=mmaslaney, r=jaws, a=sledru
authorBlake Winton <bwinton@latte.ca>
Mon, 06 Apr 2015 13:27:27 -0400
changeset 258386 a3c18ef98317
parent 258385 9a763ea8d781
child 258387 f7dc5b7781e2
push id4657
push userryanvm@gmail.com
push date2015-04-08 20:55 +0000
treeherdermozilla-beta@bfff2ca94766 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmmaslaney, jaws, sledru
bugs1149261
milestone38.0
Bug 1149261 - Replace the close icon and adjust the borders. ui-r=mmaslaney, r=jaws, a=sledru
toolkit/themes/osx/global/jar.mn
toolkit/themes/shared/reader/RM-Close-24x24.svg
toolkit/themes/shared/reader/RM-Close-hover-24x24.svg
toolkit/themes/windows/global/aboutReader.css
toolkit/themes/windows/global/jar.mn
--- a/toolkit/themes/osx/global/jar.mn
+++ b/toolkit/themes/osx/global/jar.mn
@@ -191,17 +191,16 @@ toolkit.jar:
 * skin/classic/global/in-content/info-pages.css                      (in-content/info-pages.css)
   skin/classic/global/in-content/check.svg                           (../../shared/in-content/check.svg)
   skin/classic/global/in-content/check-partial.svg                   (../../shared/in-content/check-partial.svg)
   skin/classic/global/in-content/dropdown.svg                        (../../shared/in-content/dropdown.svg)
   skin/classic/global/in-content/help-glyph.svg                      (../../shared/in-content/help-glyph.svg)
   skin/classic/global/in-content/radio.svg                           (../../shared/in-content/radio.svg)
   skin/classic/global/reader/RM-Add-24x24.svg                        (../../shared/reader/RM-Add-24x24.svg)
   skin/classic/global/reader/RM-Close-24x24.svg                      (../../shared/reader/RM-Close-24x24.svg)
-  skin/classic/global/reader/RM-Close-hover-24x24.svg                (../../shared/reader/RM-Close-hover-24x24.svg)
   skin/classic/global/reader/RM-Delete-24x24.svg                     (../../shared/reader/RM-Delete-24x24.svg)
   skin/classic/global/reader/RM-Minus-24x24.svg                      (../../shared/reader/RM-Minus-24x24.svg)
   skin/classic/global/reader/RM-Plus-24x24.svg                       (../../shared/reader/RM-Plus-24x24.svg)
   skin/classic/global/reader/RM-Reading-List-24x24.svg               (../../shared/reader/RM-Reading-List-24x24.svg)
   skin/classic/global/reader/RM-Type-Controls-24x24.svg              (../../shared/reader/RM-Type-Controls-24x24.svg)
   skin/classic/global/reader/RM-Type-Controls-Arrow.svg              (../../shared/reader/RM-Type-Controls-Arrow.svg)
   skin/classic/global/scale/scale-tray-horiz.gif                     (scale/scale-tray-horiz.gif)
   skin/classic/global/scale/scale-tray-vert.gif                      (scale/scale-tray-vert.gif)
--- a/toolkit/themes/shared/reader/RM-Close-24x24.svg
+++ b/toolkit/themes/shared/reader/RM-Close-24x24.svg
@@ -1,8 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-      viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g>
-    <polygon fill-rule="evenodd" clip-rule="evenodd" fill="#808080" points="20,6.748 17.338,4.079 12.038,9.391 6.661,4 4,6.669
-        9.377,12.059 4.157,17.292 6.819,19.961 12.039,14.728 17.298,20 19.959,17.331 14.701,12.06 	"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg viewBox="0 0 24 24"
+  xmlns="http://www.w3.org/2000/svg"
+  xmlns:xlink="http://www.w3.org/1999/xlink">
+  <defs>
+    <style type="text/css">
+      use:not(:target) {
+        display: none;
+      }
+
+      #close {
+        fill: #808080;
+      }
+      #close-hover {
+        fill: #FFFFFF;
+      }
+    </style>
+
+    <g id="close-shape">
+      <polygon points="20.477,6.551 20.477,17.449 11.992,17.449 11.992,20 23,20 23,4 11.992,4 11.992,6.551"/>
+      <polygon points="1,11.981 9.698,19.95 9.698,15.13 18.184,15.13 18.184,8.87 9.698,8.87 9.698,4.011"/>
+    </g>
+  </defs>
+
+  <use id="close"       xlink:href="#close-shape"/>
+  <use id="close-hover" xlink:href="#close-shape"/>
+
+</svg>
\ No newline at end of file
deleted file mode 100644
--- a/toolkit/themes/shared/reader/RM-Close-hover-24x24.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g>
-    <polygon fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" points="20,6.748 17.338,4.079 12.038,9.391 6.661,4 4,6.669
-        9.377,12.059 4.157,17.292 6.819,19.961 12.039,14.728 17.298,20 19.959,17.331 14.701,12.06 	"/>
-</g>
-</svg>
--- a/toolkit/themes/windows/global/aboutReader.css
+++ b/toolkit/themes/windows/global/aboutReader.css
@@ -280,20 +280,21 @@ body.loaded {
   height: 40px;
   padding: 0;
 }
 
 .toolbar .button {
   color: white;
   width: 40px;
   background-position: center;
+  margin-right: -1px;
   background-color: #fbfbfb;
   border-top: 0;
   border-left: 0;
-  border-right: 0;
+  border-right: 1px solid #b5b5b5;
   border-bottom: 1px solid #c1c1c1;
 }
 
 .button[hidden] {
   display: none;
 }
 
 .dropdown {
@@ -493,25 +494,33 @@ body.loaded {
 /*======= Toolbar icons =======*/
 
 /* Android-only controls */
 .share-button {
   display: none;
 }
 
 .close-button {
-  background-image: url("chrome://global/skin/reader/RM-Close-24x24.svg");
+  background-image: url("chrome://global/skin/reader/RM-Close-24x24.svg#close");
   height: 68px;
   background-position: center 8px;
 }
 
-.close-button:active,
 .close-button:hover {
-  background-image: url("chrome://global/skin/reader/RM-Close-hover-24x24.svg");
+  background-image: url("chrome://global/skin/reader/RM-Close-24x24.svg#close-hover");
   background-color: #d94141;
+  border-bottom: 1px solid #d94141;
+  border-right: 1px solid #d94141;
+}
+
+.close-button:hover:active {
+  background-image: url("chrome://global/skin/reader/RM-Close-24x24.svg#close-hover");
+  background-color: #AE2325;
+  border-bottom: 1px solid #AE2325;
+  border-right: 1px solid #AE2325;
 }
 
 .style-button {
   background-image: url("chrome://global/skin/reader/RM-Type-Controls-24x24.svg");
 }
 
 .toggle-button.on {
   background-image: url("chrome://global/skin/reader/RM-Delete-24x24.svg");
--- a/toolkit/themes/windows/global/jar.mn
+++ b/toolkit/themes/windows/global/jar.mn
@@ -182,17 +182,16 @@ toolkit.jar:
         skin/classic/global/printpreview/arrow-left.png          (printpreview/arrow-left.png)
         skin/classic/global/printpreview/arrow-left-end.png      (printpreview/arrow-left-end.png)
         skin/classic/global/printpreview/arrow-right.png         (printpreview/arrow-right.png)
         skin/classic/global/printpreview/arrow-right-end.png     (printpreview/arrow-right-end.png)
         skin/classic/global/radio/radio-check.gif                (radio/radio-check.gif)
         skin/classic/global/radio/radio-check-dis.gif            (radio/radio-check-dis.gif)
         skin/classic/global/reader/RM-Add-24x24.svg              (../../shared/reader/RM-Add-24x24.svg)
         skin/classic/global/reader/RM-Close-24x24.svg            (../../shared/reader/RM-Close-24x24.svg)
-        skin/classic/global/reader/RM-Close-hover-24x24.svg      (../../shared/reader/RM-Close-hover-24x24.svg)
         skin/classic/global/reader/RM-Delete-24x24.svg           (../../shared/reader/RM-Delete-24x24.svg)
         skin/classic/global/reader/RM-Minus-24x24.svg            (../../shared/reader/RM-Minus-24x24.svg)
         skin/classic/global/reader/RM-Plus-24x24.svg             (../../shared/reader/RM-Plus-24x24.svg)
         skin/classic/global/reader/RM-Reading-List-24x24.svg     (../../shared/reader/RM-Reading-List-24x24.svg)
         skin/classic/global/reader/RM-Type-Controls-24x24.svg    (../../shared/reader/RM-Type-Controls-24x24.svg)
         skin/classic/global/reader/RM-Type-Controls-Arrow.svg    (../../shared/reader/RM-Type-Controls-Arrow.svg)
 
         skin/classic/global/scrollbar/slider.gif                 (scrollbar/slider.gif)
@@ -386,17 +385,16 @@ toolkit.jar:
         skin/classic/aero/global/printpreview/arrow-left.png             (printpreview/arrow-left-aero.png)
         skin/classic/aero/global/printpreview/arrow-left-end.png         (printpreview/arrow-left-end-aero.png)
         skin/classic/aero/global/printpreview/arrow-right.png            (printpreview/arrow-right-aero.png)
         skin/classic/aero/global/printpreview/arrow-right-end.png        (printpreview/arrow-right-end-aero.png)
         skin/classic/aero/global/radio/radio-check.gif                   (radio/radio-check.gif)
         skin/classic/aero/global/radio/radio-check-dis.gif               (radio/radio-check-dis.gif)
         skin/classic/aero/global/reader/RM-Add-24x24.svg                 (../../shared/reader/RM-Add-24x24.svg)
         skin/classic/aero/global/reader/RM-Close-24x24.svg               (../../shared/reader/RM-Close-24x24.svg)
-        skin/classic/aero/global/reader/RM-Close-hover-24x24.svg         (../../shared/reader/RM-Close-hover-24x24.svg)
         skin/classic/aero/global/reader/RM-Delete-24x24.svg              (../../shared/reader/RM-Delete-24x24.svg)
         skin/classic/aero/global/reader/RM-Minus-24x24.svg               (../../shared/reader/RM-Minus-24x24.svg)
         skin/classic/aero/global/reader/RM-Plus-24x24.svg                (../../shared/reader/RM-Plus-24x24.svg)
         skin/classic/aero/global/reader/RM-Reading-List-24x24.svg        (../../shared/reader/RM-Reading-List-24x24.svg)
         skin/classic/aero/global/reader/RM-Type-Controls-24x24.svg       (../../shared/reader/RM-Type-Controls-24x24.svg)
         skin/classic/aero/global/reader/RM-Type-Controls-Arrow.svg       (../../shared/reader/RM-Type-Controls-Arrow.svg)
         skin/classic/aero/global/scrollbar/slider.gif                    (scrollbar/slider.gif)
         skin/classic/aero/global/splitter/grip-bottom.gif                (splitter/grip-bottom.gif)