From fddb531ed20b31c44e6911418e7bbb884836c40a Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sun, 31 Jul 2022 12:35:48 +0300 Subject: --fix --- src/services/theme_data/theme_data.service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/services/theme_data') diff --git a/src/services/theme_data/theme_data.service.js b/src/services/theme_data/theme_data.service.js index b619f810..da48f02c 100644 --- a/src/services/theme_data/theme_data.service.js +++ b/src/services/theme_data/theme_data.service.js @@ -39,7 +39,7 @@ import { LAYERS, DEFAULT_OPACITY, SLOT_INHERITANCE } from './pleromafe.js' export const CURRENT_VERSION = 3 export const getLayersArray = (layer, data = LAYERS) => { - let array = [layer] + const array = [layer] let parent = data[layer] while (parent) { array.unshift(parent) -- cgit v1.2.3-70-g09d2 From b44df37c1b6e613c1094938f5605efb85bcf93c8 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sun, 31 Jul 2022 12:39:02 +0300 Subject: "fix" the sort function potentially not always outputting results --- src/services/theme_data/theme_data.service.js | 1 + 1 file changed, 1 insertion(+) (limited to 'src/services/theme_data') diff --git a/src/services/theme_data/theme_data.service.js b/src/services/theme_data/theme_data.service.js index da48f02c..b376ef4d 100644 --- a/src/services/theme_data/theme_data.service.js +++ b/src/services/theme_data/theme_data.service.js @@ -138,6 +138,7 @@ export const topoSort = ( if (depsA === depsB || (depsB !== 0 && depsA !== 0)) return ai - bi if (depsA === 0 && depsB !== 0) return -1 if (depsB === 0 && depsA !== 0) return 1 + return 0 // failsafe, shouldn't happen? }).map(({ data }) => data) } -- cgit v1.2.3-70-g09d2 From 373fb077a820deae28f494e7d2dc8c19370a54bf Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 17 Oct 2022 21:50:49 +0300 Subject: use new color slot for badges --- src/components/timeline/timeline.scss | 2 +- src/services/theme_data/pleromafe.js | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'src/services/theme_data') diff --git a/src/components/timeline/timeline.scss b/src/components/timeline/timeline.scss index 900bdad3..9fc2aeab 100644 --- a/src/components/timeline/timeline.scss +++ b/src/components/timeline/timeline.scss @@ -10,7 +10,7 @@ top: calc(50% - 4px); margin-left: 6px; margin-top: -6px; - background-color: var(--cGreen); + background-color: var(--badgeNeutral); } .loadmore-button { diff --git a/src/services/theme_data/pleromafe.js b/src/services/theme_data/pleromafe.js index c2983be7..dc7a5d89 100644 --- a/src/services/theme_data/pleromafe.js +++ b/src/services/theme_data/pleromafe.js @@ -709,6 +709,14 @@ export const SLOT_INHERITANCE = { textColor: 'bw' }, + badgeNeutral: '--cGreen', + badgeNeutralText: { + depends: ['text', 'badgeNeutral'], + layer: 'badge', + variant: 'badgeNeutral', + textColor: 'bw' + }, + chatBg: { depends: ['bg'] }, -- cgit v1.2.3-70-g09d2