bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'user-verification' into 'develop'

Browse source 
Display user verification icon

See merge request soapbox-pub/soapbox-fe!128
This commit is contained in:
Alex Gleason 2020-08-07 23:23:11 +00:00
commit 4ee0fa8160
8 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/soapbox/components/display_name.js
View file

Binary file not shown.

BIN
app/soapbox/features/edit_profile/components/profile_preview.js
View file

Binary file not shown.

BIN
app/soapbox/features/edit_profile/index.js
View file

Binary file not shown.

BIN
app/soapbox/features/ui/components/profile_info_panel.js
View file

Binary file not shown.

BIN
app/soapbox/features/ui/components/user_panel.js
View file

Binary file not shown.

4
app/styles/accounts.scss
View file

@ -92,6 +92,10 @@
overflow: hidden;
text-overflow: ellipsis;
}
bdi, span.verified-icon {
display: inline-block;
}
}
}
}

19
app/styles/components/user-panel.scss
View file

@ -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;

9
app/styles/forms.scss
View file

@ -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%);