Merge branch 'develop' into fayed/fix-verification-dialog
This commit is contained in:
commit
651e943b31
145 changed files with 5361 additions and 1938 deletions
|
@ -89,7 +89,6 @@ limitations under the License.
|
|||
margin: 0px auto;
|
||||
|
||||
overflow: auto;
|
||||
flex: 0 0 auto;
|
||||
}
|
||||
|
||||
.mx_RoomView_auxPanel_fullHeight {
|
||||
|
|
|
@ -122,7 +122,7 @@ limitations under the License.
|
|||
float: right;
|
||||
font-size: $font-12px;
|
||||
line-height: $font-22px;
|
||||
color: $muted-fg-color;
|
||||
color: $secondary-content;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue