X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=css%2Fjoomla.css;h=39a489786ac5c13bf710d000227f926aeb6fa695;hb=1284e6407f58a0822d740f8a00e75bdf34525cc2;hp=e0c8c3b1f19eefed6c1665af9bc88b016f6a8c21;hpb=7abf697b086b0119655d8d1eb59d1745f0d4c205;p=civicrm-core.git

diff --git a/css/joomla.css b/css/joomla.css
index e0c8c3b1f1..39a489786a 100644
--- a/css/joomla.css
+++ b/css/joomla.css
@@ -55,94 +55,10 @@ td.active {
   background-color: #ddd;
 }
 
-/*
-** Menu styles
-*/
-#crm-container .menu {
-  padding: 0 0 0 0.5em;
-  margin: 0 0 0 2em;
-}
-#crm-container .menu ul {
-  list-style: none;
-  border: none;
-  text-align:left;
-}
-#crm-container .menu li a {
-  width: 100%;
-  text-decoration: none;
-}
-#crm-container li.expanded {
-  list-style-type: circle;
-  list-style-image: url(menu-expanded.png);
-  padding: 0.2em 0.5em 0 0;
-  margin: 0;
-}
-#crm-container li.collapsed {
-  list-style-type: disc;
-  list-style-image: url(menu-collapsed.png);
-  padding: 0.2em 0.5em 0 0;
-  margin: 0;
-}
-#crm-container li a.active {
-  color: #000;
-}
-#crm-container td.menu-disabled {
-  background: #ccc;
-}
-
-/* Tab navigation */
-#crm-container .tabs {
-  margin: 0 0 0.5em 0.5em;
-}
-#crm-container ul.primary {
-  border-collapse: collapse;
-  padding: 0 0 0 1em;
-  white-space: nowrap;
-  list-style: none;
-  margin: 5px;
-  height: auto;
-  line-height: normal;
-  border-bottom: 1px solid #bbb;
-}
-#crm-container ul.primary li {
-  display: inline;
-}
-#crm-container ul.primary li a {
-  background-color: #ddd;
-  border-color: #bbb;
-  border-width: 1px;
-  border-style: solid solid none solid;
-  height: auto;
-  margin-right: 0.5em;
-  padding: 0 1em;
-  text-decoration: none;
-}
-#crm-container ul.primary li.active a {
-  background-color: #fff;
-  border: 1px solid #bbb;
-  border-bottom: #fff 1px solid;
-}
-#crm-container ul.primary li a:hover {
-  background-color: #eee;
-  border-color: #ccc;
-  border-bottom-color: #eee;
-}
-#crm-container ul.secondary {
-  border-bottom: 1px solid #bbb;
-  padding: 0.5em 1em 0.5em 1em;
-  margin: 5px;
-}
-#crm-container ul.secondary li {
-  display: inline;
-  padding: 0 1em;
-  border-right: 1px solid #ccc;
-}
-#crm-container ul.secondary a {
-  padding: 0;
-  text-decoration: none;
-}
-#crm-container ul.secondary a.active {
-  border-bottom: 4px solid #999;
+td.label {
+  background: none;
+  color: #3e3e3e;
+  display: table-cell;
 }
 
 /*
@@ -162,7 +78,7 @@ br.clear {
 .container-inline div {
   display: inline;
 }
-.container-inline .form-submit {
+.container-inline .crm-form-submit {
   margin: 0;
 }
 .item-list .icon {
@@ -191,25 +107,13 @@ br.clear {
   padding: 0;
   list-style: disc;
 }
-.form-item {
-  margin-top: 1em;
-  margin-bottom: 1em;
-}
-tr.light .form-item, tr.dark .form-item {
-  margin-top: 0;
-  margin-bottom: 0;
-  white-space: nowrap;
-}
-.form-item input.error, .form-item textarea.error {
-  border: 2px solid red;
-}
 /* Override .9em field help size from civicrm.css - CiviCRM 2.0 */
 #crm-container div.description, #crm-container span.description, #crm-container dd.description {
   font-size: 1em;
 }
 #crm-container div.description, #crm-container span.description {
