Use styled radio buttons for theme selection

This commit is contained in:
Jorik Schellekens 2020-06-08 18:17:02 +01:00
parent d6a532040e
commit a10e71edcf
6 changed files with 212 additions and 16 deletions

View file

@ -115,6 +115,7 @@
@import "./views/elements/_Slider.scss";
@import "./views/elements/_Spinner.scss";
@import "./views/elements/_StyledCheckbox.scss";
@import "./views/elements/_StyledRadioButton.scss";
@import "./views/elements/_SyntaxHighlight.scss";
@import "./views/elements/_TextWithTooltip.scss";
@import "./views/elements/_ToggleSwitch.scss";

View file

@ -0,0 +1,88 @@
/*
Copyright 2020 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
/**
* This component expects the parent to specify a positive padding and
* width
*/
.mx_RadioButton {
$radio-circle-color: $muted-fg-color;
$active-radio-circle-color: $accent-color;
// We need to make this element positioned
// so that the radio circle can be absolute
position: relative;
display: flex;
align-items: center;
flex-grow: 1;
> span {
flex-grow: 1;
display: flex;
justify-content: center;
}
> input[type=radio] {
// Remove the OS's representation
margin: 0;
padding: 0;
display: none;
+ div {
// Necessary to center the following span
position: absolute;
display: flex;
align-items: center;
justify-content: center;
box-sizing: border-box;
height: $font-16px;
width: $font-16px;
border: $font-1-5px solid $radio-circle-color;
border-radius: $font-16px;
> div {
box-sizing: border-box;
height: $font-8px;
width: $font-8px;
border-radius: $font-8px;
}
}
}
> input[type=radio]:checked {
+ div {
> div {
background: $radio-circle-color;
}
}
}
> input[type=radio]:disabled {
+ div {
> div {
display: none;
}
}
}
}

View file

@ -43,3 +43,58 @@ limitations under the License.
padding-left: 20px;
padding-right: 5px;
}
.mx_AppearanceUserSettingsTab_themeSection {
$radio-bg-color: $input-darker-bg-color;
> .mx_ThemeSelectors {
display: flex;
flex-direction: row;
margin-top: 23px;
> .mx_RadioButton {
padding: $font-16px;
border-radius: 10px;
background: rgba($radio-bg-color, 0.2);
width: 180px;
flex-shrink: 1;
flex-grow: 0;
margin-right: 15px;
}
> .mx_RadioButton:not([disabled]) {
// These need to be hardcoded because they don't change with the theme
&.mx_ThemeSelector_light {
background-color: #f3f8fd;
color: #2e2f32;
}
&.mx_ThemeSelector_dark {
background-color: #181b21;
> input > div {
border-color: $input-darker-bg-color;
> div {
border-color: $input-darker-bg-color;
}
}
}
&.mx_ThemeSelector_black {
background-color: #000000;
> input > div {
border-color: $input-darker-bg-color;
> div {
border-color: $input-darker-bg-color;
}
}
}
}
}
}
.mx_SettingsTab_customFontSizeField {
margin-left: calc($font-16px + 10px);
}