diff --git a/frontend/src/App.vue b/frontend/src/App.vue index d44d64ab3..a6613bec1 100755 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -49,40 +49,49 @@ a, .copyright { color: #5a7b02; } -gradido-global-color-text { +.font1_2em { + font-size: 1.2em; +} +.font2em { + font-size: 1.5em; +} +.gradido-global-color-text { color: #3d443b; } -gradido-global-color-accent { +.gradido-global-color-accent { color: #047006; } -gradido-global-color-6e0a9c9e { +.gradido-global-color-6e0a9c9e { color: #000; } -gradido-global-color-2d0fb154 { +.gradido-global-color-2d0fb154 { color: #047006; } -gradido-global-color-16efe88c { +.gradido-global-color-16efe88c { color: #7ebc55; } -gradido-global-color-1939326 { +.gradido-global-color-1939326 { color: #f6fff6; } -gradido-global-color-9d79fc1 { +.gradido-global-color-9d79fc1 { color: #047006; } -gradido-global-color-6347f4d { +.gradido-global-color-6347f4d { color: #5a7b02; } -gradido-global-color-4fbc19a { +.gradido-global-color-4fbc19a { color: #014034; } -gradido-global-color-d341874 { +.gradido-global-color-d341874 { color: #b6d939; } -gradido-global-color-619d338 { +.gradido-global-color-619d338 { color: #8ebfb1; } -gradido-global-color-44819a9 { +.gradido-global-color-44819a9 { color: #026873; } +.gradido-global-color-gray { + color: #858383; +} diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 74e32c1bb..81fb90972 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -18,6 +18,7 @@ "de": "Deutsch", "en": "English" }, + "decay": "Vergänglichkeit", "form": { "cancel":"Abbrechen", "reset": "Zurücksetzen", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index eb9a9874d..58ebbf9f1 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -18,6 +18,7 @@ "de": "Deutsch", "en": "English" }, + "decay": "Decay", "form": { "cancel":"Cancel", "reset": "Reset", diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js index e32aa6eee..16ab3d78f 100755 --- a/frontend/src/routes/routes.js +++ b/frontend/src/routes/routes.js @@ -16,7 +16,7 @@ const routes = [ }, { path: '/profile', - component: () => import('../views/Pages/UserProfileCard.vue'), + component: () => import('../views/Pages/UserProfile.vue'), meta: { requiresAuth: true, }, diff --git a/frontend/src/views/Pages/AccountOverview.spec.js b/frontend/src/views/Pages/AccountOverview.spec.js index 0ee75ef9f..031828129 100644 --- a/frontend/src/views/Pages/AccountOverview.spec.js +++ b/frontend/src/views/Pages/AccountOverview.spec.js @@ -28,7 +28,7 @@ describe('AccountOverview', () => { }) it('has a transactions table', () => { - expect(wrapper.find('gdd-table-stub').exists()).toBeTruthy() + expect(wrapper.find('gdd-transaction-list-stub').exists()).toBeTruthy() }) }) }) diff --git a/frontend/src/views/Pages/AccountOverview.vue b/frontend/src/views/Pages/AccountOverview.vue index 7753b1427..5f262f627 100644 --- a/frontend/src/views/Pages/AccountOverview.vue +++ b/frontend/src/views/Pages/AccountOverview.vue @@ -28,7 +28,7 @@