Revert "Merge pull request #2395 from matrix-org/dbkr/merge_develop_experimental"

This reverts commit ad47144355.
2019-01-03 15:37:03 -07:00
parent d111fe27bb
commit f928be6f59
77 changed files with 598 additions and 3532 deletions
@@ -181,8 +181,6 @@ $imagebody-giflabel-border: rgba(0, 0, 0, 0.2);
 // unused?
 $progressbar-color: #000;

-$room-warning-bg-color: #fff8e3;
-
 // ***** Mixins! *****

@define-mixin mx_DialogButton {
@@ -215,11 +213,3 @@ $room-warning-bg-color: #fff8e3;
    font-size: 15px;
    padding: 0px 1.5em 0px 1.5em;
 }
-
-@define-mixin mx_DialogButton_secondary {
-    // flip colours for the secondary ones
-    font-weight: 600;
-    border: 1px solid $accent-color ! important;
-    color: $accent-color;
-    background-color: $accent-fg-color;
-}