brings more core css files into theme, resolves issue #5 'harmonize a…

…nd (maybe change) green colors'
ufundo · Nov 14, 2024 · 83a1af7 · 83a1af7
1 parent 2db3896
commit 83a1af7
Show file tree

Hide file tree

Showing 10 changed files with 101 additions and 10 deletions.
diff --git a/ext/riverlea/core/css/_fixes.css b/ext/riverlea/core/css/_fixes.css
@@ -606,15 +606,15 @@ div.crm-summary-contactname-block + .crm-actions-ribbon {
 .crm-container #extensions-addnew {
 	padding: 0;
 }
-/* .crm-container #extensions table.dataTable {
-	box-shadow: none;
-} */
 .crm-container #extensions table.dataTable summary {
 	padding: 0;
 	background-color: unset;
 	color: var(--crm-c-text);
 	font-weight: unset;
 }
+.crm-container #extensions table.dataTable summary a {
+	color: var(--crm-c-link);
+}
 
 /* New mailing */
 .crm-container .crmMailing-preview {

diff --git a/ext/riverlea/core/css/archive/_admin.css b/ext/riverlea/core/css/archive/_admin.css
@@ -0,0 +1,71 @@
+/* civicrm-core/css/admin.css - branched on 7 Jun 24 */
+
+/* Styles specific to admin pages/forms */
+
+/* Config Task List */
+#crm-container td.tasklist a {
+    font-weight: var(--crm-bold-weight);
+    font-family: var(--crm-font-bold);
+}  
+#crm-container table.selector td.tasklist {
+  border-right: 1px solid #dddddd;
+  width: 20%;
+}
+#crm-container td.tasklist a:link {
+  color: var(--crm-c-red);
+}
+#crm-container td.tasklist a:visited {
+  color: var(--crm-c-green);
+}
+
+/* Class for successful upgrade */
+.crm-container .upgrade-success {
+  background-color: var(--crm-alert-background-help);
+  color: var(--crm-alert-text-help);
+}
+
+/* Extension management */
+/* .crm-container .extension-upgradable {
+  background-color: #ffffcc !important;
+}
+.crm-container .extension-installed {
+  background-color: #ddffdd !important;
+} */
+.crm-container .extension-missing {
+  color: var(--crm-c-warning);
+}
+#crm-container .crm-extensions-upgrade {
+  background: var(--crm-alert-background-warning);
+  border: 1px solid var(--crm-alert-border-warning);
+  padding: var(--crm-padding-small);
+  border-radius: var(--crm-roundness);
+}
+.crm-container .crm-extensions-version {
+  white-space: nowrap;
+}
+.crm-container .crm-extensions-stage {
+  margin-left: var(--crm-s);
+}
+.crm-container .crm-extensions-stage.fa-flask {
+  color: var(--crm-c-warning);
+}
+.crm-container .crm-extensions-stage.fa-check-circle {
+  color: var(--crm-c-success);
+}
+
+
+@media screen and (min-width: 480px) {
+  #crm-container .admin-section-items {
+    column-count: 2;
+    column-gap: 1em;
+  }
+  #crm-container .admin-section-items dl {
+    -webkit-column-break-inside: avoid;
+    page-break-inside: avoid;
+    break-inside: avoid;
+    margin: 0 1em;
+  }
+  #crm-container .admin-section-items dt {
+    font-weight: bold;
+  }
+}
diff --git a/ext/riverlea/core/css/components/_tables.css b/ext/riverlea/core/css/components/_tables.css
@@ -63,11 +63,20 @@ table.dataTable.display tbody tr.even > .sorting_1,
 table.dataTable.order-column.stripe tbody tr.even > .sorting_1 {
     background: linear-gradient(to top,rgba(0, 0, 0, 0.05),rgba(0, 0, 0, 0.05)) var(--crm-table-even-row);
 }
