From 7f641be1631eca54bc1e46c216d1ae454665b08d Mon Sep 17 00:00:00 2001
From: Matthew Carleton <mcarleton@redhat.com>
Date: Tue, 17 Oct 2017 15:56:57 -0300
Subject: [PATCH] fix(wizard): fixes wizard close button style

wizard close button now matches the modal button style. I also added the aria label tag from the
wizard to the modal.
---
 src/less/close.less                                     | 1 +
 tests/pages/_includes/widgets/communication/wizard.html | 5 +++--
 tests/pages/modals.html                                 | 4 ++--
 tests/pages/wizard.html                                 | 8 ++++----
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/less/close.less b/src/less/close.less
index 4c552b96e2..a116951f87 100644
--- a/src/less/close.less
+++ b/src/less/close.less
@@ -2,6 +2,7 @@
 // Close icons
 // --------------------------------------------------
 
+//this should no longer be needed and be replaced with pficon-close. This is here for legacy. For further info see https://github.com/patternfly/patternfly/pull/781
 
 .close {
   text-shadow: none;
diff --git a/tests/pages/_includes/widgets/communication/wizard.html b/tests/pages/_includes/widgets/communication/wizard.html
index 140d3eb8e6..01cad6de5a 100644
--- a/tests/pages/_includes/widgets/communication/wizard.html
+++ b/tests/pages/_includes/widgets/communication/wizard.html
@@ -3,8 +3,9 @@
   <div class="modal-dialog modal-lg wizard-pf">
     <div class="modal-content">
       <div class="modal-header">
-        <button type="button" class="close wizard-pf-dismiss" aria-label="Close"><span
-          aria-hidden="true">&times;</span></button>
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true" aria-label="Close">
+          <span class="pficon pficon-close"></span>
+        </button>
         <dt class="modal-title">Wizard Title</dt>
       </div>
       <div class="modal-body wizard-pf-body clearfix">
diff --git a/tests/pages/modals.html b/tests/pages/modals.html
index 8304d57f02..2919e03222 100644
--- a/tests/pages/modals.html
+++ b/tests/pages/modals.html
@@ -9,7 +9,7 @@
         <div class="modal-dialog">
           <div class="modal-content">
             <div class="modal-header">
-              <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+              <button type="button" class="close" data-dismiss="modal" aria-hidden="true" aria-label="Close">
                 <span class="pficon pficon-close"></span>
               </button>
               <h4 class="modal-title" id="myModalLabel">Modal Title</h4>
@@ -40,4 +40,4 @@ <h4 class="modal-title" id="myModalLabel">Modal Title</h4>
             </div>
           </div>
         </div>
-      </div>
\ No newline at end of file
+      </div>
diff --git a/tests/pages/wizard.html b/tests/pages/wizard.html
index 7687f173db..3ce9debe89 100644
--- a/tests/pages/wizard.html
+++ b/tests/pages/wizard.html
@@ -15,8 +15,8 @@ <h2>Initializing</h2>
   <div class="modal-dialog modal-lg wizard-pf">
     <div class="modal-content">
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true" aria-label="Close">
+          <span class="pficon pficon-close"></span>
         </button>
         <dt class="modal-title">Wizard Title</dt>
       </div>
@@ -95,8 +95,8 @@ <h2>Last Step</h2>
   <div class="modal-dialog modal-lg wizard-pf">
     <div class="modal-content">
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true" aria-label="Close">
+          <span class="pficon pficon-close"></span>
         </button>
         <dt class="modal-title">Wizard Title</dt>
       </div>