imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials

Browse source
This commit is contained in:
Michael Telatynski 2020-12-02 15:08:13 +00:00
commit 3fda7e3f46
27 changed files with 1822 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

2
res/css/views/voip/_CallView.scss
View file

@ -17,7 +17,7 @@ limitations under the License.
.mx_CallView {
border-radius: 10px;
background-color: $input-lighter-bg-color;
background-color: $voipcall-plinth-color;
padding-left: 8px;
padding-right: 8px;
// XXX: CallContainer sets pointer-events: none - should probably be set back in a better place

3
res/themes/dark/css/_dark.scss
View file

@ -108,6 +108,9 @@ $eventtile-meta-color: $roomtopic-color;
$header-divider-color: $header-panel-text-primary-color;
$composer-e2e-icon-color: $header-panel-text-primary-color;
// this probably shouldn't have it's own colour
$voipcall-plinth-color: #21262c;
// ********************
$theme-button-bg-color: #e3e8f0;

3
res/themes/legacy-dark/css/_legacy-dark.scss
View file

@ -105,6 +105,9 @@ $eventtile-meta-color: $roomtopic-color;
$header-divider-color: $header-panel-text-primary-color;
$composer-e2e-icon-color: $header-panel-text-primary-color;
// this probably shouldn't have it's own colour
$voipcall-plinth-color: #f2f5f8;
// ********************
$theme-button-bg-color: #e3e8f0;

3
res/themes/legacy-light/css/_legacy-light.scss
View file

@ -172,6 +172,9 @@ $eventtile-meta-color: $roomtopic-color;
$composer-e2e-icon-color: #91a1c0;
$header-divider-color: #91a1c0;
// this probably shouldn't have it's own colour
$voipcall-plinth-color: #f2f5f8;
// ********************
$theme-button-bg-color: #e3e8f0;

3
res/themes/light/css/_light.scss
View file

@ -166,6 +166,9 @@ $eventtile-meta-color: $roomtopic-color;
$composer-e2e-icon-color: #91A1C0;
$header-divider-color: #91A1C0;
// this probably shouldn't have it's own colour
$voipcall-plinth-color: #f2f5f8;
// ********************
$theme-button-bg-color: #e3e8f0;