OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Use a variable to ensure the margin declaration is applied to components on mx_SettingsTab only (#8877)

t3chguy/dedup-icons-17oct
Suguru Hirahara 2022-06-25 18:06:08 +00:00 committed by GitHub
parent b391a20434
commit 173d8f33b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/css/_common.scss
View File

@ -701,10 +701,6 @@ legend {
}
}
@define-mixin mx_Settings_fullWidthField {
margin-right: 100px;
}
@define-mixin ProgressBarColour $colour {
color: $colour;
&::-moz-progress-bar {

2
res/css/views/settings/_FontScalingPanel.scss
View File

@ -19,7 +19,7 @@ limitations under the License.
.mx_FontScalingPanel_preview,
.mx_FontScalingPanel_fontSlider {
@mixin mx_Settings_fullWidthField;
margin-inline-end: var(--SettingsTab_fullWidthField-margin-inline-end);
}
.mx_FontScalingPanel_preview {

2
res/css/views/settings/_ProfileSettings.scss
View File

@ -15,7 +15,7 @@ limitations under the License.
*/
.mx_ProfileSettings {
@mixin mx_Settings_fullWidthField;
margin-inline-end: var(--SettingsTab_fullWidthField-margin-inline-end);
border-bottom: 1px solid $quinary-content;
.mx_ProfileSettings_avatarUpload {

2
res/css/views/settings/_SetIdServer.scss
View File

@ -15,7 +15,7 @@ limitations under the License.
*/
.mx_SetIdServer .mx_Field_input {
@mixin mx_Settings_fullWidthField;
margin-inline-end: var(--SettingsTab_fullWidthField-margin-inline-end);
}
.mx_SetIdServer_tooltip {

2
res/css/views/settings/_SpellCheckLanguages.scss
View File

@ -31,5 +31,5 @@ limitations under the License.
}
.mx_SpellCheckLanguages {
@mixin mx_Settings_fullWidthField;
margin-inline-end: var(--SettingsTab_fullWidthField-margin-inline-end);
}

1
res/css/views/settings/tabs/_SettingsTab.scss
View File

@ -16,6 +16,7 @@ limitations under the License.
.mx_SettingsTab {
--SettingsTab_section-margin-bottom-preferences-labs: 30px;
--SettingsTab_fullWidthField-margin-inline-end: 100px;
--SettingsTab_tooltip-max-width: 120px; // So it fits in the space provided by the page
color: $primary-content;

4
res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss
View File

@ -15,7 +15,7 @@ limitations under the License.
*/
.mx_GeneralUserSettingsTab_changePassword .mx_Field {
@mixin mx_Settings_fullWidthField;
margin-inline-end: var(--SettingsTab_fullWidthField-margin-inline-end);
}
.mx_GeneralUserSettingsTab_changePassword .mx_Field:first-child {
@ -40,7 +40,7 @@ limitations under the License.
.mx_GeneralUserSettingsTab_discovery .mx_ExistingEmailAddress,
.mx_GeneralUserSettingsTab_discovery .mx_ExistingPhoneNumber,
.mx_GeneralUserSettingsTab_languageInput {
@mixin mx_Settings_fullWidthField;
margin-inline-end: var(--SettingsTab_fullWidthField-margin-inline-end);
}
.mx_GeneralUserSettingsTab_warningIcon {

2
res/css/views/settings/tabs/user/_MjolnirUserSettingsTab.scss
View File

@ -15,7 +15,7 @@ limitations under the License.
*/
.mx_MjolnirUserSettingsTab .mx_Field {
@mixin mx_Settings_fullWidthField;
margin-inline-end: var(--SettingsTab_fullWidthField-margin-inline-end);
}
.mx_MjolnirUserSettingsTab_listItem {

2
res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
View File

@ -16,7 +16,7 @@ limitations under the License.
.mx_PreferencesUserSettingsTab {
.mx_Field {
@mixin mx_Settings_fullWidthField;
margin-inline-end: var(--SettingsTab_fullWidthField-margin-inline-end);
}
.mx_SettingsTab_section {

2
res/css/views/settings/tabs/user/_VoiceUserSettingsTab.scss
View File

@ -15,7 +15,7 @@ limitations under the License.
*/
.mx_VoiceUserSettingsTab .mx_Field {
@mixin mx_Settings_fullWidthField;
margin-inline-end: var(--SettingsTab_fullWidthField-margin-inline-end);
}
.mx_VoiceUserSettingsTab_missingMediaPermissions {