Merge branch 'experimental' into travis/rsettings/tab/general

res/css/views/auth/_AuthBody.scss

@@ -24,6 +24,29 @@ limitations under the License.
     color: $authpage-body-color;
 }
 
+.mx_AuthBody h2 {
+    font-size: 24px;
+    font-weight: 600;
+    margin-top: 8px;
+}
+
+.mx_AuthBody h3 {
+    font-size: 14px;
+    font-weight: 600;
+    color: $primary-fg-color;
+}
+
+.mx_Auth_editServerDetails {
+    padding-left: 1em;
+    font-size: 12px;
+    font-weight: normal;
+}
+
+.mx_AuthBody .mx_Field input {
+    width: 100%;
+    box-sizing: border-box;
+}
+
 .mx_AuthBody a:link,
 .mx_AuthBody a:hover,
 .mx_AuthBody a:visited {

res/css/views/auth/_AuthPage.scss

@@ -23,12 +23,6 @@ limitations under the License.
     background-color: $authpage-bg-color;
 }
 
-.mx_AuthPage h2 {
-    font-size: 24px;
-    font-weight: 600;
-    margin-top: 8px;
-}
-
 .mx_AuthPage_modal {
     display: flex;
     margin: 100px auto auto;

res/css/views/auth/_ServerConfig.scss

@@ -14,23 +14,24 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_ServerConfig {
-    margin-top: 7px;
+.mx_ServerConfig_fields {
+    display: flex;
+    margin: 1em 0;
 }
 
-.mx_ServerConfig .mx_Login_field {
-    margin-top: 4px;
-    margin-bottom: 5px;
+.mx_ServerConfig_fields .mx_Field {
+    flex: 1;
+    margin: 0 5px;
+}
+
+.mx_ServerConfig_fields .mx_Field:first-child {
+    margin-left: 0;
+}
+
+.mx_ServerConfig_fields .mx_Field:last-child {
+    margin-right: 0;
 }
 
 .mx_ServerConfig_help:link {
     opacity: 0.8;
-    font-size: 13px;
-    font-weight: 300;
-    color: $primary-fg-color;
 }
-
-.mx_ServerConfig_selector {
-    text-align: center;
-    width: 302px; // for fr i18n
-}

res/css/views/auth/_ServerTypeSelector.scss

@@ -0,0 +1,69 @@
+/*
+Copyright 2019 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_ServerTypeSelector {
+    display: flex;
+    margin-bottom: 28px;
+}
+
+.mx_ServerTypeSelector_type {
+    margin: 0 5px;
+}
+
+.mx_ServerTypeSelector_type:first-child {
+    margin-left: 0;
+}
+
+.mx_ServerTypeSelector_type:last-child {
+    margin-right: 0;
+}
+
+.mx_ServerTypeSelector_label {
+    text-align: center;
+    font-weight: 600;
+    color: $primary-fg-color;
+    margin: 8px 0;
+}
+
+.mx_ServerTypeSelector_type .mx_AccessibleButton {
+    padding: 10px;
+    border: 1px solid $input-border-color;
+    border-radius: 4px;
+}
+
+.mx_ServerTypeSelector_type.mx_ServerTypeSelector_type_selected .mx_AccessibleButton {
+    border-color: $input-valid-border-color;
+}
+
+.mx_ServerTypeSelector_logo {
+    display: flex;
+    justify-content: center;
+    height: 18px;
+    margin-bottom: 12px;
+    font-weight: 600;
+    color: $primary-fg-color;
+}
+
+.mx_ServerTypeSelector_logo > div {
+    display: flex;
+    width: 70%;
+    align-items: center;
+    justify-content: space-evenly;
+}
+
+.mx_ServerTypeSelector_description {
+    font-size: 10px;
+}

res/css/views/dialogs/_UserSettingsDialog.scss

@@ -44,3 +44,7 @@ limitations under the License.
 .mx_UserSettingsDialog_labsIcon:before {
   mask-image: url('$(res)/img/feather-icons/flag.svg');
 }
+
+.mx_UserSettingsDialog_flairIcon:before {
+  mask-image: url('$(res)/img/feather-icons/flair.svg');
+}

res/css/views/groups/_GroupPublicityToggle.scss

@@ -20,23 +20,14 @@ limitations under the License.
     margin: 8px;
 }
 
-.mx_GroupPublicity_toggle > label {
-    display: flex;
-    align-items: flex-start;
-}
-
-.mx_GroupPublicity_toggle > label,
-.mx_GroupPublicity_toggle .mx_GroupTile {
-    width: 50%;
-}
-
-.mx_GroupPublicity_toggle input {
-    margin-right: 8px;
-    vertical-align: -4px;
-}
-
 .mx_GroupPublicity_toggle .mx_GroupTile {
     display: flex;
     align-items: flex-start;
     cursor: pointer;
+    box-sizing: border-box;
+    width: 100%;
+}
+
+.mx_GroupPublicity_toggle .mx_ToggleSwitch {
+    float: right;
 }