diff --git a/src/assets/annoIcons/Icon_beeswax_0.webp b/src/assets/annoIcons/Icon_beeswax_0.webp new file mode 100644 index 0000000..106667e Binary files /dev/null and b/src/assets/annoIcons/Icon_beeswax_0.webp differ diff --git a/src/assets/annoIcons/Icon_candles_0.webp b/src/assets/annoIcons/Icon_candles_0.webp new file mode 100644 index 0000000..5ba68cb Binary files /dev/null and b/src/assets/annoIcons/Icon_candles_0.webp differ diff --git a/src/assets/annoIcons/Icon_ceramics_0.webp b/src/assets/annoIcons/Icon_ceramics_0.webp new file mode 100644 index 0000000..e4cd801 Binary files /dev/null and b/src/assets/annoIcons/Icon_ceramics_0.webp differ diff --git a/src/assets/annoIcons/Icon_indigo_0.webp b/src/assets/annoIcons/Icon_indigo_0.webp new file mode 100644 index 0000000..d95b265 Binary files /dev/null and b/src/assets/annoIcons/Icon_indigo_0.webp differ diff --git a/src/assets/annoIcons/Icon_lanterns_0.webp b/src/assets/annoIcons/Icon_lanterns_0.webp new file mode 100644 index 0000000..e6ad43f Binary files /dev/null and b/src/assets/annoIcons/Icon_lanterns_0.webp differ diff --git a/src/assets/annoIcons/Icon_mud_bricks_0.webp b/src/assets/annoIcons/Icon_mud_bricks_0.webp new file mode 100644 index 0000000..0d5474f Binary files /dev/null and b/src/assets/annoIcons/Icon_mud_bricks_0.webp differ diff --git a/src/assets/annoIcons/Icon_paper_0.webp b/src/assets/annoIcons/Icon_paper_0.webp new file mode 100644 index 0000000..0e3ac2f Binary files /dev/null and b/src/assets/annoIcons/Icon_paper_0.webp differ diff --git a/src/assets/annoIcons/Icon_scriptures_0.webp b/src/assets/annoIcons/Icon_scriptures_0.webp new file mode 100644 index 0000000..e339395 Binary files /dev/null and b/src/assets/annoIcons/Icon_scriptures_0.webp differ diff --git a/src/assets/annoIcons/Icon_seafood_0.webp b/src/assets/annoIcons/Icon_seafood_0.webp new file mode 100644 index 0000000..792257b Binary files /dev/null and b/src/assets/annoIcons/Icon_seafood_0.webp differ diff --git a/src/assets/annoIcons/Icon_spices_0.webp b/src/assets/annoIcons/Icon_spices_0.webp new file mode 100644 index 0000000..0bd8e92 Binary files /dev/null and b/src/assets/annoIcons/Icon_spices_0.webp differ diff --git a/src/assets/annoIcons/Icon_tapestries_0.webp b/src/assets/annoIcons/Icon_tapestries_0.webp new file mode 100644 index 0000000..1034b8c Binary files /dev/null and b/src/assets/annoIcons/Icon_tapestries_0.webp differ diff --git a/src/assets/annoIcons/Icon_teff_flour_0.webp b/src/assets/annoIcons/Icon_teff_flour_0.webp new file mode 100644 index 0000000..ea40d33 Binary files /dev/null and b/src/assets/annoIcons/Icon_teff_flour_0.webp differ diff --git a/src/assets/annoIcons/Icon_teff_grass_0.webp b/src/assets/annoIcons/Icon_teff_grass_0.webp new file mode 100644 index 0000000..759359a Binary files /dev/null and b/src/assets/annoIcons/Icon_teff_grass_0.webp differ diff --git a/src/assets/annoIcons/Icon_tobacco_pipes_0.webp b/src/assets/annoIcons/Icon_tobacco_pipes_0.webp new file mode 100644 index 0000000..7f1351a Binary files /dev/null and b/src/assets/annoIcons/Icon_tobacco_pipes_0.webp differ diff --git a/src/assets/annoIcons/Icon_wat_stew_0.webp b/src/assets/annoIcons/Icon_wat_stew_0.webp new file mode 100644 index 0000000..e4b3774 Binary files /dev/null and b/src/assets/annoIcons/Icon_wat_stew_0.webp differ diff --git a/src/components/ChainTiers.vue b/src/components/ChainTiers.vue index 1717384..97d2c8c 100644 --- a/src/components/ChainTiers.vue +++ b/src/components/ChainTiers.vue @@ -3,7 +3,7 @@ flat bordered square - :class="['bg-grey-3', 'q-ma-sm', 'border', 'text-center']" + :class="['card-background', 'q-ma-sm', 'border', 'text-center']" >
diff --git a/src/components/DiagramRenderer.vue b/src/components/DiagramRenderer.vue index 45beb65..0ee842b 100644 --- a/src/components/DiagramRenderer.vue +++ b/src/components/DiagramRenderer.vue @@ -70,4 +70,12 @@ $x: 5; padding: 1px; } } + +.top-padding { + padding-top: 100px; +} + +rect.label-container { + fill: $burnt !important; +} diff --git a/src/components/production-chains.ts b/src/components/production-chains.ts index 205568b..42017c6 100644 --- a/src/components/production-chains.ts +++ b/src/components/production-chains.ts @@ -18,6 +18,8 @@ import glassMakersIcon from '../assets/annoIcons/Glass.webp'; import windowMakersIcon from '../assets/annoIcons/Windows.webp'; import cementIcon from '../assets/annoIcons/Cement.webp'; import concreteFactory from '../assets/annoIcons/Reinforced_concrete.webp'; +import teffIcon from '../assets/annoIcons/Icon_teff_grass_0.webp'; +import mudBricksIcon from '../assets/annoIcons/Icon_mud_bricks_0.webp'; // Farmers & Workers import potatoIcon from '../assets/annoIcons/Potato.webp'; @@ -150,6 +152,10 @@ export const productionChains: TieredProductionChain[] = [ { productionChain: 'concrete', mermaidDefinition: `flowchart LR; Charcoal(1) & Iron(50%1) --> Steel(1) --> Concrete(2); Cement(1) --> Concrete` + }, + { + productionChain: 'mudBricks', + mermaidDefinition: `flowchart LR; Clay(25%1) & Teff(1) --> MudBricks(1)` } ] }, diff --git a/src/css/app.scss b/src/css/app.scss index 243aad4..8043f0a 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -15,6 +15,22 @@ color: $off-black !important; } +.text-burnt { + color: #a47718 !important; +} + .bg-off-black { background: $off-black !important; } + +.toolbar-background { + background-color: #8f6c40; +} + +.page-background { + background-color: #fff1d1; +} + +.card-background { + background-color: #fbf1dc; +} diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss index 882ac2d..eae5779 100644 --- a/src/css/quasar.variables.scss +++ b/src/css/quasar.variables.scss @@ -25,3 +25,6 @@ $info: #31ccec; $warning: #f2c037; $off-black: #2e3f4e; +$burnt-dark: #8f6c40; +$burnt: #fff1d1; +$burnt-light: #fbf1dc; diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue index 8b08ee1..337b800 100644 --- a/src/layouts/MainLayout.vue +++ b/src/layouts/MainLayout.vue @@ -1,25 +1,24 @@