Memberlist modal strict styling

pull/1034/head
Vincent 5 years ago
parent e5390d54f4
commit 1fd0c8168f

@ -82,7 +82,7 @@
.error-faded { .error-faded {
opacity: 0; opacity: 0;
margin-top: -20px; margin-top: -5px;
transition: all 100ms linear; transition: all 100ms linear;
} }
@ -96,8 +96,6 @@
max-height: 240px; max-height: 240px;
overflow-y: auto; overflow-y: auto;
margin: 4px; margin: 4px;
border-top: 1px solid #2f2f2f;
border-bottom: 1px solid #2f2f2f;
.check-mark { .check-mark {
float: right; float: right;

@ -140,11 +140,11 @@ div.spacer-lg {
transition: filter 0.1s; transition: filter 0.1s;
} }
.text-subtle { .subtle {
opacity: 0.6; opacity: 0.6;
} }
.text-soft { .soft {
opacity: 0.4; opacity: 0.4;
} }
@ -848,6 +848,12 @@ label {
.friend-selection-list { .friend-selection-list {
width: unset; width: unset;
} }
.create-group-dialog__member-count {
text-align: center;
margin-top: -25px;
opacity: 0.6;
}
} }
.session-confirm { .session-confirm {
@ -1845,6 +1851,13 @@ input {
justify-content: space-between; justify-content: space-between;
transition: $session-transition-duration; transition: $session-transition-duration;
&:first-child {
border-top: 1px solid rgba($session-shade-8, 0.6);
}
&:last-child {
border-bottom: 1px solid rgba($session-shade-8, 0.6);
}
&.selected { &.selected {
background-color: $session-shade-4; background-color: $session-shade-4;
} }
@ -1874,7 +1887,7 @@ input {
} }
&__avatar > div { &__avatar > div {
margin-bottom: 0; margin-bottom: 0px !important;
} }
} }

@ -120,7 +120,7 @@ export class DevicePairingDialog extends React.Component<Props, State> {
<div className="device-pairing-dialog__secret-words"> <div className="device-pairing-dialog__secret-words">
<label>{window.i18n('secretWords')}</label> <label>{window.i18n('secretWords')}</label>
<div className="text-subtle">{secretWords}</div> <div className="subtle">{secretWords}</div>
</div> </div>
<div className="session-modal__button-group"> <div className="session-modal__button-group">
@ -148,7 +148,7 @@ export class DevicePairingDialog extends React.Component<Props, State> {
<div className="session-modal__centered"> <div className="session-modal__centered">
{this.renderErrors()} {this.renderErrors()}
<h4>{window.i18n('waitingForDeviceToRegister')}</h4> <h4>{window.i18n('waitingForDeviceToRegister')}</h4>
<small className="text-subtle"> <small className="subtle">
{window.i18n('pairNewDevicePrompt')} {window.i18n('pairNewDevicePrompt')}
</small> </small>
<div className="spacer-lg" /> <div className="spacer-lg" />
@ -199,7 +199,7 @@ export class DevicePairingDialog extends React.Component<Props, State> {
<p className="session-modal__description"> <p className="session-modal__description">
{window.i18n('confirmUnpairingTitle')} {window.i18n('confirmUnpairingTitle')}
<br /> <br />
<span className="text-subtle">{description}</span> <span className="subtle">{description}</span>
</p> </p>
<div className="spacer-xs" /> <div className="spacer-xs" />
<div className="session-modal__button-group"> <div className="session-modal__button-group">

@ -93,7 +93,7 @@ export class UpdateGroupMembersDialog extends React.Component<Props, State> {
noFriendsClasses = classNames('no-friends', 'hidden'); noFriendsClasses = classNames('no-friends', 'hidden');
} else { } else {
// private group // private group
titleText = `${this.props.titleText} (Members: ${checkMarkedCount})`; titleText = this.props.titleText;
noFriendsClasses = noFriendsClasses =
this.state.friendList.length === 0 this.state.friendList.length === 0
? 'no-friends' ? 'no-friends'
@ -114,6 +114,16 @@ export class UpdateGroupMembersDialog extends React.Component<Props, State> {
onOk={() => null} onOk={() => null}
> >
<div className="spacer-md" /> <div className="spacer-md" />
{!this.props.isPublic && (
<>
<small className="create-group-dialog__member-count">
{`${checkMarkedCount} members`}
</small>
<hr className="subtle"/>
</>
)}
<p className={errorMessageClasses}>{errorMsg}</p> <p className={errorMessageClasses}>{errorMsg}</p>
<div className="spacer-md" /> <div className="spacer-md" />
@ -124,7 +134,8 @@ export class UpdateGroupMembersDialog extends React.Component<Props, State> {
'noMembersInThisGroup' 'noMembersInThisGroup'
)})`}</p> )})`}</p>
<div className="spacer-md" /> <div className="spacer-lg" />
<div className="session-modal__button-group"> <div className="session-modal__button-group">
<SessionButton text={okText} onClick={this.onClickOK} /> <SessionButton text={okText} onClick={this.onClickOK} />

@ -48,7 +48,7 @@ export class SessionConfirm extends React.Component<Props> {
const messageSubText = messageSub const messageSubText = messageSub
? 'session-confirm-main-message' ? 'session-confirm-main-message'
: 'text-subtle'; : 'subtle';
return ( return (
<SessionModal <SessionModal
@ -63,7 +63,7 @@ export class SessionConfirm extends React.Component<Props> {
<div className="session-modal__centered"> <div className="session-modal__centered">
<span className={messageSubText}>{message}</span> <span className={messageSubText}>{message}</span>
{messageSub && ( {messageSub && (
<span className="session-confirm-sub-message text-subtle"> <span className="session-confirm-sub-message subtle">
{messageSub} {messageSub}
</span> </span>
)} )}

@ -240,7 +240,7 @@ export class SessionGroupSettings extends React.Component<Props, any> {
{showMemberCount && ( {showMemberCount && (
<> <>
<div className="spacer-lg" /> <div className="spacer-lg" />
<div role="button" className="text-subtle"> <div role="button" className="subtle">
{window.i18n('members', memberCount)} {window.i18n('members', memberCount)}
</div> </div>
<div className="spacer-lg" /> <div className="spacer-lg" />

@ -29,7 +29,7 @@ export class SessionQRModal extends React.Component<Props> {
> >
<div className="spacer-sm" /> <div className="spacer-sm" />
<div className="qr-dialog__description text-subtle"> <div className="qr-dialog__description subtle">
<SessionHtmlRenderer html={window.i18n('QRCodeDescription')} /> <SessionHtmlRenderer html={window.i18n('QRCodeDescription')} />
</div> </div>
<div className="spacer-lg" /> <div className="spacer-lg" />

@ -121,7 +121,7 @@ export class SessionSeedModal extends React.Component<Props, State> {
<p className="session-modal__description"> <p className="session-modal__description">
{i18n('seedSavePromptMain')} {i18n('seedSavePromptMain')}
<br /> <br />
<span className="text-subtle">{i18n('seedSavePromptAlt')}</span> <span className="subtle">{i18n('seedSavePromptAlt')}</span>
</p> </p>
<div className="spacer-xs" /> <div className="spacer-xs" />

Loading…
Cancel
Save