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

Commit

Permalink
extract reusable styles live beacon icon
Browse files Browse the repository at this point in the history
Signed-off-by: Kerry Archibald <kerrya@element.io>
  • Loading branch information
Kerry Archibald committed Mar 21, 2022
1 parent 8cd805a commit e2d6711
Show file tree
Hide file tree
Showing 5 changed files with 64 additions and 11 deletions.
1 change: 1 addition & 0 deletions res/css/_components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
@import "./_font-weights.scss";
@import "./_spacing.scss";
@import "./components/views/beacon/_LeftPanelLiveShareWarning.scss";
@import "./components/views/beacon/_StyledLiveBeaconIcon.scss";
@import "./components/views/location/_LiveDurationDropdown.scss";
@import "./components/views/location/_LocationShareMenu.scss";
@import "./components/views/location/_MapError.scss";
Expand Down
31 changes: 31 additions & 0 deletions res/css/components/views/beacon/_StyledLiveBeaconIcon.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/*
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_StyledLiveBeaconIcon {
flex-grow: 0;
flex-shrink: 0;
box-sizing: border-box;
border-width: 2px;
border-style: solid;
border-radius: 50%;

background-color: $location-live-color;
// 20% brightness $location-live-color
border-color: #deddfd;
padding: 2px;
// colors icon
color: white;
}
11 changes: 2 additions & 9 deletions res/css/components/views/location/_ShareType.scss
Original file line number Diff line number Diff line change
Expand Up @@ -83,19 +83,12 @@ limitations under the License.
border-style: solid;
border-radius: 50%;

// Live is styled by StyledLiveBeaconIcon

&.Own {
border-color: $accent;
}

&.Live {
background-color: $location-live-color;
// 20% brightness $location-live-color
border-color: #deddfd;
padding: 2px;
// colors icon
color: white;
}

&.Pin {
border-color: $accent;
background-color: $accent;
Expand Down
28 changes: 28 additions & 0 deletions src/components/views/beacon/StyledLiveBeaconIcon.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/*
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.
*/

import React from 'react';
import classNames from 'classnames';

import { Icon as LiveLocationIcon } from '../../../../res/img/location/live-location.svg';

const StyledLiveBeaconIcon: React.FC<React.SVGProps<SVGSVGElement>> = ({ className, ...props }) =>
<LiveLocationIcon
{...props}
className={classNames('mx_StyledLiveBeaconIcon', className)}
/>;

export default StyledLiveBeaconIcon;
4 changes: 2 additions & 2 deletions src/components/views/location/ShareType.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import BaseAvatar from '../avatars/BaseAvatar';
import AccessibleButton from '../elements/AccessibleButton';
import Heading from '../typography/Heading';
import { Icon as LocationIcon } from '../../../../res/img/element-icons/location.svg';
import { Icon as LiveLocationIcon } from '../../../../res/img/location/live-location.svg';
import { LocationShareType } from './shareLocation';
import StyledLiveBeaconIcon from '../beacon/StyledLiveBeaconIcon';

const UserAvatar = () => {
const matrixClient = useContext(MatrixClientContext);
Expand Down Expand Up @@ -59,7 +59,7 @@ const ShareTypeOption: React.FC<ShareTypeOptionProps> = ({
{ shareType === LocationShareType.Pin &&
<LocationIcon className={`mx_ShareType_option-icon ${LocationShareType.Pin}`} /> }
{ shareType === LocationShareType.Live &&
<LiveLocationIcon className={`mx_ShareType_option-icon ${LocationShareType.Live}`} /> }
<StyledLiveBeaconIcon className={`mx_ShareType_option-icon ${LocationShareType.Live}`} /> }

{ label }
</AccessibleButton>;
Expand Down

0 comments on commit e2d6711

Please sign in to comment.