Merge branch 'develop' into travis/media-customization

2021-03-11 08:37:49 -07:00
parent 7f52e78748 229a95f190
commit a9a4bd50ca
19 changed files with 357 additions and 194 deletions
@@ -26,7 +26,9 @@ limitations under the License.
    padding: 7px 18px;
    text-align: center;
    border-radius: 8px;
-    display: inline-block;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
    font-size: $font-14px;
 }

@@ -33,4 +33,10 @@ limitations under the License.
        color: $notice-primary-color;
        background-color: $notice-primary-bg-color;
    }
+
+    &.mx_AccessibleButton_kind_secondary {
+        color: $secondary-fg-color;
+        border: 1px solid $secondary-fg-color;
+        background-color: unset;
+    }
 }
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-.mx_UserInfo {
-    .mx_EncryptionInfo_spinner {
-        .mx_Spinner {
-            margin-top: 25px;
-            margin-bottom: 15px;
-        }
-
-        text-align: center;
+.mx_EncryptionInfo_spinner {
+    .mx_Spinner {
+        margin-top: 25px;
+        margin-bottom: 15px;
    }
+
+    text-align: center;
 }