From 736aa8297daa68908269274dd782e01389dcc5ac Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 23 Jan 2019 18:49:27 -0700 Subject: [PATCH] Minor CSS adjustments --- res/css/views/elements/_AccessibleButton.scss | 8 ++++---- res/css/views/settings/_EmailAddresses.scss | 2 ++ res/css/views/settings/_PhoneNumbers.scss | 2 ++ res/css/views/settings/tabs/_SettingsTab.scss | 2 +- res/themes/dharma/css/_dharma.scss | 1 - res/themes/light/css/_base.scss | 1 - 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/res/css/views/elements/_AccessibleButton.scss b/res/css/views/elements/_AccessibleButton.scss index 27c3a152ba..a6e884e170 100644 --- a/res/css/views/elements/_AccessibleButton.scss +++ b/res/css/views/elements/_AccessibleButton.scss @@ -43,8 +43,8 @@ limitations under the License. background-color: $button-primary-disabled-bg-color; } -.mx_AccessibleButton_kind_primary_sm { - padding: 5px 12px !important; +.mx_AccessibleButton_hasKind.mx_AccessibleButton_kind_primary_sm { + padding: 5px 12px; color: $button-primary-fg-color; background-color: $button-primary-bg-color; } @@ -64,8 +64,8 @@ limitations under the License. background-color: $button-danger-disabled-bg-color; } -.mx_AccessibleButton_kind_danger_sm { - padding: 5px 12px !important; +.mx_AccessibleButton_hasKind.mx_AccessibleButton_kind_danger_sm { + padding: 5px 12px; color: $button-danger-fg-color; background-color: $button-danger-bg-color; } diff --git a/res/css/views/settings/_EmailAddresses.scss b/res/css/views/settings/_EmailAddresses.scss index 1b61d2a9b5..635ef4768f 100644 --- a/res/css/views/settings/_EmailAddresses.scss +++ b/res/css/views/settings/_EmailAddresses.scss @@ -37,5 +37,7 @@ limitations under the License. } .mx_EmailAddresses_new .mx_Field input { + // Use 100% of the space available for the input, but don't let the 10px + // padding on either side of the input to push it out of alignment. width: calc(100% - 20px); } diff --git a/res/css/views/settings/_PhoneNumbers.scss b/res/css/views/settings/_PhoneNumbers.scss index 2700798519..50aeb5cf8b 100644 --- a/res/css/views/settings/_PhoneNumbers.scss +++ b/res/css/views/settings/_PhoneNumbers.scss @@ -37,6 +37,8 @@ limitations under the License. } .mx_PhoneNumbers_new .mx_Field input { + // Use 100% of the space available for the input, but don't let the 10px + // padding on either side of the input to push it out of alignment. width: calc(100% - 20px); } diff --git a/res/css/views/settings/tabs/_SettingsTab.scss b/res/css/views/settings/tabs/_SettingsTab.scss index 2048aa6976..f03c8b8bd0 100644 --- a/res/css/views/settings/tabs/_SettingsTab.scss +++ b/res/css/views/settings/tabs/_SettingsTab.scss @@ -47,7 +47,7 @@ limitations under the License. vertical-align: bottom; display: inline-block; font-size: 12px; - color: $settings-label-fg-color; + color: $primary-fg-color; } .mx_SettingsTab_section .mx_SettingsFlag .mx_ToggleSwitch { diff --git a/res/themes/dharma/css/_dharma.scss b/res/themes/dharma/css/_dharma.scss index 0311322dfd..476b265699 100644 --- a/res/themes/dharma/css/_dharma.scss +++ b/res/themes/dharma/css/_dharma.scss @@ -126,7 +126,6 @@ $settings-profile-overlay-placeholder-bg-color: transparent; $settings-profile-overlay-fg-color: #fff; $settings-profile-overlay-placeholder-fg-color: #454545; $settings-subsection-fg-color: #61708b; -$settings-label-fg-color: #454545; $voip-decline-color: #f48080; $voip-accept-color: #80f480; diff --git a/res/themes/light/css/_base.scss b/res/themes/light/css/_base.scss index c70f7b1a88..c5029c64b5 100644 --- a/res/themes/light/css/_base.scss +++ b/res/themes/light/css/_base.scss @@ -119,7 +119,6 @@ $settings-profile-overlay-placeholder-bg-color: transparent; $settings-profile-overlay-fg-color: #fff; $settings-profile-overlay-placeholder-fg-color: #454545; $settings-subsection-fg-color: #61708b; -$settings-label-fg-color: #454545; $voip-decline-color: #f48080; $voip-accept-color: #80f480;