PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge branch 't3chguy/fix/17365' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365

Browse source
This commit is contained in:
Michael Telatynski 2021-05-28 13:05:41 +01:00
commit e41645795c
3 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
res/css/views/dialogs/_InviteDialog.scss
View file

@ -73,7 +73,7 @@ limitations under the License.
} }
.mx_InviteDialog_section { .mx_InviteDialog_section {
padding-bottom: 10px; padding-bottom: 4px;
h3 { h3 {
font-size: $font-12px; font-size: $font-12px;
@ -98,11 +98,25 @@ limitations under the License.
} }
} }
.mx_InviteDialog_section_hidden_suggestions_disclaimer {
padding: 8px 0 16px 0;
font-size: $font-14px;
> span {
color: $primary-fg-color;
font-weight: 600;
}
> p {
margin:0;
}
}
.mx_InviteDialog_footer { .mx_InviteDialog_footer {
border-top: 1px solid $input-border-color; border-top: 1px solid $input-border-color;
> h3 { > h3 {
margin: 8px 0; margin: 12px 0;
font-size: $font-12px; font-size: $font-12px;
color: $muted-fg-color; color: $muted-fg-color;
font-weight: bold; font-weight: bold;
@ -113,7 +127,7 @@ limitations under the License.
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
border-radius: 4px; border-radius: 4px;
border: solid 1px $input-border-color; border: solid 1px $light-fg-color;
padding: 8px; padding: 8px;
> a { > a {
@ -282,17 +296,21 @@ limitations under the License.
} }
.mx_InviteDialog_userSections { .mx_InviteDialog_userSections {
margin-top: 10px; margin-top: 4px;
overflow-y: auto; overflow-y: auto;
padding-right: 45px; padding: 0px 45px 4px 0px;
height: calc(100% - 190px); // mx_InviteDialog's height minus some for the upper elements height: calc(100% - 175px); // mx_InviteDialog's height minus some for the upper and lower elements
} }
// Right margin for the design. We could apply this to the whole dialog, but then the scrollbar // Right margin for the design. We could apply this to the whole dialog, but then the scrollbar
// for the user section gets weird. // for the user section gets weird.
.mx_InviteDialog_helpText,
.mx_InviteDialog_addressBar { .mx_InviteDialog_addressBar {
margin-right: 45px; margin: 8px 45px 0px 0px;
}
.mx_InviteDialog_helpText {
margin:0px;
} }
.mx_InviteDialog_helpText .mx_AccessibleButton_kind_link { .mx_InviteDialog_helpText .mx_AccessibleButton_kind_link {

4
src/components/views/dialogs/InviteDialog.tsx
View file

@ -1341,8 +1341,8 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
} }
buttonText = _t("Go"); buttonText = _t("Go");
goButtonFn = this._startDm; goButtonFn = this._startDm;
extraSection = <div className="mx_InviteDialog_section"> extraSection = <div className="mx_InviteDialog_section_hidden_suggestions_disclaimer">
<span>{ _t("Some results may be hidden for privacy.") }</span> <span>{ _t("Some suggestions may be hidden for privacy.") }</span>
<p>{ _t("If you can’t see who you’re looking for, send them your invite link below.") }</p> <p>{ _t("If you can’t see who you’re looking for, send them your invite link below.") }</p>
</div>; </div>;
const link = makeUserPermalink(MatrixClientPeg.get().getUserId()); const link = makeUserPermalink(MatrixClientPeg.get().getUserId());

2
src/i18n/strings/en_EN.json
View file

@ -2246,7 +2246,7 @@
"Start a conversation with someone using their name or username (like <userId/>).": "Start a conversation with someone using their name or username (like <userId/>).", "Start a conversation with someone using their name or username (like <userId/>).": "Start a conversation with someone using their name or username (like <userId/>).",
"This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>", "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>",
"Go": "Go", "Go": "Go",
"Some results may be hidden for privacy.": "Some results may be hidden for privacy.", "Some suggestions may be hidden for privacy.": "Some suggestions may be hidden for privacy.",
"If you can’t see who you’re looking for, send them your invite link below.": "If you can’t see who you’re looking for, send them your invite link below.", "If you can’t see who you’re looking for, send them your invite link below.": "If you can’t see who you’re looking for, send them your invite link below.",
"Or send invite link": "Or send invite link", "Or send invite link": "Or send invite link",
"Unnamed Space": "Unnamed Space", "Unnamed Space": "Unnamed Space",