This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 833
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into issue#21381
- Loading branch information
Showing
88 changed files
with
2,586 additions
and
744 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /* | ||
| 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_BeaconStatus { | ||
| display: flex; | ||
| flex-direction: row; | ||
| align-items: center; | ||
| justify-content: flex-start; | ||
|
|
||
| box-sizing: border-box; | ||
| padding: $spacing-8; | ||
|
|
||
| color: var(--color); | ||
| font-size: $font-12px; | ||
| } | ||
|
|
||
| .mx_BeaconStatus_Loading, | ||
| .mx_BeaconStatus_Stopped { | ||
| --color: $tertiary-content; | ||
| } | ||
|
|
||
| .mx_BeaconStatus_Active, | ||
| .mx_BeaconStatus_Error { | ||
| --color: $primary-content; | ||
| } | ||
|
|
||
| .mx_BeaconStatus_icon { | ||
| height: 32px; | ||
| width: 32px; | ||
|
|
||
| flex: 0 0 32px; | ||
| margin-right: $spacing-8; | ||
| } | ||
|
|
||
| .mx_BeaconStatus_activeDescription { | ||
| flex: 1; | ||
| display: flex; | ||
| flex-direction: column; | ||
| line-height: $font-14px; | ||
| } | ||
|
|
||
| .mx_BeaconStatus_stopButton { | ||
| // override button link_inline styles | ||
| color: $alert !important; | ||
| font-weight: $font-semi-bold !important; | ||
| text-transform: uppercase; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| /* | ||
| 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_LiveTimeRemaining { | ||
| color: $secondary-content; | ||
| font-size: $font-12px; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /* | ||
| 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_MBeaconBody { | ||
| position: relative; | ||
| height: 220px; | ||
| width: 325px; | ||
|
|
||
| border-radius: $timeline-image-border-radius; | ||
| overflow: hidden; | ||
| } | ||
|
|
||
| .mx_MBeaconBody_map { | ||
| height: 100%; | ||
| width: 100%; | ||
| z-index: 0; // keeps the entire map under the message action bar | ||
| } | ||
|
|
||
| .mx_MBeaconBody_mapFallback { | ||
| box-sizing: border-box; | ||
| display: flex; | ||
| justify-content: center; | ||
| align-items: center; | ||
|
|
||
| // pushes spinner/icon up | ||
| // to appear more centered with the footer | ||
| padding-bottom: 50px; | ||
|
|
||
| background: url('$(res)/img/location/map.svg'); | ||
| background-size: cover; | ||
| } | ||
|
|
||
| .mx_MBeaconBody_mapFallbackIcon { | ||
| width: 65px; | ||
| color: $quaternary-content; | ||
| } | ||
|
|
||
| .mx_MBeaconBody_chin { | ||
| position: absolute; | ||
| bottom: 0; | ||
| width: 100%; | ||
| background-color: $overlay-background; | ||
| } | ||
|
|
||
| .mx_EventTile[data-layout="bubble"] .mx_EventTile_line .mx_MBeaconBody { | ||
| max-width: 100%; | ||
| width: 450px; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.