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

Live location share - beacon tooltip in maximised view (#8572) PSF-926

Browse source 
* pass optional tooltip prop down through markers

Signed-off-by: Kerry Archibald <kerrya@element.io>

* add beaconstatustooltip, handle overflow on beacon status label

Signed-off-by: Kerry Archibald <kerrya@element.io>

* remove debug, fix mouseout

Signed-off-by: Kerry Archibald <kerrya@element.io>

* tidy comments

Signed-off-by: Kerry Archibald <kerrya@element.io>
This commit is contained in:
Kerry 2022-05-13 10:30:53 +02:00 • committed by GitHub
parent fdd5494402
commit fbbb9c27ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 271 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

3
res/css/_components.scss
View file

@ -6,6 +6,7 @@
@import "./_spacing.scss";
@import "./components/views/beacon/_BeaconListItem.scss";
@import "./components/views/beacon/_BeaconStatus.scss";
@import "./components/views/beacon/_BeaconStatusTooltip.scss";
@import "./components/views/beacon/_BeaconViewDialog.scss";
@import "./components/views/beacon/_DialogOwnBeaconStatus.scss";
@import "./components/views/beacon/_DialogSidebar.scss";
@ -143,7 +144,6 @@
@import "./views/elements/_AddressSelector.scss";
@import "./views/elements/_AddressTile.scss";
@import "./views/elements/_CopyableText.scss";
@import "./views/elements/_SearchWarning.scss";
@import "./views/elements/_DesktopCapturerSourcePicker.scss";
@import "./views/elements/_DialPadBackspaceButton.scss";
@import "./views/elements/_DirectorySearchBox.scss";
@ -172,6 +172,7 @@
@import "./views/elements/_RoleButton.scss";
@import "./views/elements/_RoomAliasField.scss";
@import "./views/elements/_SSOButtons.scss";
@import "./views/elements/_SearchWarning.scss";
@import "./views/elements/_ServerPicker.scss";
@import "./views/elements/_SettingsFlag.scss";
@import "./views/elements/_Slider.scss";

1
res/css/components/views/beacon/_BeaconListItem.scss
View file

@ -40,6 +40,7 @@ limitations under the License.
.mx_BeaconListItem_info {
flex: 1 1 0;
width: 0;
display: flex;
flex-direction: column;
align-items: stretch;

7
res/css/components/views/beacon/_BeaconStatus.scss
View file

@ -46,14 +46,15 @@ limitations under the License.
}
.mx_BeaconStatus_description {
flex: 1;
flex: 1 1 0;
display: flex;
flex-direction: column;
line-height: $font-14px;
padding-right: $spacing-8;
// TODO handle text-overflow
white-space: nowrap;
overflow: hidden;
}
.mx_BeaconStatus_expiryTime {
@ -62,4 +63,6 @@ limitations under the License.
.mx_BeaconStatus_label {
margin-bottom: 2px;
overflow: hidden;
text-overflow: ellipsis;
}

37
res/css/components/views/beacon/_BeaconStatusTooltip.scss Normal file
View file

@ -0,0 +1,37 @@
/*
Copyright 2022 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
.mx_BeaconStatusTooltip {
position: absolute;
top: 42px;
max-width: 150px;
height: 38px;
box-sizing: content-box;
padding-top: $spacing-8;
// override copyable text style to make compact
.mx_CopyableText_copyButton {
margin-left: 0 !important;
}
}
.mx_BeaconStatusTooltip_inner {
position: relative;
height: 100%;
border-radius: 4px;
background: $menu-bg-color;
box-shadow: 4px 4px 12px 0 $menu-box-shadow-color;
}