Merge pull request #278 from wmde/uof-content-colours

Set UoF colours using fun content
wmde · Jan 23, 2024 · 616d279 · 616d279
2 parents b143b24 + 038adee
commit 616d279
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 229 deletions.
diff --git a/src/components/pages/use_of_funds/FundsDistributionAccordion.vue b/src/components/pages/use_of_funds/FundsDistributionAccordion.vue
@@ -3,12 +3,15 @@
 		<div v-for="fundsItem in applicationOfFundsData"
 			:key="fundsItem.id"
 			:class="[
-					'funds_distribution_info_item',
-					'funds_distribution_info_item--' + fundsItem.id,
-					activeInfo[fundsItem.id] ? 'active' : ''
-					]"
+				'funds_distribution_info_item',
+				activeInfo[fundsItem.id] ? 'active' : ''
+			]"
 		>
-			<div class="funds_distribution_info_item__title" @click="setActive( fundsItem.id )">
+			<div
+				class="funds_distribution_info_item__title"
+				@click="setActive( fundsItem.id )"
+				:style="{color: fundsItem.colour}"
+			>
 				{{ fundsItem.title }} {{ fundsItem.percentage }}%
 			</div>
 			<div class="funds_distribution_info_item__text">

diff --git a/src/components/pages/use_of_funds/FundsDistributionInfo.vue b/src/components/pages/use_of_funds/FundsDistributionInfo.vue
diff --git a/src/scss/use_of_funds/FundsDistributionAccordion.scss b/src/scss/use_of_funds/FundsDistributionAccordion.scss
@@ -50,43 +50,6 @@
 		&.active .funds_distribution_info_item__text {
 			display: block;
 		}
-
-		&--software,
-		&--infrastructure {
-			.funds_distribution_info_item__title {
-				color: #808080;
-			}
-		}
-		&--international {
-			.funds_distribution_info_item__title {
-				color: #0ea789;
-			}
-		}
-		&--diversity {
-			.funds_distribution_info_item__title {
-				color: #e61eb8;
-			}
-		}
-		&--access {
-			.funds_distribution_info_item__title {
-				color: #de8500;
-			}
-		}
-		&--communities {
-			.funds_distribution_info_item__title {
-				color: #f24825;
-			}
-		}
-		&--society {
-			.funds_distribution_info_item__title {
-				color: #9410ac;
-			}
-		}
-		&--operative {
-			.funds_distribution_info_item__title {
-				color: #8ed14f;
-			}
-		}
 	}
 }
 
diff --git a/src/scss/use_of_funds/FundsDistributionInfo.scss b/src/scss/use_of_funds/FundsDistributionInfo.scss
diff --git a/src/view_models/useOfFunds.ts b/src/view_models/useOfFunds.ts
@@ -1,6 +1,6 @@
 export interface FundsItem {
-	id: string,
 	percentage: number,
+	colour: string,
 	title: string,
 	text: string,
 }