From: Coleman Watts Date: Tue, 2 Aug 2016 21:24:54 +0000 (-0400) Subject: CRM-17663 - Dashboard style improvements X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b9104ebf7c6ff4d0c680ac434a9b83d89977b6d6;p=civicrm-core.git CRM-17663 - Dashboard style improvements --- diff --git a/css/dashboard.css b/css/dashboard.css index 58259f2fe6..60017e5e60 100644 --- a/css/dashboard.css +++ b/css/dashboard.css @@ -27,43 +27,75 @@ /* The placeholder that indicates where a dragged widget will land if dropped now. */ #crm-container .placeholder { margin: 5px; - border: 3px dashed pink; + border: 3px dashed #CDE8FE; } /* Spacing between widgets. */ -#crm-container li.widget, #crm-container li.empty-placeholder { margin: 6px 3px; } +#crm-container li.widget, +#crm-container li.empty-placeholder { + margin: 0 3px 10px 3px; +} #crm-container li.widget { - padding: 0px; + padding: 0; } /* Spacing inside widgets. */ #crm-container .widget-wrapper { - padding: 0px; - overflow-x:auto; - margin-right: .25em + padding: 0; + overflow: hidden; + margin-right: .25em; + box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.2); + border-radius: 3px; +} + +#crm-container .widget-wrapper.db-hover-handle { + box-shadow: 1px 1px 8px 3px rgba(0,0,0,0.2); } -/* wodget header / title */ +#crm-container .ui-sortable-helper .widget-wrapper { + box-shadow: 1px 1px 8px 3px rgba(0,0,0,0.5); +} + +/* widget header / title */ #crm-container .widget-header { - background:#CDE8FE none repeat scroll 0 0; - color:#000; - cursor:move; - display:inline; - font-size:1.2em; - margin:0; + background: transparent none repeat scroll 0 0; + cursor: move; + margin: 0 50px 0 0; + padding: 0; + color: #fff; } /* widget content / body*/ #crm-container .widget-content { background-color: #ffffff; padding:0.5em; + overflow-x:auto; +} + +#crm-container .widget-content .crm-accordion-header { + background-color: #EFEFE5; + background-image: url("../i/TreeMinus.gif"); + color: #3E3E3E; +} + +#crm-container .widget-content .crm-accordion-wrapper.collapsed .crm-accordion-header { + background-image: url("../i/TreePlus.gif"); +} + +#crm-container .widget-content .crm-accordion-header:hover { + background-color: #e8e8de; +} + +#crm-container .widget-content .crm-accordion-body { + border-color: #e8e8de; + padding: 4px .5em; } -/* Standards-browsers do this anyway because all inner block elements are floated. IE doesn't because it's crap. */ #crm-container .widget-controls { - background-color:#CDE8FE; - display:block; - padding:5px 0px; + background-color: #5D677B; + /* Standards-browsers do this anyway because all inner block elements are floated. IE doesn't because it's crap. */ + display: block; + padding: 5px 0; } #crm-container .widget-icon, #crm-container .full-screen-close-icon img { @@ -100,7 +132,7 @@ font-weight: normal; float: left; cursor: pointer; - color: #222222; + color: #fff; opacity: .7; } @@ -117,7 +149,7 @@ #crm-container #available-dashlets { width: 98%; - border: 2px dashed pink; + border: 2px dashed #CDE8FE; background-color: #999999; min-height:40px; } diff --git a/templates/CRM/common/dashboard.tpl b/templates/CRM/common/dashboard.tpl index e009699bb3..57ca82ed0c 100644 --- a/templates/CRM/common/dashboard.tpl +++ b/templates/CRM/common/dashboard.tpl @@ -195,6 +195,14 @@ CRM.$(function($) { // Initialize the dashboard using these options $('#civicrm-dashboard').dashboard(options); + $('#civicrm-dashboard') + .on('mouseover', '.widget-header', function() { + $(this).closest('.widget-wrapper').addClass('db-hover-handle'); + }) + .on('mouseout', '.widget-header', function() { + $(this).closest('.widget-wrapper').removeClass('db-hover-handle'); + }); + });