From f2b7caede6a53273ad44efed7aeb4351dd04fc1d Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 19 Mar 2014 15:20:13 -0400
Subject: [PATCH] Upgrade jQuery and switch back to 'smoothness' theme

---
 CRM/Core/Resources.php |  6 +++---
 css/civicrm.css        | 32 +++++++++++++++++---------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 8bf37ceab2..39b3161360 100644
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -568,10 +568,10 @@ class CRM_Core_Resources {
     // Scripts needed by everyone, everywhere
     // FIXME: This is too long; list needs finer-grained segmentation
     $items = array(
-      "packages/jquery/jquery-1.10.2$min.js",
+      "packages/jquery/jquery-1.11.0$min.js",
       "packages/jquery/jquery-migrate-1.2.1.js", // TODO: Remove before 4.5 release
-      "packages/jquery/jquery-ui/js/jquery-ui-1.10.3.custom$min.js",
-      "packages/jquery/jquery-ui/css/black-tie/jquery-ui-1.10.3.custom$min.css",
+      "packages/jquery/jquery-ui/js/jquery-ui-1.10.4.custom$min.js",
+      "packages/jquery/jquery-ui/css/theme/jquery-ui-1.10.4.custom$min.css",
 
       "packages/backbone/lodash.compat$min.js",
 
diff --git a/css/civicrm.css b/css/civicrm.css
index aa76024180..dc02ed50ae 100644
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -1828,15 +1828,10 @@ div.grippie {
 .crm-container .crm-tab-button a,
 .crm-container .ui-tabs .ui-tabs-nav li a {
   padding: 5px !important;
-  color: #fafafa;
-}
-
-.crm-container .crm-tab-button a,
-.crm-container .ui-tabs .ui-tabs-nav li.ui-state-active a {
-  color: #090909;
 }
 
 .crm-container .crm-tab-button a em {
+  color: #555555;
   font-style: normal;
 }
 
@@ -2517,7 +2512,7 @@ div.grippie {
 }
 
 .crm-container .dark-icon {
-  background-image: url("../packages/jquery/jquery-ui/css/black-tie/images/ui-icons_222222_256x240.png")
+  background-image: url("../packages/jquery/jquery-ui/css/theme/images/ui-icons_222222_256x240.png")
 }
 .crm-container .edit-icon {
   background-position: -64px -112px;
@@ -2832,7 +2827,7 @@ div.grippie {
 }
 
 .crm-status-box-outer.status-start {
-  background: #F8FF03 url("../packages/jquery/jquery-ui/css/black-tie/images/animated-overlay.gif");
+  background: #F8FF03 url("../packages/jquery/jquery-ui/css/theme/images/animated-overlay.gif");
 }
 
 .crm-status-box-outer .crm-status-box-inner {
@@ -3027,7 +3022,6 @@ div#crm-container form {
   margin: 0;
   cursor: pointer;
   * cursor: hand;
-  color: white !important;
 }
 
 .crm-container .dataTables_paginate .ui-button {
@@ -3594,16 +3588,15 @@ tbody.scrollContent tr.alternateRow {
 }
 
 .crm-container .disabled,
-.crm-container .cancelled {
+.crm-container .cancelled,
+#mainTabContainer li.disabled a.ui-tabs-anchor,
+#mainTabContainer li.crm-count-0 a.ui-tabs-anchor,
+#mainTabContainer li.crm-count-0 a.ui-tabs-anchor em {
   color: #999999 !important;
 }
 #mainTabContainer li.disabled {
   text-decoration: none;
 }
-#mainTabContainer li.disabled a.ui-tabs-anchor,
-#mainTabContainer li.crm-count-0 a.ui-tabs-anchor {
-  color: #999999 !important;
-}
 #crm-container tr.crm-job {
   text-decoration: none !important;
 }
@@ -3948,11 +3941,20 @@ div.m ul#civicrm-menu,
   font-size: 1.2em;
 }
 
-/*Import progress bar */
+/* jQuery UI styles */
 .crm-container .ui-progressbar-value {
   background-image: url("../packages/jquery/css/images/pbar-ani.gif");
 }
 
+div.ui-dialog {
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.6);
+}
+
+.ui-dialog-titlebar.ui-widget-header {
+  background: url("../i/crm-button-bg.gif") repeat-x scroll left center #70716B;
+  color: white;
+}
+
 /*Needed for jstree contextmenu */
 #vakata-contextmenu.jstree-default-context li {
   background: none repeat scroll 0 0 transparent;
-- 
2.25.1