-.crm-container .extension-installed,
-table.dataTable.display tbody tr.extension-installed > .sorting_1, 
-table.dataTable.order-column.stripe tbody tr.extension-installed > .sorting_1 {
+.crm-container .extension-installed {
     background: var(--crm-c-green-light);
 }
+.crm-container .extension-installed.odd {
+    background: linear-gradient(to top,rgba(256,256,256,0.25),rgba(256,256,256,0.25)) var(--crm-c-green-light) !important; /* vs jquery.datatables.min.css */
+}
+table.dataTable.display tbody tr.extension-installed.odd > .sorting_1, 
+table.dataTable.order-column.stripe tbody tr.extension-installed.odd > .sorting_1 {
+    background: var(--crm-c-green-light) !important;
+}
+table.dataTable.display tbody tr.extension-installed.even > .sorting_1, 
+table.dataTable.order-column.stripe tbody tr.extension-installed.even > .sorting_1  {
+    background: linear-gradient(to top,rgba(0, 0, 0, 0.05),rgba(0, 0, 0, 0.05)) var(c-green-light);
+}
 .crm-container td,
 .crm-container table.dataTable thead td {
     padding: var(--crm-table-padding);

diff --git a/ext/riverlea/core/css/contactSummary.css b/ext/riverlea/core/css/contactSummary.css
@@ -0,0 +1,3 @@
+.crm-container {
+    border: 2px solid red;
+}
diff --git a/ext/riverlea/riverlea.php b/ext/riverlea/riverlea.php
@@ -21,16 +21,19 @@ function riverlea_civicrm_themes(&$themes) {
     'ext' => 'riverlea',
     'title' => 'Riverlea: Minetta (~Greenwich)',
     'prefix' => 'streams/minetta/',
+    'search_order' => array('minetta', '_riverlea_core_', '_fallback_'),
   );
   $themes['walbrook'] = array(
     'ext' => 'riverlea',
     'title' => 'Riverlea: Walbrook (~Shoreditch/Island)',
     'prefix' => 'streams/walbrook/',
+    'search_order' => array('walbrook', '_riverlea_core_', '_fallback_'),
   );
   $themes['_riverlea_core_'] = array(
     'ext' => 'riverlea',
     'title' => 'Riverlea: base theme',
     'prefix' => 'core/',
+    'search_order' => array('_riverlea_core_', '_fallback_'),
   );
 }
 

diff --git a/ext/riverlea/riverlea.theme.php b/ext/riverlea/riverlea.theme.php
@@ -6,5 +6,6 @@
   'title' => 'RiverLea',
   'prefix' => NULL,
   'url_callback' => '\\Civi\\Core\\Themes\\Resolvers::simple',
-  'search_order' => ['riverlea', '_fallback_'],
+  'excludes'     => [ 'css/contactSummary.css', 'css/admin.css' ], // @todo redo 'css/dashboard.css'
+  'search_order' => ['_riverlea_core_', '_fallback_'],
 );
diff --git a/ext/riverlea/streams/minetta/css/_variables.css b/ext/riverlea/streams/minetta/css/_variables.css
@@ -42,7 +42,7 @@ color-scheme: light dark; /* check to use simpler syntax late-2024 (Edge+iOS Saf
 --crm-c-red-dark: #b94a48 ;
 --crm-c-amber: #dd5600;;
 --crm-c-amber-light: #fbf0e2;
---crm-c-yellow: #ffff66;
+--crm-c-yellow: #fcfc5a;
 --crm-c-yellow-light: #ffffcc;
 --crm-c-yellow-less-light: #fffdb2;
 --crm-c-teal: #399389;
@@ -77,7 +77,7 @@ color-scheme: light dark; /* check to use simpler syntax late-2024 (Edge+iOS Saf
 --crm-c-info: var(--crm-c-blue-dark);
 --crm-c-info-text: var(--crm-c-light-text);
 --crm-c-focus: var(--crm-c-blue-dark);
---crm-c-inactive: var(--crm-c-background4);
+--crm-c-inactive: #696969;
 
 /* SHADOWS */
 --crm-block-shadow:;

diff --git a/ext/riverlea/streams/walbrook/css/_variables.css b/ext/riverlea/streams/walbrook/css/_variables.css
@@ -77,7 +77,7 @@ color-scheme: light dark;
 --crm-c-info: var(--crm-c-blue);
 --crm-c-info-text: var(--crm-c-light-text);
 --crm-c-focus: var(--crm-blue-mid);
---crm-c-inactive: var(--crm-c-background2);
+--crm-c-inactive: #696969;
 
 /* SHADOWS */
 --crm-block-shadow: 0 3px 18px 0 rgba(48,40,40,.25);

diff --git a/ext/riverlea/streams/walbrook/css/admin.css b/ext/riverlea/streams/walbrook/css/admin.css
@@ -0,0 +1 @@
+@import url(../../../core/css/archive/_admin.css)
diff --git a/ext/riverlea/streams/walbrook/css/contactSummary.css b/ext/riverlea/streams/walbrook/css/contactSummary.css
@@ -0,0 +1,3 @@
+.crm-container {
+    border: 2px solid green; /* test value */
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		@import url(../../../core/css/archive/_admin.css)