From 3479049c3c40c8d9d730113f376753a381af90aa Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sat, 17 Oct 2015 14:14:26 -0400
Subject: [PATCH] CRM-16415 - UI icon updates

---
 css/civicrm.css   | 17 ++---------------
 css/dashboard.css |  7 ++++---
 js/Common.js      |  1 +
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/css/civicrm.css b/css/civicrm.css
index baa41c2cae..5593d274ea 100644
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -2254,15 +2254,6 @@ a.crm-i:hover {
   line-height: inherit;
 }
 
-.crm-container .ui-dialog-titlebar .ui-button .ui-icon[class*=" fa-"] {
-  background: none repeat scroll 0 0 transparent !important;
-  color: #F5F6F1;
-}
-
-.crm-container .ui-dialog-titlebar .ui-button .ui-icon[class*=" fa-"]:hover {
-
-}
-
 .crm-container .crm-button.crm-i-button input[type="button"],
 .crm-container .crm-button.crm-i-button input.crm-form-submit {
   padding-left: 0;
@@ -3303,15 +3294,11 @@ div.m ul#civicrm-menu,
   background-color: transparent;
   background-image: none;
   border: 1px none;
-}
-.crm-container .ui-dialog-titlebar .ui-button .ui-icon {
-  background-image: url("../i/icons/jquery-ui-F5F6F1.png");
+  color: inherit;
 }
 .crm-container .ui-dialog-titlebar .ui-button:hover {
   background-color: #cdcdcd;
-}
-.crm-container .ui-dialog-titlebar .ui-button:hover .ui-icon {
-  background-image: url("../i/icons/jquery-ui-3E3E3E.gif");
+  color: #555;
 }
 
 /*Needed for jstree contextmenu */
diff --git a/css/dashboard.css b/css/dashboard.css
index cae2d31f3f..58259f2fe6 100644
--- a/css/dashboard.css
+++ b/css/dashboard.css
@@ -95,16 +95,17 @@
 }
 
 #crm-container .widget-controls .crm-i {
-  font-size: 16px;
+  font-size: 14px;
   padding: 0 6px;
+  font-weight: normal;
   float: left;
-  border-radius: 2px;
   cursor: pointer;
   color: #222222;
+  opacity: .7;
 }
 
 #crm-container .widget-controls .crm-i:hover {
-  color: rgba(34, 34, 34, 0.8);
+  opacity: 1;
 }
 
 #crm-container .widget-controls .crm-i.fa-expand,
diff --git a/js/Common.js b/js/Common.js
index 107981b9fe..e69025c3ad 100644
--- a/js/Common.js
+++ b/js/Common.js
@@ -944,6 +944,7 @@ if (!CRM.vars) CRM.vars = {};
         $el.addClass('modal-dialog');
         $('body').css({overflow: 'hidden'});
       }
+      $el.parent().find('.ui-dialog-titlebar .ui-icon-closethick').removeClass('ui-icon-closethick').addClass('fa-times');
       // Add resize button
       if ($el.parent().hasClass('crm-container') && $el.dialog('option', 'resizable')) {
         $el.parent().find('.ui-dialog-titlebar').append($('<button class="crm-dialog-titlebar-resize ui-dialog-titlebar-close" title="'+ts('Toggle fullscreen')+'" style="right:2em;"/>').button({icons: {primary: 'fa-expand'}, text: false}));
-- 
2.25.1