From 2e49014ffee8c119fd71f107cf0141acfbd46810 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Thu, 11 May 2017 09:33:52 +0100 Subject: [PATCH 1/4] CSS for mxIdDialog redesign --- src/skins/vector/css/_common.scss | 1 + .../views/dialogs/_SetMxIdDialog.scss | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/src/skins/vector/css/_common.scss b/src/skins/vector/css/_common.scss index 5b1d1de6f1..3048329436 100644 --- a/src/skins/vector/css/_common.scss +++ b/src/skins/vector/css/_common.scss @@ -248,6 +248,7 @@ textarea { .mx_Dialog_title { min-height: 16px; padding-top: 40px; + padding-right: 40px; font-weight: bold; font-size: 22px; line-height: 1.4; diff --git a/src/skins/vector/css/matrix-react-sdk/views/dialogs/_SetMxIdDialog.scss b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_SetMxIdDialog.scss index 4314a39f77..9aec165f68 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/dialogs/_SetMxIdDialog.scss +++ b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_SetMxIdDialog.scss @@ -15,6 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. */ +.mx_SetMxIdDialog_input_group { + display: flex; +} + .mx_SetMxIdDialog_input { border-radius: 3px; border: 1px solid $input-border-color; @@ -22,4 +26,21 @@ limitations under the License. color: $primary-fg-color; background-color: $primary-bg-color; font-size: 15px; + width: 100%; + max-width: 280px; } + +.mx_SetMxIdDialog_input.error, +.mx_SetMxIdDialog_input.error:focus { + border: 1px solid $warning-color; +} + +.mx_SetMxIdDialog_input_group .mx_Spinner { + height: 37px; + padding-left: 10px; + justify-content: flex-start; +} + +.mx_SetMxIdDialog .success { + color: $accent-color; +} \ No newline at end of file From 98f62d0300b1e8fc6690baa6f8d60d21fbbb4253 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Thu, 11 May 2017 09:40:06 +0100 Subject: [PATCH 2/4] NL at EOF --- src/component-index.js | 3 --- .../css/matrix-react-sdk/views/dialogs/_SetMxIdDialog.scss | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/component-index.js b/src/component-index.js index cdab24a40e..e737b3c684 100644 --- a/src/component-index.js +++ b/src/component-index.js @@ -19,9 +19,6 @@ limitations under the License. * You can edit it you like, but your changes will be overwritten, * so you'd just be trying to swim upstream like a salmon. * You are not a salmon. - * - * To update it, run: - * ./reskindex.js -h header */ module.exports.components = require('matrix-react-sdk/lib/component-index').components; diff --git a/src/skins/vector/css/matrix-react-sdk/views/dialogs/_SetMxIdDialog.scss b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_SetMxIdDialog.scss index 9aec165f68..c4444918f5 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/dialogs/_SetMxIdDialog.scss +++ b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_SetMxIdDialog.scss @@ -43,4 +43,4 @@ limitations under the License. .mx_SetMxIdDialog .success { color: $accent-color; -} \ No newline at end of file +} From ab24994e37889368f27ff5177c04b317d4f74ed0 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Thu, 11 May 2017 09:42:21 +0100 Subject: [PATCH 3/4] Move general CSS to more specific so as not to affect other dialogs --- src/skins/vector/css/_common.scss | 1 - .../css/matrix-react-sdk/views/dialogs/_SetMxIdDialog.scss | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/skins/vector/css/_common.scss b/src/skins/vector/css/_common.scss index 3048329436..5b1d1de6f1 100644 --- a/src/skins/vector/css/_common.scss +++ b/src/skins/vector/css/_common.scss @@ -248,7 +248,6 @@ textarea { .mx_Dialog_title { min-height: 16px; padding-top: 40px; - padding-right: 40px; font-weight: bold; font-size: 22px; line-height: 1.4; diff --git a/src/skins/vector/css/matrix-react-sdk/views/dialogs/_SetMxIdDialog.scss b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_SetMxIdDialog.scss index c4444918f5..f7d8a3d001 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/dialogs/_SetMxIdDialog.scss +++ b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_SetMxIdDialog.scss @@ -15,6 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. */ +.mx_SetMxIdDialog .mx_Dialog_title { + padding-right: 40px; +} + .mx_SetMxIdDialog_input_group { display: flex; } From d2ea162b3f1ff730041bb57d8e3961d3f954802a Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Thu, 11 May 2017 10:11:30 +0100 Subject: [PATCH 4/4] Unmuddle the component-index header --- src/component-index.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/component-index.js b/src/component-index.js index e737b3c684..cdab24a40e 100644 --- a/src/component-index.js +++ b/src/component-index.js @@ -19,6 +19,9 @@ limitations under the License. * You can edit it you like, but your changes will be overwritten, * so you'd just be trying to swim upstream like a salmon. * You are not a salmon. + * + * To update it, run: + * ./reskindex.js -h header */ module.exports.components = require('matrix-react-sdk/lib/component-index').components;