Merge branch 'develop' into matthew/dharma
This commit is contained in:
commit
4fbf34e05b
15 changed files with 213 additions and 6983 deletions
|
@ -28,6 +28,12 @@ limitations under the License.
|
|||
margin-top: -2px;
|
||||
}
|
||||
|
||||
.mx_MatrixToolbar_error {
|
||||
padding-left: 16px;
|
||||
padding-right: 8px;
|
||||
background-color: $warning-bg-color;
|
||||
}
|
||||
|
||||
.mx_MatrixToolbar_content {
|
||||
flex: 1;
|
||||
}
|
||||
|
@ -59,4 +65,4 @@ limitations under the License.
|
|||
|
||||
.mx_MatrixToolbar_changelog {
|
||||
white-space: pre;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue