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

Merge branch 'experimental' into bwindels/roomgridview-experimental

Browse source
This commit is contained in:
Bruno Windels 2019-01-07 14:17:57 +01:00
commit 290dc9d8fb
146 changed files with 5292 additions and 1051 deletions
Download patch file Download diff file Expand all files Collapse all files

6
res/css/structures/_LeftPanel.scss
View file

@ -89,12 +89,6 @@ limitations under the License.
pointer-events: none;
}
.mx_LeftPanel_container.collapsed .mx_RoleButton {
margin-right: 0px ! important;
padding-top: 3px ! important;
padding-bottom: 3px ! important;
}
.mx_BottomLeftMenu_options > div {
display: inline-block;
}

5
res/css/structures/_RightPanel.scss
View file

@ -45,7 +45,8 @@ limitations under the License.
cursor: pointer;
flex: 0 0 auto;
vertical-align: top;
padding-left: 4px;
margin-top: 4px;
padding-left: 5px;
padding-right: 5px;
text-align: center;
position: relative;
@ -57,7 +58,7 @@ limitations under the License.
}
.mx_RightPanel_headerButton_highlight {
border-color: $accent-color;
border-color: $button-bg-color;
}
.mx_RightPanel_headerButton_badge {

20
res/css/structures/_RoomSubList.scss
View file

@ -19,14 +19,14 @@ limitations under the License.
each with a flex-shrink difference of 4 order of magnitude,
so they ideally wouldn't affect each other.
lowest category: .mx_RoomSubList
flex:-shrink: 10000000
flex-shrink: 10000000
distribute size of items within the same categery by their size
middle category: .mx_RoomSubList.resized-sized
flex:-shrink: 1000
flex-shrink: 1000
applied when using the resizer, will have a max-height set to it,
to limit the size
highest category: .mx_RoomSubList.resized-all
flex:-shrink: 1
flex-shrink: 1
small flex-shrink value (1), is only added if you can drag the resizer so far
so in practice you can only assign this category if there is enough space.
*/
@ -39,7 +39,7 @@ limitations under the License.
}
.mx_RoomSubList_nonEmpty {
min-height: 76px;
min-height: 70px;
.mx_AutoHideScrollbar_offset {
padding-bottom: 4px;
@ -94,7 +94,7 @@ limitations under the License.
font-weight: 600;
font-size: 12px;
padding: 0 5px;
background-color: $accent-color;
background-color: $roomtile-name-color;
}
.mx_RoomSubList_addRoom, .mx_RoomSubList_badge {
@ -154,7 +154,7 @@ limitations under the License.
position: sticky;
left: 0;
right: 0;
height: 40px;
height: 30px;
content: "";
display: block;
z-index: 100;
@ -162,20 +162,20 @@ limitations under the License.
}
&.mx_IndicatorScrollbar_topOverflow > .mx_AutoHideScrollbar_offset {
margin-top: -40px;
margin-top: -30px;
}
&.mx_IndicatorScrollbar_bottomOverflow > .mx_AutoHideScrollbar_offset {
margin-bottom: -40px;
margin-bottom: -30px;
}
&.mx_IndicatorScrollbar_topOverflow::before {
top: 0;
background: linear-gradient($secondary-accent-color, transparent);
background: linear-gradient(to top, rgba(242,245,248,0), rgba(242,245,248,1));
}
&.mx_IndicatorScrollbar_bottomOverflow::after {
bottom: 0;
background: linear-gradient(transparent, $secondary-accent-color);
background: linear-gradient(to bottom, rgba(242,245,248,0), rgba(242,245,248,1));
}
}

21
res/css/structures/_TagPanel.scss
View file

@ -124,10 +124,23 @@ limitations under the License.
padding-right: 4px;
}
.mx_TagPanel_groupsButton {
flex: 0;
margin: 17px 0 3px 0;
}
.mx_TagPanel_groupsButton > .mx_GroupsButton:before {
mask: url('../../img/feather-icons/users.svg');
mask-position: center 11px;
}
.mx_TagPanel_groupsButton > .mx_TagPanel_report:before {
mask: url('../../img/feather-icons/life-buoy.svg');
mask-position: center 9px;
}
.mx_TagPanel_groupsButton > .mx_AccessibleButton {
flex: auto;
margin-bottom: 17px;
margin-top: 18px;
margin-bottom: 12px;
height: 40px;
width: 40px;
border-radius: 20px;
@ -138,9 +151,7 @@ limitations under the License.
&:before {
background-color: $tagpanel-bg-color;
mask: url('../../img/icons-groups-nobg.svg');
mask-repeat: no-repeat;
mask-position: center 8px;
content: '';
position: absolute;
top: 0;