css tweaks

diff --git a/css/civicrm.css b/css/civicrm.css
index 5bce575721a0f2493da1062bcec05b1e92bc604b..d4aa5fab8e2b1994c1ad4d07433c799f17c1512a 100644 (file)
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -6,7 +6,7 @@
  * All styles should start with .crm-container unless they are specific to the main div only
  */
 
-.crm-container label {
+div.crm-container label {
   font-weight: normal;
   display: inline;
 }
@@ -2752,15 +2752,18 @@ div.grippie {
   background-color: #2E3471;
 }
 
-.crm-container .crm-accordion-header a.close-accordion {
+.crm-container .crm-accordion-header a.crm-close-accordion {
   font-weight: normal !important;
   float: right;
   color: #FFF !important;
-  text-decoration: none;
 }
 
-.crm-container .crm-accordion-header a.close-accordion:hover {
-  text-decoration: underline !important;
+.crm-container .crm-accordion-header a.crm-close-accordion span {
+  visibility: hidden;
+}
+
+.crm-container .crm-accordion-header a.crm-close-accordion:hover span {
+  visibility: visible;
 }
 
 .crm-container .crm-master-accordion-header.crm-accordion-header:hover,

diff --git a/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl b/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
index 766644f4e86048bc7e25c368e72f1773f9568cff..8f377ebe343e120427d445c6c8e5e3197400fcfc 100644 (file)
--- a/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
+++ b/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
@@ -38,7 +38,7 @@ cj(function($) {
     $('.crm-ajax-accordion:not(.collapsed) .crm-accordion-header').each(function() {
       loadPanes($(this).attr('id'));
     });
-    $('.crm-ajax-accordion').on('click', '.close-accordion', function() {
+    $('.crm-ajax-accordion').on('click', '.crm-close-accordion', function() {
       var header = $(this).parent();
       header.next().html('');
       header.removeClass('active');
@@ -90,7 +90,7 @@ cj(function($) {
     var body = $('.crm-accordion-body.' + id);
     if (header.length > 0 && body.length > 0 && !body.html()) {
       body.html('<div class="crm-loading-element"><span class="loading-text">{/literal}{ts escape='js'}Loading{/ts}{literal}...</span></div>');
-      header.append('<a href="#" class="close-accordion" title="{/literal}{ts escape='js'}Remove from search criteria{/ts}{literal}">{/literal}{ts escape='js'}Reset{/ts}{literal} [x]</a>');
+      header.append('{/literal}<a href="#" class="crm-close-accordion" title="{ts escape='js'}Remove from search criteria{/ts}"><span>{ts escape='js'}Reset{/ts}</span> &nbsp;<img src="{$config->resourceBase}i/close.png" /></a>{literal}');
       header.addClass('active');
       $.ajax({
         url : url,
@@ -99,7 +99,7 @@ cj(function($) {
         },
         error: function() {
           CRM.alert({/literal}'{ts escape="js"}Sorry, could not load the requested information from the server.{/ts}', '{ts escape="js"}Network Error{/ts}'{literal});
-          $('.close-accordion', header).click();
+          $('.crm-close-accordion', header).click();
         }
       });
     }