diff --git a/frontend/src/components/AppHeader.vue b/frontend/src/components/AppHeader.vue index 45457b0..81bad62 100644 --- a/frontend/src/components/AppHeader.vue +++ b/frontend/src/components/AppHeader.vue @@ -47,7 +47,7 @@ header { display: flex; justify-content: space-between; padding: 10px; - background-color: #f8a22b; + background-color: #FF8C5A; } .logo, .title, .advertisement { text-align: center; diff --git a/frontend/src/views/falukant/FamilyView.vue b/frontend/src/views/falukant/FamilyView.vue index 8f9c391..f5bbc5b 100644 --- a/frontend/src/views/falukant/FamilyView.vue +++ b/frontend/src/views/falukant/FamilyView.vue @@ -16,58 +16,59 @@

{{ $t('falukant.family.spouse.title') }}

- -
- +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
{{ $t('falukant.family.relationships.name') }} + {{ $t('falukant.titles.' + relationships[0].character2.gender + '.' + + relationships[0].character2.nobleTitle) }} + {{ relationships[0].character2.firstName }} +
{{ $t('falukant.family.spouse.age') }}{{ relationships[0].character2.age }}
{{ $t('falukant.family.spouse.mood') }}{{ $t(`falukant.mood.${relationships[0].character2.mood.tr}`) }}
{{ $t('falukant.family.spouse.status') }}{{ $t('falukant.family.statuses.' + relationships[0].relationshipType) }}
{{ $t('falukant.family.spouse.progress') }} +
+
+
+
+
    +
  • + {{ $t(`falukant.character.${trait.tr}`) }} +
  • +
+
+
+ +
-
- - - - - - - - - - - - - - - - - - - - - - - - -
{{ $t('falukant.family.relationships.name') }} - {{ $t('falukant.titles.' + relationships[0].character2.gender + '.' + - relationships[0].character2.nobleTitle) }} - {{ relationships[0].character2.firstName }} -
{{ $t('falukant.family.spouse.age') }}{{ relationships[0].character2.age }}
{{ $t('falukant.family.spouse.mood') }}{{ $t(`falukant.mood.${relationships[0].character2.mood.tr}`) }}
{{ $t('falukant.family.spouse.status') }}{{ $t('falukant.family.statuses.' + relationships[0].relationshipType) }}
{{ $t('falukant.family.spouse.progress') }} -
-
-
-
-
    -
  • - {{ $t(`falukant.character.${trait.tr}`) }} -
  • -
-
-
+

{{ $t('falukant.family.spouse.wooing.gifts') }}

@@ -472,11 +473,21 @@ export default { } .relationship-container { + display: flex; + flex-direction: column; + gap: 20px; +} + +.relationship-row { display: flex; gap: 20px; align-items: flex-start; } +.relationship { + flex: 1; +} + .partner-character-3d { width: 200px; height: 280px; @@ -486,6 +497,11 @@ export default { flex-shrink: 0; } +.gifts-section { + width: 100%; + margin-top: 10px; +} + .children-container { display: flex; gap: 20px;