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

Iterate design and fix post-merge conflict

Browse source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2020-10-07 10:36:45 +01:00
parent c784039cf6
commit 29e3881fb3
5 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
res/css/views/right_panel/_BaseCard.scss
View file

@ -129,6 +129,13 @@ limitations under the License.
mask-size: 20px;
mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
}
&.mx_AccessibleButton_disabled {
padding: 10px 12px;
&::after {
content: unset;
}
}
}
}

16
res/css/views/right_panel/_RoomSummaryCard.scss
View file

@ -116,9 +116,9 @@ limitations under the License.
.mx_RoomSummaryCard_app_pinToggle,
.mx_RoomSummaryCard_app_options {
position: relative;
height: 20px;
width: 20px;
padding: 10px;
height: 16px;
width: 16px;
padding: 8px;
border-radius: 8px;
&:hover {
@ -128,8 +128,8 @@ limitations under the License.
&::before {
content: '';
position: absolute;
height: 20px;
width: 20px;
height: 16px;
width: 16px;
mask-repeat: no-repeat;
mask-position: center;
mask-size: 16px;
@ -158,6 +158,8 @@ limitations under the License.
.mx_RoomSummaryCard_Button {
padding-left: 12px;
padding-top: 6px;
padding-bottom: 6px;
color: $tertiary-fg-color;
flex: 1;
@ -174,6 +176,10 @@ limitations under the License.
&::before {
content: unset;
}
&::after {
top: 6px; // re-align based on the height change
}
}
}