Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Style changes for scale setting #5931

Closed
wants to merge 4 commits into from
Closed

Style changes for scale setting #5931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da27892
Scale setting required styles to allow scalable UI
monokh Jan 6, 2018
655f7cb
SettingsSlider styles
monokh Jan 7, 2018
69f26a5
Scale setting: make room view scalable for chat font scale
monokh Jan 7, 2018
d38f0fa
Settings panel use available space
monokh Jan 7, 2018
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
2 changes: 1 addition & 1 deletion postcss.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
module.exports = {
plugins: [
require("postcss-import")(),
require("postcss-mixins")(),
require("autoprefixer")(),
require("postcss-simple-vars")(),
require("postcss-extend")(),
require("postcss-nested")(),
require("postcss-mixins")(),
require("postcss-strip-inline-comments")(),
],
"parser": "postcss-scss",
Expand Down
1 change: 1 addition & 0 deletions src/skins/vector/css/_components.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
@import "./matrix-react-sdk/views/elements/_EditableItemList.scss";
@import "./matrix-react-sdk/views/elements/_MemberEventListSummary.scss";
@import "./matrix-react-sdk/views/elements/_ProgressBar.scss";
@import "./matrix-react-sdk/views/elements/_SettingsSlider.scss";
@import "./matrix-react-sdk/views/elements/_RichText.scss";
@import "./matrix-react-sdk/views/elements/_RoleButton.scss";
@import "./matrix-react-sdk/views/elements/_ToolTipButton.scss";
Expand Down
6 changes: 4 additions & 2 deletions src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ limitations under the License.
flex: 0 0 70px;
}

.mx_UserSettings .mx_RoomHeader .mx_RoomHeader_simpleHeader {
margin-left: 0;
}

.mx_UserSettings_body {
order: 2;

Expand All @@ -42,7 +46,6 @@ limitations under the License.

.mx_UserSettings h3 {
clear: both;
margin-left: 63px;
text-transform: uppercase;
color: $h3-color;
font-weight: 600;
Expand Down Expand Up @@ -78,7 +81,6 @@ limitations under the License.
}

.mx_UserSettings_section {
margin-left: 63px;
margin-top: 28px;
margin-bottom: 28px;
}
Expand Down
129 changes: 129 additions & 0 deletions src/skins/vector/css/matrix-react-sdk/views/elements/_SettingsSlider.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
// Styling Cross-Browser Compatible Range Inputs with Sass
// *Modified to work with postcss*
// Github: https://github.com/darlanrod/input-range-sass
// Author: Darlan Rod https://github.com/darlanrod
// Version 1.4.1
// MIT License

$track-color: #eceff1;
$thumb-color: $accent-color;

$thumb-radius: 12px;
$thumb-height: 24px;
$thumb-width: 24px;
$thumb-shadow-size: 4px;
$thumb-shadow-blur: 4px;
$thumb-shadow-color: $accent-fg-color;
$thumb-border-width: 2px;
$thumb-border-color: $accent-color;

$track-width: 100%;
$track-height: 8px;
$track-shadow-size: 1px;
$track-shadow-blur: 1px;
$track-shadow-color: rgba(0, 0, 0, .2);
$track-border-width: 2px;
$track-border-color: #cfd8dc;

$track-radius: 5px;
$contrast: 5%;

@define-mixin shadow $shadow-size, $shadow-blur, $shadow-color {
box-shadow: $shadow-size $shadow-size $shadow-blur $shadow-color, 0 0 $shadow-size lighten($shadow-color, 5%);
}

@define-mixin track {
cursor: pointer;
height: $track-height;
transition: all .2s ease;
width: $track-width;
}

@define-mixin thumb {
@mixin shadow $thumb-shadow-size, $thumb-shadow-blur, $thumb-shadow-color;
background: $thumb-color;
border: $thumb-border-width solid $thumb-border-color;
border-radius: $thumb-radius;
cursor: pointer;
height: $thumb-height;
width: $thumb-width;
}

.mx_SettingsSlider_label {
text-align: center;
}

.mx_SettingsSlider input[type='range'] {
-webkit-appearance: none;
margin: calc($thumb-height / 2) 0;
width: $track-width;

&:focus {
outline: 0;

&::-webkit-slider-runnable-track {
background: lighten($track-color, $contrast);
}

&::-ms-fill-lower {
background: $track-color;
}

&::-ms-fill-upper {
background: lighten($track-color, $contrast);
}
}

&::-webkit-slider-runnable-track {
@mixin track;
@mixin shadow $track-shadow-size, $track-shadow-blur, $track-shadow-color;
background: $track-color;
border: $track-border-width solid $track-border-color;
border-radius: $track-radius;
}

&::-webkit-slider-thumb {
@mixin thumb;
-webkit-appearance: none;
margin-top: calc(((-$track-border-width * 2 + $track-height) / 2) - ($thumb-height / 2));
}

&::-moz-range-track {
@mixin track;
@mixin shadow $track-shadow-size, $track-shadow-blur, $track-shadow-color;
background: $track-color;
border: $track-border-width solid $track-border-color;
border-radius: $track-radius;
}

&::-moz-range-thumb {
@mixin thumb;
}

&::-ms-track {
@mixin track;
background: transparent;
border-color: transparent;
border-width: calc($thumb-height / 2) 0;
color: transparent;
}

&::-ms-fill-lower {
@mixin shadow $track-shadow-size, $track-shadow-blur, $track-shadow-color;
background: darken($track-color, $contrast);
border: $track-border-width solid $track-border-color;
border-radius: calc($track-radius * 2);
}

&::-ms-fill-upper {
@mixin shadow $track-shadow-size, $track-shadow-blur, $track-shadow-color;
background: $track-color;
border: $track-border-width solid $track-border-color;
border-radius: calc($track-radius * 2);
}

&::-ms-thumb {
@mixin thumb;
margin-top: 0;
}
}
24 changes: 12 additions & 12 deletions src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ limitations under the License.
max-width: 100%;
clear: both;
padding-top: 18px;
font-size: 14px;
font-size: 0.875em;
position: relative;
}

