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

2018-11-08 20:53:05 +00:00 · 2018-11-08 20:53:05 +00:00 · 0d82ff876b
commit 0d82ff876b
parent 761f9d6336 7e748add1f
1 changed files with 3 additions and 0 deletions
--- a/res/css/views/dialogs/_EncryptedEventDialog.scss
+++ b/res/css/views/dialogs/_EncryptedEventDialog.scss
@ -24,5 +24,8 @@ limitations under the License.
    @mixin mx_DialogButton;
    background-color: $primary-bg-color;
    color: $accent-color;
+}
+
+.mx_EncryptedEventDialog button {
    margin-top: 0px;
 }