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

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969

Browse source
This commit is contained in:
Michael Telatynski 2021-09-28 15:45:09 +01:00
commit 207a1143fc
29 changed files with 397 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

11
res/css/views/elements/_ReplyThread.scss
View file

@ -59,3 +59,14 @@ limitations under the License.
border-left-color: $username-variant8-color;
}
}
.mx_ReplyThread--expanded {
.mx_EventTile_body {
display: block;
overflow-y: scroll !important;
}
.mx_EventTile_collapsedCodeBlock {
// !important needed due to .mx_ReplyTile .mx_EventTile_content .mx_EventTile_pre_container > pre
display: block !important;
}
}

2
res/css/views/elements/_RichText.scss
View file

@ -18,7 +18,7 @@ a.mx_Pill {
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
max-width: calc(100% - 1ch);
max-width: 100%;
}
.mx_Pill {

10
res/css/views/messages/_MessageActionBar.scss
View file

@ -117,6 +117,16 @@ limitations under the License.
mask-image: url('$(res)/img/download.svg');
}
.mx_MessageActionBar_expandMessageButton::after {
mask-size: 12px;
mask-image: url('$(res)/img/element-icons/expand-message.svg');
}
.mx_MessageActionBar_collapseMessageButton::after {
mask-size: 12px;
mask-image: url('$(res)/img/element-icons/collapse-message.svg');
}
.mx_MessageActionBar_downloadButton.mx_MessageActionBar_downloadSpinnerButton::after {
background-color: transparent; // hide the download icon mask
}

2
res/css/views/spaces/_SpaceCreateMenu.scss
View file

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
$spacePanelWidth: 71px;
$spacePanelWidth: 68px;
.mx_SpaceCreateMenu_wrapper {
// background blur everything except SpacePanel