Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-11-02-19-51-55

[civicrm-core.git] / css / dashboard.css

diff --git a/css/dashboard.css b/css/dashboard.css
index 8bb75fb8bc3848b09ba6da1dd1268ffefd2d8ae7..58259f2fe6f483cbcfd2070e89f99153e44bcc50 100644 (file)
--- a/css/dashboard.css
+++ b/css/dashboard.css
@@ -94,32 +94,24 @@
   margin:1.6em 0 0 26px;
 }
 
-#crm-container .widget-icon {
-  background-image:url('../packages/jquery/jquery-ui/images/ui-icons_222222_256x240.png');
-  height:16px;
-  width:16px;
-  padding-right:2px;
+#crm-container .widget-controls .crm-i {
+  font-size: 14px;
+  padding: 0 6px;
+  font-weight: normal;
   float: left;
-  border-radius: 2px;
-}
-#crm-container .widget-icon.minimize-icon {
-  background-position:-63px -17px;
+  cursor: pointer;
+  color: #222222;
+  opacity: .7;
 }
 
-#crm-container .widget-icon.maximize-icon {
-  background-position:-31px -18px;
+#crm-container .widget-controls .crm-i:hover {
+  opacity: 1;
 }
 
-#crm-container .widget-icon.fullscreen-icon {
-  background-position:-48px -80px;
+#crm-container .widget-controls .crm-i.fa-expand,
+#crm-container .widget-controls .crm-i.fa-times {
   float:right;
 }
-#crm-container .widget-icon.close-icon {
-  float:right;
-}
-#crm-container .widget-icon:hover {
-  background-color: rgba(255, 255, 255, 0.8);
-}
 
 /* CSS for Dashlets */
 
@@ -176,8 +168,9 @@
   width: auto;
 }
 
-#crm-container .portlet-header .ui-icon {
+#crm-container .portlet-header .crm-i {
   float: right;
+  color: #52534D;
 }
 
 #crm-container .portlet-content {