diff --git a/app/soapbox/components/display_name.js b/app/soapbox/components/display_name.js index 30dbce9a2f..7ab8b9e607 100644 Binary files a/app/soapbox/components/display_name.js and b/app/soapbox/components/display_name.js differ diff --git a/app/soapbox/features/edit_profile/components/profile_preview.js b/app/soapbox/features/edit_profile/components/profile_preview.js index 6b4166d22d..808f18a555 100644 Binary files a/app/soapbox/features/edit_profile/components/profile_preview.js and b/app/soapbox/features/edit_profile/components/profile_preview.js differ diff --git a/app/soapbox/features/edit_profile/index.js b/app/soapbox/features/edit_profile/index.js index fce8e33dff..5445ff30ac 100644 Binary files a/app/soapbox/features/edit_profile/index.js and b/app/soapbox/features/edit_profile/index.js differ diff --git a/app/soapbox/features/ui/components/profile_info_panel.js b/app/soapbox/features/ui/components/profile_info_panel.js index e26dc01256..592d60ee02 100644 Binary files a/app/soapbox/features/ui/components/profile_info_panel.js and b/app/soapbox/features/ui/components/profile_info_panel.js differ diff --git a/app/soapbox/features/ui/components/user_panel.js b/app/soapbox/features/ui/components/user_panel.js index 7358306224..1ba4e3efca 100644 Binary files a/app/soapbox/features/ui/components/user_panel.js and b/app/soapbox/features/ui/components/user_panel.js differ diff --git a/app/styles/accounts.scss b/app/styles/accounts.scss index cd0364ea92..e6e6f20ee6 100644 --- a/app/styles/accounts.scss +++ b/app/styles/accounts.scss @@ -92,6 +92,10 @@ overflow: hidden; text-overflow: ellipsis; } + + bdi, span.verified-icon { + display: inline-block; + } } } } diff --git a/app/styles/components/user-panel.scss b/app/styles/components/user-panel.scss index b0c6564557..cb44672304 100644 --- a/app/styles/components/user-panel.scss +++ b/app/styles/components/user-panel.scss @@ -4,12 +4,21 @@ width: 265px; flex-direction: column; + .user-panel__account__name { + display: inline; + } + + .verified-icon { + opacity: 1; + } + &, .user-panel__account__name, .user-panel__account__username { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + color: var(--primary-text-color--faint); } &__header { @@ -49,13 +58,13 @@ &__meta { display: block; padding: 6px 20px 17px; - opacity: 0.6; + // opacity: 0.6; } &__account { a { text-decoration: none; - color: var(--primary-text-color); + color: var(--primary-text-color--faint); } &__name { @@ -63,7 +72,7 @@ font-size: 20px; font-weight: bold; line-height: 24px; - color: var(--primary-text-color); + color: var(--primary-text-color--faint); } &:hover & { @@ -96,7 +105,7 @@ a { text-decoration: none; - color: var(--primary-text-color); + color: var(--primary-text-color--faint); &:hover { opacity: 0.8; @@ -106,7 +115,7 @@ &__value { display: block; width: 100%; - color: var(--primary-text-color); + color: var(--primary-text-color--faint); font-size: 20px; font-weight: 800; line-height: 24px; diff --git a/app/styles/forms.scss b/app/styles/forms.scss index 6cf1f5f0ff..96616c6ffb 100644 --- a/app/styles/forms.scss +++ b/app/styles/forms.scss @@ -342,6 +342,15 @@ code { } } + input[type=text][disabled], + input[type=number][disabled], + input[type=email][disabled], + input[type=password][disabled], + textarea { + color: var(--primary-text-color--faint); + border-color: var(--primary-text-color--faint); + } + .input.field_with_errors { label { color: lighten($error-red, 12%);