Merge remote-tracking branch 'origin/develop' into develop

pull/21833/head
Weblate 2018-11-08 20:53:05 +00:00
commit 0d82ff876b
1 changed files with 3 additions and 0 deletions

View File

@ -24,5 +24,8 @@ limitations under the License.
@mixin mx_DialogButton; @mixin mx_DialogButton;
background-color: $primary-bg-color; background-color: $primary-bg-color;
color: $accent-color; color: $accent-color;
}
.mx_EncryptedEventDialog button {
margin-top: 0px; margin-top: 0px;
} }