X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=css%2Fjoomla.css;h=d49a764898243566d1713debc017d32c8fae5e83;hb=17072a2d45e2bc04e357111bc90b45c3c818d1ad;hp=5c5d55e41576ad77ae75a8a363d8148c995a99b4;hpb=7649c9507b00c76906601cbdbf62e7cef98399b9;p=civicrm-core.git

diff --git a/css/joomla.css b/css/joomla.css
index 5c5d55e415..a59b3a047a 100644
--- a/css/joomla.css
+++ b/css/joomla.css
@@ -155,9 +155,6 @@ br.clear {
 #header, #content {
   width: 100%;
 }
-#header {
-  background-color: #69c;
-}
 #logo {
   vertical-align: middle;
   border: 0;
@@ -294,10 +291,6 @@ br.clear {
 /* Joomla Admin Menu alterations */
 /* Moved from civicrm.css in v3.2 */
 
-ul#civicrm-menu {
-  position:relative;
-  z-index: 1;
-}
 
 div#toolbar-box div.m {
   padding: 0px !important;
@@ -310,9 +303,6 @@ div#toolbar-box, div#toolbar-box div.m{
   height: auto;
 }
 
-ul#civicrm-menu li#crm-qsearch {
-  height:0px;
-}
 .crm-tab-button,
 .ui-tabs .ui-tabs-nav li {
   border: 1px;
@@ -381,6 +371,11 @@ ul#civicrm-menu li#crm-qsearch {
   display: block;
 }
 
+/* dev/core#874 the width:auto styling above causes the menubar colour picker to be squeezed */
+.crm-container input.crm-form-color {
+  width: 3.6em;
+}
+
 /* Remove Joomla subhead toolbar & whitespace border */
 	
 body.admin.com_civicrm .subhead-collapse {
@@ -390,25 +385,17 @@ body.admin.com_civicrm .container-fluid.container-main {
 	padding: 0;
 	border-top: 1px solid #787878;
 }
+body.admin.com_civicrm.task-civicrmupgrade .container-fluid.container-main {
+	padding: 10px 25px 25px;
+}
 body.admin.com_civicrm #crm-nav-menu-container {
 	padding-bottom: 0 !important;
 }
 body.admin.com_civicrm #content-right {
 	padding: 12px;
 }
-body.admin.com_civicrm #civicrm-menu #crm-qsearch {
-  padding-left: 20px;
-}
-body.admin.com_civicrm #root-menu-div div.outerbox:first-of-type {
-	margin-left: 20px;
-} 
-body.admin.com_civicrm div.outerbox {
-	z-index: 1000;
-}
-
-/* Shoreditch-specific */
 
-body.admin.com_civicrm {
-	padding-top: 0px !important;
-	margin-top: 30px !important; 
+/* Make footer admin bar hide behind popup windows (CRM-15723) */
+body.ui-dialog-open #status {
+  z-index: 100 !important;
 }