-   margin: 2px 0 15px 0;
-   display: block;
+  margin: 2px 0 15px 0;
+  display: block;
 }
 .form-item label {
   font-weight: bold;
@@ -217,7 +121,7 @@ tr.light .form-item, tr.dark .form-item {
 .form-item label.option {
   font-weight: normal;
 }
-.form-submit {
+.crm-form-submit {
   margin: 0.5em 0;
 }
 .marker, .form-required {
@@ -245,76 +149,6 @@ tr.light .form-item, tr.dark .form-item {
   text-align: right;
 }
 
-
-/* Stylesheet elements ported from Drupal Bluemarine them */
-/*
-** HTML elements
-*/
-body {
-  padding: 0;
-  color: #000;
-  background-color: #fff;
-}
-tr.dark td, tr.light td {
-  padding: 0.3em;
-}
-h1, h2, h3, h4, h5, h6 {
-  margin-bottom: 0.5em;
-}
-h1 {
-  font-size: 1.3em;
-}
-h2 {
-  font-size: 1.2em;
-}
-h3, h4, h5, h6 {
-  font-size: 1.1em;
-}
-p {
-  margin-top: 0.5em;
-  margin-bottom: 0.9em;
-}
-a {
-  text-decoration: none;
-}
-a:link {
-  color: #39c;
-}
-a:visited {
-  color: #369;
-}
-a:hover {
-  color: #39c;
-  text-decoration: underline;
-}
-fieldset {
-  border: 1px solid #ccc;
-}
-pre {
-  background-color: #eee;
-  padding: 0.75em 1.5em;
-  font-size: 12px;
-  border: 1px solid #ddd;
-}
-table {
-  /* make <td> sizes relative to body size! */
-  font-size: 1em;
-}
-.form-item label {
-  font-size: 1em;
-  color: #222;
-}
-.item-list .title {
-  font-size: 1em;
-  color: #222;
-}
-.links {
-  margin-bottom: 0em;
-}
-.comment .links {
-  margin-bottom: 0em;
-}
-
 /*
 ** Page layout blocks / IDs
 */
@@ -355,7 +189,7 @@ table {
   font-weight: bold;
   color: #9cf;
 }
-#search .form-text, #search .form-submit {
+#search .form-text, #search .crm-form-submit {
   border: 1px solid #369;
   font-size: 1.1em;
 }
@@ -365,7 +199,7 @@ table {
   padding: 0 0.5em 0 0.5em;
   margin: 0 0 0.5em 0;
 }
-#search .form-submit {
+#search .crm-form-submit {
   height: 1.5em;
 }
 #main {
@@ -461,29 +295,29 @@ table {
 /* Moved from civicrm.css in v3.2 */
 
 ul#civicrm-menu {
-    z-index: 1;
-    position:relative;
-    border: none;
-    left:0px;
-    height:0px;
-    padding: 2px 0px 22px 2px !important;
-    padding-bottom:22px !important; /*moz bottom */
-    padding-bottom:2px; /*ie bottom */
+  z-index: 1;
+  position:relative;
+  border: none;
+  left:0px;
+  height:0px;
+  padding: 2px 0px 25px 2px !important;
+  padding-bottom:25px !important; /*moz bottom */
+  padding-bottom:2px; /*ie bottom */
 }
 
 div#toolbar-box div.m {
-    padding: 0px !important;
+  padding: 0px !important;
   min-height: 0;
   border: 0;
   margin-top: 8px;
 }
 
 div#toolbar-box, div#toolbar-box div.m{
-    height: auto;
+  height: auto;
 }
 
 ul#civicrm-menu li#crm-qsearch {
-    height:0px;
+  height:0px;
 }
 .crm-tab-button,
 .ui-tabs .ui-tabs-nav li {
@@ -518,19 +352,26 @@ ul#civicrm-menu li#crm-qsearch {
   top: 100px;
 }
 
-#crm-container textarea,
-#crm-container input,
-#crm-container select {
+.crm-container textarea,
+.crm-container input,
+.crm-container select {
   font-size: 12px;
-  height: 16px;
   margin-bottom: auto;
   margin-right: 4px;
   width: auto;
   padding: 2px 4px;
 }
-#crm-container select {
-  height: 22px;
+.crm-container .select2-search input {
+  width: 100%;
 }
-#crm-container input[type=submit] {
+.crm-container textarea,
+.crm-container input {
   height: auto;
 }
+.crm-container input[type=submit] {
+  height: auto;
+}
+
+.crm-container .disabled {
+  font-weight: normal;
+}