Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Touch up settings: alignment, spacing, error states #3330

Merged
merged 2 commits into from
Aug 20, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion res/css/_common.scss
Original file line number Diff line number Diff line change
@@ -561,5 +561,10 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
}

@define-mixin mx_Settings_fullWidthField {
margin-right: 200px;
margin-right: 100px;
}

@define-mixin mx_Settings_tooltip {
// So it fits in the space provided by the page
max-width: 120px;
}
4 changes: 0 additions & 4 deletions res/css/views/settings/_ProfileSettings.scss
Original file line number Diff line number Diff line change
@@ -26,10 +26,6 @@ limitations under the License.
height: 4em;
}

.mx_ProfileSettings_controls .mx_Field {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed because it was added space on top of the spacing already in place. Did not serve a useful purpose here.

margin-right: 100px;
}

.mx_ProfileSettings_controls .mx_Field:first-child {
margin-top: 0;
}
4 changes: 4 additions & 0 deletions res/css/views/settings/_SetIdServer.scss
Original file line number Diff line number Diff line change
@@ -17,3 +17,7 @@ limitations under the License.
.mx_SetIdServer .mx_Field_input {
@mixin mx_Settings_fullWidthField;
}

.mx_SetIdServer_tooltip {
@mixin mx_Settings_tooltip;
}
4 changes: 4 additions & 0 deletions res/css/views/settings/_SetIntegrationManager.scss
Original file line number Diff line number Diff line change
@@ -31,3 +31,7 @@ limitations under the License.
display: inline-block;
padding-left: 5px;
}

.mx_SetIntegrationManager_tooltip {
@mixin mx_Settings_tooltip;
}
11 changes: 0 additions & 11 deletions res/css/views/settings/tabs/_SettingsTab.scss
Original file line number Diff line number Diff line change
@@ -70,17 +70,6 @@ limitations under the License.
word-break: break-all;
}

.mx_SettingsTab .mx_SettingsTab_subheading:nth-child(n + 2) {
// TODO: This `nth-child(n + 2)` isn't working very well since many sections
// add intermediate elements (mostly because our version of React requires
// them) which throws off the numbering and results in many subheading
// missing margins.
// See also https://github.com/vector-im/riot-web/issues/10554
// These views have a lot of the same repetitive information on it, so
// give them more visual distinction between the sections.
margin-top: 25px;
}

.mx_SettingsTab a {
color: $accent-color-alt;
}
6 changes: 5 additions & 1 deletion src/components/views/elements/Field.js
Original file line number Diff line number Diff line change
@@ -51,6 +51,9 @@ export default class Field extends React.PureComponent {
// If specified, contents will appear as a tooltip on the element and
// validation feedback tooltips will be suppressed.
tooltipContent: PropTypes.node,
// If specified alongside tooltipContent, the class name to apply to the
// tooltip itself.
tooltipClassName: PropTypes.string,
// All other props pass through to the <input>.
};

@@ -177,8 +180,9 @@ export default class Field extends React.PureComponent {
const Tooltip = sdk.getComponent("elements.Tooltip");
let fieldTooltip;
if (tooltipContent || this.state.feedback) {
const addlClassName = this.props.tooltipClassName ? this.props.tooltipClassName : '';
fieldTooltip = <Tooltip
tooltipClassName="mx_Field_tooltip"
tooltipClassName={`mx_Field_tooltip ${addlClassName}`}
visible={this.state.feedbackVisible}
label={tooltipContent || this.state.feedback}
/>;
5 changes: 4 additions & 1 deletion src/components/views/settings/SetIdServer.js
Original file line number Diff line number Diff line change
@@ -319,7 +319,7 @@ export default class SetIdServer extends React.Component {
"won't be discoverable by other users and you won't be " +
"able to invite others by email or phone.",
)}</span>
<AccessibleButton onClick={this._onDisconnectClicked} kind="danger">
<AccessibleButton onClick={this._onDisconnectClicked} kind="danger_sm">
{discoButtonContent}
</AccessibleButton>
</div>;
@@ -341,6 +341,9 @@ export default class SetIdServer extends React.Component {
value={this.state.idServer}
onChange={this._onIdentityServerChanged}
tooltipContent={this._getTooltip()}
tooltipClassName="mx_SetIdServer_tooltip"
disabled={this.state.busy}
flagInvalid={!!this.state.error}
/>
<AccessibleButton type="submit" kind="primary_sm"
onClick={this._checkIdServer}
1 change: 1 addition & 0 deletions src/components/views/settings/SetIntegrationManager.js
Original file line number Diff line number Diff line change
@@ -196,6 +196,7 @@ export default class SetIntegrationManager extends React.Component {
autoComplete="off"
onChange={this._onUrlChanged}
tooltipContent={this._getTooltip()}
tooltipClassName="mx_SetIntegrationManager_tooltip"
disabled={this.state.busy}
flagInvalid={!!this.state.error}
/>