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

Merge branch 'develop' into jryans/reactions-rm-highlight

Browse source
This commit is contained in:
Travis Ralston 2019-06-07 13:20:45 -06:00
commit f238bbb6af
12 changed files with 277 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
res/css/structures/_GenericErrorPage.scss
View file

@ -12,7 +12,7 @@
right: 0;
margin: auto;
width: 500px;
height: 200px;
height: 125px;
border: 1px solid #f22;
padding: 10px 10px 20px;
background-color: #fcc;

5
res/css/structures/auth/_Login.scss
View file

@ -62,6 +62,11 @@ limitations under the License.
margin-bottom: 12px;
}
.mx_Login_error.mx_Login_serverError {
text-align: left;
font-weight: normal;
}
.mx_Login_type_container {
display: flex;
align-items: center;

6
res/css/views/rooms/_EventTile.scss
View file

@ -56,13 +56,17 @@ limitations under the License.
color: $primary-fg-color;
font-size: 14px;
display: inline-block; /* anti-zalgo, with overflow hidden */
overflow-y: hidden;
overflow: hidden;
cursor: pointer;
padding-left: 65px; /* left gutter */
padding-bottom: 0px;
padding-top: 0px;
margin: 0px;
line-height: 17px;
/* the next three lines, along with overflow hidden, truncate long display names */
white-space: nowrap;
text-overflow: ellipsis;
max-width: calc(100% - 65px);
}
.mx_EventTile .mx_SenderProfile .mx_Flair {