Merge branch 'develop' into travis/openid-widget

2019-03-23 22:48:12 -06:00
parent 1ed2e6dcc1 7b972e476f
commit d3268801ed
34 changed files with 717 additions and 133 deletions
@@ -16,7 +16,7 @@ limitations under the License.

 .mx_RoomUpgradeWarningBar {
    text-align: center;
-    height: 176px;
+    height: 235px;
    background-color: $event-selected-color;
    align-items: center;
    flex-direction: column;
@@ -14,6 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

+.mx_SettingsTab_warningText {
+    color: $warning-color;
+}
+
 .mx_SettingsTab_heading {
    font-size: 20px;
    font-weight: 600;