Skip to content

Commit 349de19

Browse files
committed
- Merge branch 'hotfix-18.2' into develop
2 parents c4cad5e + 9138d7f commit 349de19

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

Rock.JavaScript.Obsidian/Framework/SystemGuids/serviceJob.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,8 @@ export const ServiceJob = {
197197
DataMigrations181AddFinancialbatchIndex: "EA5D69D8-8ABB-42CD-A664-48F6BC5E2C7F",
198198
/** The Job to run Post v19.0 Data Migrations to swap Block. */
199199
DataMigrations190SwapObsidianBlocks: "C05C0C81-12B2-4C35-9405-C3CE09E3CE75",
200+
/** The job to run Post v18.1 Data Migrations to add indexes to improve communication prep performance. */
201+
DataMigrations181AddIndexesForCommunicationPrep: "88C42A48-6713-4CB1-BF6B-A12AB2E292E7",
200202
/**
201203
* The Post Update Data Migration Job to chop the Schedule Detail, Asset Storage Provider Detail, Page Short Link Detail, Streak Type Detail,
202204
* Following Event Type Detail, Financial Batch Detail

RockWeb/Styles/styles-v2/rock-components/_grid-obsidian.scss

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,14 +310,18 @@
310310
padding: var(--spacing-xsmall);
311311
}
312312

313+
.grid-body {
314+
background-color: var(--color-interface-softest);
315+
}
316+
313317
.grid-row {
314318
display: flex;
315-
background-color: var(--color-interface-softest);
316319
transition: background-color 70ms cubic-bezier(0, 0, .38, .9);
317320
}
318321

319322
.grid-row.grid-row-selectable {
320323
cursor: pointer;
324+
background-color: var(--color-interface-softer);
321325
}
322326

323327
.grid-striped .grid-row.grid-row-even .grid-cell {
@@ -335,7 +339,7 @@
335339
line-height: 1.4;
336340
align-self: stretch;
337341
word-break: break-word;
338-
background-color: inherit;
342+
background-color: var(--color-interface-softest);
339343
text-overflow: ellipsis;
340344
overflow: hidden;
341345
min-width: 120px;

RockWeb/Themes/RockNextGen/Styles/theme.css

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16381,14 +16381,18 @@ textarea:focus,
1638116381
padding: var(--spacing-xsmall);
1638216382
}
1638316383

16384+
.grid-body {
16385+
background-color: var(--color-interface-softest);
16386+
}
16387+
1638416388
.grid-row {
1638516389
display: flex;
16386-
background-color: var(--color-interface-softest);
1638716390
transition: background-color 70ms cubic-bezier(0, 0, 0.38, 0.9);
1638816391
}
1638916392

1639016393
.grid-row.grid-row-selectable {
1639116394
cursor: pointer;
16395+
background-color: var(--color-interface-softer);
1639216396
}
1639316397

1639416398
.grid-striped .grid-row.grid-row-even .grid-cell {
@@ -16406,7 +16410,7 @@ textarea:focus,
1640616410
line-height: 1.4;
1640716411
align-self: stretch;
1640816412
word-break: break-word;
16409-
background-color: inherit;
16413+
background-color: var(--color-interface-softest);
1641016414
text-overflow: ellipsis;
1641116415
overflow: hidden;
1641216416
min-width: 120px;

0 commit comments

Comments
 (0)