Merge pull request patternfly#781 from matthewcarleton/wizard-close-u…

…pdate fix(wizard): fixes wizard close button style
nicolethoen · Oct 18, 2017 · c62c640 · c62c640
2 parents f804cd1 + 7f641be
commit c62c640
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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>
+      </div>
diff --git 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>