Merge branch 'master' into 5.15

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

diff --git a/css/civicrm.css b/css/civicrm.css
index fe2864a6ebefd2653c3b802fdd22511e1566f521..c1c75403f444ef7ec02e6b2040ad8bf499b44b84 100644 (file)
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -887,6 +887,12 @@ input.crm-form-entityref {
   font-weight: bold;
 }
 
+/* dev/core#1039 Make contact details in popup on merge screen non bold */
+#crm-container tr.columnheader td [class*="crm-summary-col-"] {
+  font-size: 13px;
+  font-weight: normal;
+}
+
 #crm-container tr.columnheader-dark th span.extra {
   font-size: .95em;
   font-weight: normal;
@@ -1437,6 +1443,7 @@ input.crm-form-entityref {
   padding: 4px;
   margin: 0;
   line-height: 15px;
+  white-space: initial;
 }
 
 .crm-container .action-item-wrap {
@@ -3237,6 +3244,7 @@ span.crm-select-item-color {
   background-color: white;
   border: 1px solid #a5a5a5;
   width: 300px;
+  max-width: 100%;
   max-height: 300px;
   overflow-y: auto;
 }