sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Merge remote-tracking branch 'upstream/develop' into feature/image-view-load-anim/18186

Browse Source 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner
2021-09-11 15:32:44 +02:00
parent 91a11b6997 ac0ba2d597
commit 1a128c3a00
567 changed files with 23292 additions and 9067 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/css/_common.scss
+15 -15
View File
@@ -18,6 +18,7 @@ limitations under the License.
@import "./_font-sizes.scss";
@import "./_font-weights.scss";
@import "./_animations.scss";
$hover-transition: 0.08s cubic-bezier(.46, .03, .52, .96); // quadratic
@@ -52,8 +53,8 @@ html {
body {
font-family: $font-family;
font-size: $font-15px;
background-color: $primary-bg-color;
color: $primary-fg-color;
background-color: $background;
color: $primary-content;
border: 0px;
margin: 0px;
@@ -88,7 +89,7 @@ b {
}
h2 {
color: $primary-fg-color;
color: $primary-content;
font-weight: 400;
font-size: $font-18px;
margin-top: 16px;
@@ -104,8 +105,8 @@ a:visited {
input[type=text],
input[type=search],
input[type=password] {
font-family: inherit;
padding: 9px;
font-family: $font-family;
font-size: $font-14px;
font-weight: 600;
min-width: 0;
@@ -141,13 +142,12 @@ textarea::placeholder {
input[type=text], input[type=password], textarea {
background-color: transparent;
color: $primary-fg-color;
color: $primary-content;
}
/* Required by Firefox */
textarea {
font-family: $font-family;
color: $primary-fg-color;
color: $primary-content;
}
input[type=text]:focus, input[type=password]:focus, textarea:focus {
@@ -168,12 +168,12 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
// it has the appearance of a text box so the controls
// appear to be part of the input
.mx_Dialog, .mx_MatrixChat {
.mx_Dialog, .mx_MatrixChat_wrapper {
.mx_textinput > input[type=text],
.mx_textinput > input[type=search] {
border: none;
flex: 1;
color: $primary-fg-color;
color: $primary-content;
}
:not(.mx_textinput):not(.mx_Field):not(.mx_no_textinput) > input[type=text],
@@ -184,7 +184,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
background-color: transparent;
color: $input-darker-fg-color;
border-radius: 4px;
border: 1px solid rgba($primary-fg-color, .1);
border: 1px solid rgba($primary-content, .1);
// these things should probably not be defined globally
margin: 9px;
}
@@ -209,7 +209,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
:not(.mx_textinput):not(.mx_Field):not(.mx_no_textinput) > input[type=search],
.mx_textinput {
color: $input-darker-fg-color;
background-color: $primary-bg-color;
background-color: $background;
border: none;
}
}
@@ -271,7 +271,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
}
.mx_Dialog {
background-color: $primary-bg-color;
background-color: $background;
color: $light-fg-color;
z-index: 4012;
font-weight: 300;
@@ -390,7 +390,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
.mx_Dialog_content {
margin: 24px 0 68px;
font-size: $font-14px;
color: $primary-fg-color;
color: $primary-content;
word-wrap: break-word;
}
@@ -499,8 +499,8 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
border-radius: 3px;
border: 1px solid $input-border-color;
padding: 9px;
color: $primary-fg-color;
background-color: $primary-bg-color;
color: $primary-content;
background-color: $background;
}
.mx_textButton {