Expand All @@ -45,15 +45,15 @@ limitations under the License.

.mx_EventTile .mx_SenderProfile {
color: $primary-fg-color;
font-size: 14px;
font-size: 0.875em;
display: block; /* anti-zalgo, with overflow hidden */
overflow-y: hidden;
cursor: pointer;
padding-left: 65px; /* left gutter */
padding-bottom: 0px;
padding-top: 0px;
margin: 0px;
line-height: 22px;
line-height: 1.375em;
}

.mx_EventTile .mx_SenderProfile .mx_SenderProfile_name,
Expand All @@ -77,7 +77,7 @@ limitations under the License.
visibility: hidden;
white-space: nowrap;
color: $event-timestamp-color;
font-size: 10px;
font-size: 0.625em;
left: 0px;
width: 46px; /* 8 + 30 (avatar) + 8 */
text-align: center;
Expand All @@ -93,7 +93,7 @@ limitations under the License.
padding-bottom: 2px;
border-radius: 4px;
min-height: 24px;
line-height: 22px;
line-height: 1.375em;
}

.mx_EventTile_info .mx_EventTile_line {
Expand All @@ -102,8 +102,8 @@ limitations under the License.

/* HACK to override line-height which is already marked important elsewhere */
.mx_EventTile_bigEmoji.mx_EventTile_bigEmoji {
font-size: 48px ! important;
line-height: 48px ! important;
font-size: 3em ! important;
line-height: 3em ! important;
}

/* this is used for the tile for the event which is selected via the URL.
Expand Down Expand Up @@ -257,7 +257,7 @@ limitations under the License.

.mx_EventTile_readAvatarRemainder {
color: $event-timestamp-color;
font-size: 11px;
font-size: 0.688em;
position: absolute;
}

Expand Down Expand Up @@ -337,7 +337,7 @@ limitations under the License.
white-space: normal ! important;
line-height: inherit ! important;
color: inherit; // inherit the colour from the dark or light theme by default (but not for code blocks)
font-size: 14px;
font-size: 0.875em;
}

/* have to use overlay rather than auto otherwise Linux and Windows
Expand Down Expand Up @@ -419,17 +419,17 @@ limitations under the License.
.mx_EventTile.mx_EventTile_info {
// same as the padding for non-compact .mx_EventTile.mx_EventTile_info
padding-top: 0px;
font-size: 13px;
font-size: 0.813em;
.mx_EventTile_line {
line-height: 20px;
line-height: 1.250em;
}
.mx_EventTile_avatar {
top: 4px;
}
}

.mx_EventTile .mx_SenderProfile {
font-size: 13px;
font-size: 0.813em;
}

.mx_EventTile.mx_EventTile_emote {
Expand Down
4 changes: 2 additions & 2 deletions src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ limitations under the License.
min-height: 60px;
justify-content: center;
align-items: flex-start;
font-size: 14px;
font-size: 0.875em;
margin-right: 6px;
}

Expand Down Expand Up @@ -196,7 +196,7 @@ limitations under the License.

flex-direction: row;
align-items: center;
font-size: 10px;
font-size: 0.625em;
color: $greyed-fg-color;
}

Expand Down