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

Commit

Permalink
Create new right panel cards
Browse files Browse the repository at this point in the history
  • Loading branch information
@t3chguy
t3chguy committed Sep 8, 2020
1 parent eb7f6f4 commit 31cca5e
Show file tree
Hide file tree
Showing 14 changed files with 844 additions and 43 deletions.
3 changes: 3 additions & 0 deletions res/css/_components.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,12 @@
@import "./views/messages/_UnknownBody.scss";
@import "./views/messages/_ViewSourceEvent.scss";
@import "./views/messages/_common_CryptoEvent.scss";
@import "./views/right_panel/_BaseCard.scss";
@import "./views/right_panel/_EncryptionInfo.scss";
@import "./views/right_panel/_RoomSummaryCard.scss";
@import "./views/right_panel/_UserInfo.scss";
@import "./views/right_panel/_VerificationPanel.scss";
@import "./views/right_panel/_WidgetCard.scss";
@import "./views/room_settings/_AliasSettings.scss";
@import "./views/rooms/_AppsDrawer.scss";
@import "./views/rooms/_Autocomplete.scss";
Expand Down
164 changes: 164 additions & 0 deletions res/css/views/right_panel/_BaseCard.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
/*
Copyright 2020 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_BaseCard {
padding: 0 8px;
overflow: hidden;
display: flex;
flex-direction: column;
flex: 1;

.mx_BaseCard_header {
margin: 8px 0;

h2 {
margin: 0 44px;
font-size: $font-18px;
font-weight: $font-semi-bold;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}

.mx_BaseCard_back, .mx_BaseCard_close {
position: absolute;
background-color: rgba(141, 151, 165, 0.2); // TODO
height: 20px;
width: 20px;
margin: 12px;
top: 0;

&::before {
content: "";
position: absolute;
height: 16px;
width: 16px;
top: 2px;
left: 2px;
mask-repeat: no-repeat;
mask-position: center;
background-color: $rightpanel-button-color;
}
}

.mx_BaseCard_back {
border-radius: 4px;
left: 0;

&::before {
transform: rotate(90deg);
mask-size: 20px;
mask-image: url('$(res)/img/feather-customised/chevron-down.svg'); // TODO
}
}

.mx_BaseCard_close {
border-radius: 10px;
right: 0;

&::before {
mask-image: url('$(res)/img/icons-close.svg'); // TODO
}
}
}

.mx_AutoHideScrollbar {
// collapse the margin into a padding to move the scrollbar into the right gutter
margin-right: -8px;
padding-right: 8px;
min-height: 0;
width: 100%;
height: 100%;
}

.mx_BaseCard_Group {
margin: 20px 0 16px;

& > * {
margin-left: 10px;
margin-right: 10px;
}

h1 {
color: $tertiary-fg-color;
font-size: $font-12px;
font-weight: 500;
}

.mx_BaseCard_Button {
padding: 10px 38px 10px 12px;
margin: 0;
position: relative;
font-size: $font-13px;
height: 20px;
line-height: 20px;
border-radius: 8px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;

&:hover {
background-color: rgba(141, 151, 165, 0.1);
}

&::after {
content: '';
position: absolute;
top: 10px;
right: 6px;
height: 20px;
width: 20px;
mask-repeat: no-repeat;
mask-position: center;
background-color: $icon-button-color;
transform: rotate(270deg);
mask-size: 20px;
mask-image: url('$(res)/img/feather-customised/chevron-down.svg'); // TODO
}
}
}

.mx_BaseCard_footer {
padding-top: 4px;
text-align: center;

.mx_AccessibleButton_kind_secondary {
color: $secondary-fg-color;
background-color: rgba(141, 151, 165, 0.2); // TODO
font-weight: $font-semi-bold;
font-size: $font-14px;
min-width: 70px;

& + .mx_AccessibleButton_kind_secondary {
margin-left: 16px;
}
}
}
}

.mx_FilePanel,
.mx_UserInfo,
.mx_NotificationPanel,
.mx_MemberList {
&.mx_BaseCard {
padding: 32px 0 0;

.mx_AutoHideScrollbar {
margin-right: unset;
padding-right: unset;
}
}
}
157 changes: 157 additions & 0 deletions res/css/views/right_panel/_RoomSummaryCard.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
/*
Copyright 2020 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_RoomSummaryCard {
// shrink left gutter by 12 and instead add it as margin to all things except the buttons
// as their hover effect should go into the gutter
& > * { // TODO consolidate this as the standard effect
margin-left: 10px;
margin-right: 10px;
}
.mx_AutoHideScrollbar {
margin-left: 0;
}

.mx_BaseCard_header {
text-align: center;
margin-top: 20px;

h2 {
font-weight: $font-semi-bold;
font-size: $font-18px;
margin: 12px 0 4px;
}

.mx_RoomSummaryCard_alias {
font-size: $font-13px;
color: $secondary-fg-color;
}

h2, .mx_RoomSummaryCard_alias {
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
overflow: hidden;
text-overflow: ellipsis;
}

.mx_RoomSummaryCard_avatar {
display: inline-flex;

.mx_RoomSummaryCard_e2ee {
display: inline-block;
position: relative;
width: 54px;
height: 54px;
border-radius: 50%;
background-color: #737D8C;
margin-top: -3px; // alignment
margin-left: -10px; // overlap
border: 3px solid $dark-panel-bg-color;

&::before {
content: '';
position: absolute;
top: 13px;
left: 13px;
height: 28px;
width: 28px;
mask-size: cover;
mask-repeat: no-repeat;
mask-position: center;
mask-image: url('$(res)/img/e2e/disabled.svg');
background-color: #ffffff;
}
}

.mx_RoomSummaryCard_e2ee_secure{
background-color: #5ABFF2;
&::before {
mask-image: url('$(res)/img/e2e/normal.svg');
}
}
}
}

.mx_RoomSummaryCard_aboutGroup {
.mx_RoomSummaryCard_Button {
padding-left: 48px;

&::before {
content: '';
position: absolute;
top: 8px;
left: 8px;
height: 24px;
width: 24px;
mask-repeat: no-repeat;
mask-position: center;
background-color: $icon-button-color;
}
}
}

.mx_RoomSummaryCard_appsGroup {
.mx_RoomSummaryCard_Button {
padding-left: 10px;
color: $tertiary-fg-color;

span {
color: $primary-fg-color;
}

img {
vertical-align: top;
margin-right: 18px;
border-radius: 4px;
}

&::before {
content: unset;
}
}

.mx_RoomSummaryCard_icon_app_pinned::after {
mask-image: url('$(res)/img/element-icons/room/pin2.svg');
background-color: $accent-color;
transform: unset;
}
}

.mx_AccessibleButton_kind_link {
padding: 0;
margin-top: 12px;
margin-bottom: 12px;
font-size: $font-13px;
font-weight: $font-semi-bold;
}
}

.mx_RoomSummaryCard_icon_people::before {
mask-image: url("$(res)/img/element-icons/room/members.svg");
}

.mx_RoomSummaryCard_icon_files::before {
mask-image: url('$(res)/img/element-icons/room/files.svg');
}

.mx_RoomSummaryCard_icon_share::before {
mask-image: url('$(res)/img/element-icons/room/share.svg');
}

.mx_RoomSummaryCard_icon_settings::before {
mask-image: url('$(res)/img/element-icons/settings.svg');
}
25 changes: 25 additions & 0 deletions res/css/views/right_panel/_WidgetCard.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
Copyright 2020 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_WidgetCard {
height: 100%;
display: contents;

.mx_AppTileFullWidth {
height: 100%;
border: 0;
}
}
12 changes: 0 additions & 12 deletions res/css/views/rooms/_RoomHeader.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,10 +236,6 @@ limitations under the License.
}
}

.mx_RoomHeader_settingsButton::before {
mask-image: url('$(res)/img/element-icons/settings.svg');
}

.mx_RoomHeader_forgetButton::before {
mask-image: url('$(res)/img/element-icons/leave.svg');
width: 26px;
Expand All @@ -249,14 +245,6 @@ limitations under the License.
mask-image: url('$(res)/img/element-icons/room/search-inset.svg');
}

.mx_RoomHeader_shareButton::before {
mask-image: url('$(res)/img/element-icons/room/share.svg');
}

.mx_RoomHeader_manageIntegsButton::before {
mask-image: url('$(res)/img/element-icons/room/integrations.svg');
}

.mx_RoomHeader_showPanel {
height: 16px;
}
Expand Down
Loading

0 comments on commit 31cca5e

Please sign in to comment.