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

Normalize call buttons #8129

Merged
merged 6 commits into from
Apr 4, 2022
Merged

Normalize call buttons #8129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4e18b54
Normalize call buttons
luixxiul Mar 23, 2022
d7d2237
Merge branch 'develop' into CallButtons
luixxiul Mar 28, 2022
1a89a3a
Merge branch 'develop' into CallButtons
luixxiul Mar 29, 2022
4bfdaaa
Merge branch 'develop' into CallButtons
luixxiul Mar 30, 2022
6ecb98a
Merge branch 'develop' into CallButtons
luixxiul Apr 1, 2022
df31a2f
Merge branch 'develop' into CallButtons
luixxiul Apr 2, 2022
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
22 changes: 22 additions & 0 deletions res/css/_common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,3 +670,25 @@ legend {
line-height: inherit;
cursor: pointer;
}

@define-mixin CallButton {
box-sizing: border-box;
font-weight: 600;
height: $font-24px;
line-height: $font-24px;
margin-right: 0;

span {
display: flex;
align-items: center;

&::before {
content: '';
display: inline-block;
background-color: $button-fg-color;
mask-position: center;
mask-repeat: no-repeat;
margin-right: 8px;
}
}
}
30 changes: 9 additions & 21 deletions res/css/views/messages/_CallEvent.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,30 +147,18 @@ limitations under the License.
align-items: center;
color: $secondary-content;
margin-right: 16px;
gap: 8px;
gap: 12px; // See mx_IncomingCallToast_buttons
min-width: max-content;

.mx_CallEvent_content_button {
padding: 0px 12px;

span {
padding: 1px 0;
display: flex;
align-items: center;

&::before {
content: '';
display: inline-block;
background-color: $button-fg-color;
mask-position: center;
mask-repeat: no-repeat;
mask-size: 16px;
width: 16px;
height: 16px;
margin-right: 8px;

flex-shrink: 0;
}
@mixin CallButton;
padding: 0 12px;

span::before {
mask-size: 16px;
width: 16px;
height: 16px;
flex-shrink: 0;
}
}

Expand Down
15 changes: 1 addition & 14 deletions res/css/views/toasts/_IncomingCallToast.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,27 +90,14 @@ limitations under the License.
gap: 12px;

.mx_IncomingCallToast_button {
height: 24px;
@mixin CallButton;
padding: 0px 8px;
flex-shrink: 0;
flex-grow: 1;
margin-right: 0;
font-size: $font-15px;
line-height: $font-24px;

span {
padding: 8px 0;
display: flex;
align-items: center;

&::before {
content: '';
display: inline-block;
background-color: $button-fg-color;
mask-position: center;
mask-repeat: no-repeat;
margin-right: 8px;
}
}

&.mx_IncomingCallToast_button_accept span::before {
Expand Down