Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix button border color of LeaveSpaceDialog #8010

Merged
merged 2 commits into from
Mar 10, 2022
Merged

Fix button border color of LeaveSpaceDialog #8010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d0d05a
Fix button color of LeaveSpaceDialog
luixxiul Mar 9, 2022
f5995aa
Add primaryButtonClass
luixxiul Mar 9, 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
83 changes: 37 additions & 46 deletions res/css/views/dialogs/_LeaveSpaceDialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,58 +19,49 @@ limitations under the License.
display: flex;
flex-direction: column;
padding: 24px 32px;
}
}

.mx_LeaveSpaceDialog {
width: 440px;
display: flex;
flex-direction: column;
flex-wrap: nowrap;
height: 520px;
.mx_LeaveSpaceDialog {
width: 440px;
display: flex;
flex-direction: column;
flex-wrap: nowrap;
height: 520px;

.mx_Dialog_content {
flex-grow: 1;
margin: 0;
overflow-y: auto;
.mx_Dialog_content {
flex-grow: 1;
margin: 0;
overflow-y: auto;

.mx_LeaveSpaceDialog_section_warning {
position: relative;
border-radius: 8px;
margin: 12px 0 0;
padding: 12px 8px 12px 42px;
background-color: $header-panel-bg-color;
.mx_LeaveSpaceDialog_section_warning {
position: relative;
border-radius: 8px;
margin: 12px 0 0;
padding: 12px 8px 12px 42px;
background-color: $header-panel-bg-color;

font-size: $font-12px;
line-height: $font-15px;
color: $secondary-content;
font-size: $font-12px;
line-height: $font-15px;
color: $secondary-content;

&::before {
content: '';
position: absolute;
left: 10px;
top: calc(50% - 8px); // vertical centering
height: 16px;
width: 16px;
background-color: $secondary-content;
mask-repeat: no-repeat;
mask-size: contain;
mask-image: url('$(res)/img/element-icons/room/room-summary.svg');
mask-position: center;
}
}
&::before {
content: '';
position: absolute;
left: 10px;
top: calc(50% - 8px); // vertical centering
height: 16px;
width: 16px;
background-color: $secondary-content;
mask-repeat: no-repeat;
mask-size: contain;
mask-image: url('$(res)/img/element-icons/room/room-summary.svg');
mask-position: center;
}
}

> p {
color: $primary-content;
}
}

.mx_Dialog_buttons {
margin-top: 20px;

.mx_Dialog_primary {
background-color: $alert !important; // override default colour
border-color: $alert;
> p {
color: $primary-content;
}
}
}
}
}
1 change: 1 addition & 0 deletions src/components/views/dialogs/LeaveSpaceDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ const LeaveSpaceDialog: React.FC<IProps> = ({ space, onFinished }) => {
</div>
<DialogButtons
primaryButton={_t("Leave space")}
primaryButtonClass="danger"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: This makes styling with .mx_Dialog_buttons unnecessary.

onPrimaryButtonClick={() => onFinished(true, roomsToLeave)}
hasCancel={true}
onCancel={() => onFinished(false)}
Expand Down