diff --git a/res/css/_common.scss b/res/css/_common.scss index d7f8355d81a..2242658ae8c 100644 --- a/res/css/_common.scss +++ b/res/css/_common.scss @@ -27,6 +27,9 @@ $EventTile_e2e_state_indicator_width: 4px; $MessageTimestamp_width: 46px; /* 8 + 30 (avatar) + 8 */ $MessageTimestamp_width_hover: calc($MessageTimestamp_width - 2 * $EventTile_e2e_state_indicator_width); +$slider-dot-size: 1em; +$slider-selection-dot-size: 2.4em; + :root { font-size: 10px; diff --git a/res/css/views/elements/_Slider.scss b/res/css/views/elements/_Slider.scss index 58ba2813b4d..730da021bd0 100644 --- a/res/css/views/elements/_Slider.scss +++ b/res/css/views/elements/_Slider.scss @@ -54,22 +54,31 @@ limitations under the License. .mx_Slider_selectionDot { position: absolute; - width: 1.1em; - height: 1.1em; + width: $slider-selection-dot-size; + height: $slider-selection-dot-size; background-color: $slider-selection-color; border-radius: 50%; box-shadow: 0 0 6px lightgrey; z-index: 10; } +.mx_Slider_selectionText { + color: $muted-fg-color; + font-size: $font-14px; + position: relative; + text-align: center; + top: 30px; + width: 100%; +} + .mx_Slider_selection > hr { margin: 0; border: 0.2em solid $slider-selection-color; } .mx_Slider_dot { - height: 1em; - width: 1em; + height: $slider-dot-size; + width: $slider-dot-size; border-radius: 50%; background-color: $slider-background-color; z-index: 0; diff --git a/res/css/views/settings/_FontScalingPanel.scss b/res/css/views/settings/_FontScalingPanel.scss index bac1f92a4f5..ff2e9053208 100644 --- a/res/css/views/settings/_FontScalingPanel.scss +++ b/res/css/views/settings/_FontScalingPanel.scss @@ -34,7 +34,7 @@ limitations under the License. display: flex; flex-direction: row; align-items: center; - padding: 15px; + padding: 15px 15px 35px; background: rgba($appearance-tab-border-color, 0.2); border-radius: 10px; font-size: 10px; diff --git a/src/components/views/elements/Slider.tsx b/src/components/views/elements/Slider.tsx index df5776648e2..a201659e3c0 100644 --- a/src/components/views/elements/Slider.tsx +++ b/src/components/views/elements/Slider.tsx @@ -86,7 +86,9 @@ export default class Slider extends React.Component { if (!this.props.disabled) { const offset = this.offset(this.props.values, this.props.value); selection =
-
+
+
{ this.props.value }
+

; } diff --git a/test/components/views/settings/__snapshots__/FontScalingPanel-test.tsx.snap b/test/components/views/settings/__snapshots__/FontScalingPanel-test.tsx.snap index 2174b4f2893..86163ab762f 100644 --- a/test/components/views/settings/__snapshots__/FontScalingPanel-test.tsx.snap +++ b/test/components/views/settings/__snapshots__/FontScalingPanel-test.tsx.snap @@ -83,10 +83,16 @@ exports[`FontScalingPanel renders the font scaling UI 1`] = ` className="mx_Slider_selectionDot" style={ Object { - "left": "calc(-0.55em + 50%)", + "left": "calc(-1.195em + 50%)", } } - /> + > +
+ 15 +
+