diff --git a/frontend/public/img/svg/my_profil.svg b/frontend/public/img/svg/my_profil.svg new file mode 100644 index 000000000..ef41c2ef4 --- /dev/null +++ b/frontend/public/img/svg/my_profil.svg @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/frontend/public/img/svg/write.svg b/frontend/public/img/svg/write.svg new file mode 100644 index 000000000..45638e32e --- /dev/null +++ b/frontend/public/img/svg/write.svg @@ -0,0 +1,287 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/frontend/src/assets/scss/custom/gradido-custom/_color.scss b/frontend/src/assets/scss/custom/gradido-custom/_color.scss index 67de86479..361f717af 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_color.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_color.scss @@ -17,6 +17,7 @@ $gradido-248: rgb(248 248 248) !default; $gradido-140: rgb(140 66 5) !default; $gradido-205: rgb(205 86 86) !default; $gradido-197: rgb(197 141 56) !default; +$gradido-209: rgb(209 209 209) !default; $gradido-4: rgb(4 112 6) !default; $black: #000 !default; $grays: () !default; @@ -36,6 +37,7 @@ $grays: map.merge( "140": $gradido-140, "205": $gradido-205, "197": $gradido-197, + "209": $gradido-209, "4": $gradido-4 ), $grays @@ -75,6 +77,7 @@ $colors: map.merge( "140": $gradido-140, "205": $gradido-205, "197": $gradido-197, + "209": $gradido-209, "4": $gradido-4 ), $colors @@ -118,6 +121,7 @@ $theme-colors: map.merge( "140": $gradido-140, "205": $gradido-205, "197": $gradido-197, + "209": $gradido-209, "4": $gradido-4 ), $theme-colors diff --git a/frontend/src/assets/scss/gradido-template.scss b/frontend/src/assets/scss/gradido-template.scss index 5a63d3e78..645513205 100644 --- a/frontend/src/assets/scss/gradido-template.scss +++ b/frontend/src/assets/scss/gradido-template.scss @@ -126,6 +126,10 @@ a:hover, border-bottom-right-radius: 17px !important; } +.rounded-26 { + border-radius: 26px; +} + .alert { border-radius: 26px; box-shadow: rgb(0 0 0 / 14%) 0 24px 80px; diff --git a/frontend/src/components/Template/ContentHeader/NavCommunity.vue b/frontend/src/components/Template/ContentHeader/NavCommunity.vue index ca96ce914..9748eb187 100644 --- a/frontend/src/components/Template/ContentHeader/NavCommunity.vue +++ b/frontend/src/components/Template/ContentHeader/NavCommunity.vue @@ -1,25 +1,19 @@ diff --git a/frontend/src/pages/ForgotPassword.vue b/frontend/src/pages/ForgotPassword.vue index 773b78278..80d07b9ff 100644 --- a/frontend/src/pages/ForgotPassword.vue +++ b/frontend/src/pages/ForgotPassword.vue @@ -5,7 +5,7 @@
{{ $t('site.forgotPassword.heading') }}
- + -
- + + + {{ $t('settings.password.send_now') }} -
+
+
@@ -88,3 +90,13 @@ export default { }, } + diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue index 2a3c05dc7..c02ee0e45 100644 --- a/frontend/src/pages/Login.vue +++ b/frontend/src/pages/Login.vue @@ -2,7 +2,7 @@
{{ $t('gdd_per_link.isFree') }}
- + @@ -30,8 +30,15 @@ - - {{ $t('login') }} + + + {{ $t('login') }} + @@ -127,3 +134,13 @@ export default { }, } + diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue index c2877e897..5f53b8ac1 100755 --- a/frontend/src/pages/Register.vue +++ b/frontend/src/pages/Register.vue @@ -81,7 +81,7 @@ - + + diff --git a/frontend/src/pages/ResetPassword.vue b/frontend/src/pages/ResetPassword.vue index 5c791ac61..6fa76d994 100644 --- a/frontend/src/pages/ResetPassword.vue +++ b/frontend/src/pages/ResetPassword.vue @@ -1,20 +1,24 @@