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

Location sharing > back button (#7958)

Browse source 
* add back/cancel buttons to share dialog

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

* test buttons

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

* improve weird indentation

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

* relint

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

* PR tweaks

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

* quotes

Signed-off-by: Kerry Archibald <kerrya@element.io>
This commit is contained in:
Kerry 2022-03-03 11:30:46 +01:00 • committed by GitHub
parent 7aefa34420
commit ebc2267e52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 211 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

1
res/css/_components.scss
View file

@ -5,6 +5,7 @@
@import "./_font-weights.scss";
@import "./_spacing.scss";
@import "./components/views/location/_LocationShareMenu.scss";
@import "./components/views/location/_ShareDialogButtons.scss";
@import "./components/views/location/_ShareType.scss";
@import "./components/views/spaces/_QuickThemeSwitcher.scss";
@import "./structures/_AutoHideScrollbar.scss";

52
res/css/components/views/location/_ShareDialogButtons.scss Normal file
View file

@ -0,0 +1,52 @@
/*
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_ShareDialogButtons {
position: absolute;
width: 100%;
height: 0;
top: 0;
}
.mx_ShareDialogButtons_button {
@mixin ButtonResetDefault;
height: 24px;
width: 24px;
border-radius: 50%;
background-color: $quinary-content;
opacity: 0.8;
text-align: center;
color: $secondary-content;
position: absolute;
top: $spacing-16;
&:hover, &:focus {
opacity: 1;
}
&.left {
left: $spacing-16;
}
&.right {
right: $spacing-16;
}
}
.mx_ShareDialogButtons_button-icon {
height: 10px;
margin-top: 3px;
}

32
res/css/views/location/_LocationPicker.scss
View file

@ -25,11 +25,15 @@ limitations under the License.
border-radius: 8px;
.maplibregl-ctrl.maplibregl-ctrl-group {
// place below the close button
// padding-16 + 24px close button + padding-10
margin-top: 50px;
margin-right: $spacing-16;
}
.maplibregl-ctrl-bottom-right {
bottom: 68px;
margin-right: $spacing-16;
}
.maplibregl-user-location-accuracy-circle {
@ -91,34 +95,6 @@ limitations under the License.
min-width: 328px;
min-height: 48px;
}
button.mx_LocationPicker_cancelButton {
border: none;
border-radius: 12px;
position: absolute;
top: -360px;
right: 5px;
background-color: $quinary-content;
width: 24px;
height: 24px;
padding: 0px;
color: rgba(0, 0, 0, 0);
}
button.mx_LocationPicker_cancelButton::before {
content: '';
background-color: $primary-content;
min-width: 8px;
min-height: 8px;
width: 8px;
height: 8px;
position: absolute;
margin: 4px 8px;
mask-repeat: no-repeat;
mask-size: contain;
mask-position: center;
mask-image: url('$(res)/img/cancel-small.svg');
}
}
}