Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Fix VoIP PIP frame color #5701

Merged
merged 7 commits into from
Apr 27, 2021
Merged

Fix VoIP PIP frame color #5701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9ffef8f
Fix VoIP PIP frame color
SimonBrandner Mar 1, 2021
d757b7d
Merge branch 'develop' into fix-pip-color
SimonBrandner Apr 23, 2021
7b215cd
Use suggested colors
SimonBrandner Apr 23, 2021
ec908bc
Merge branch 'develop' into fix-pip-color
SimonBrandner Apr 23, 2021
2d17ba4
Increase drop shadow alpha to 0.45
SimonBrandner Apr 23, 2021
cf21658
Use suggested box-shadow
SimonBrandner Apr 23, 2021
9b2eb8e
Set box-shadow opacity to 20%
SimonBrandner Apr 27, 2021
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
5 changes: 3 additions & 2 deletions res/css/views/voip/_CallView.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.

.mx_CallView {
border-radius: 8px;
background-color: $voipcall-plinth-color;
background-color: $dark-panel-bg-color;
padding-left: 8px;
padding-right: 8px;
// XXX: CallContainer sets pointer-events: none - should probably be set back in a better place
Expand All @@ -40,7 +40,8 @@ limitations under the License.
width: 320px;
padding-bottom: 8px;
margin-top: 10px;
box-shadow: 0px 14px 24px rgba(0, 0, 0, 0.08);
background-color: $voipcall-plinth-color;
box-shadow: 0px 4px 20px rgba(0, 0, 0, 0.20);
border-radius: 8px;

.mx_CallView_voice {
Expand Down
2 changes: 1 addition & 1 deletion res/themes/dark/css/_dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ $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;
$voipcall-plinth-color: #394049;

// ********************

Expand Down
2 changes: 1 addition & 1 deletion res/themes/legacy-dark/css/_legacy-dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ $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;
$voipcall-plinth-color: #394049;

// ********************

Expand Down
2 changes: 1 addition & 1 deletion res/themes/legacy-light/css/_legacy-light.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ $composer-e2e-icon-color: #91a1c0;
$header-divider-color: #91a1c0;

// this probably shouldn't have it's own colour
$voipcall-plinth-color: #f2f5f8;
$voipcall-plinth-color: #F4F6FA;

// ********************

Expand Down
2 changes: 1 addition & 1 deletion res/themes/light/css/_light.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ $composer-e2e-icon-color: #91A1C0;
$header-divider-color: #91A1C0;

// this probably shouldn't have it's own colour
$voipcall-plinth-color: #f2f5f8;
$voipcall-plinth-color: #F4F6FA;

// ********************

Expand Down