From 53796f55be5924c94ed3ee07a21363be29272a3e Mon Sep 17 00:00:00 2001 From: Pablo Saavedra Date: Mon, 8 May 2017 12:25:45 +0200 Subject: [PATCH 1/3] Added default_federate property --- config.sample.json | 1 + 1 file changed, 1 insertion(+) diff --git a/config.sample.json b/config.sample.json index a65646ac77..94df4943ac 100644 --- a/config.sample.json +++ b/config.sample.json @@ -6,6 +6,7 @@ "integrations_rest_url": "https://scalar.vector.im/api", "bug_report_endpoint_url": "https://vector.im/bugs", "enableLabs": true, + "default_federate": true, "roomDirectory": { "servers": [ "matrix.org" From 29f43f8fe8d37449dcac358f65e2787bbab9d6e9 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 2 Aug 2017 14:01:32 +0100 Subject: [PATCH 2/3] add styling for TextInputWithCheckboxDialog Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/skins/vector/css/_common.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/skins/vector/css/_common.scss b/src/skins/vector/css/_common.scss index 3189deb0b2..b40ed56d47 100644 --- a/src/skins/vector/css/_common.scss +++ b/src/skins/vector/css/_common.scss @@ -258,12 +258,12 @@ textarea { color: $warning-color; } -.mx_TextInputDialog_label { +.mx_TextInputDialog_label, .mx_TextInputWithCheckboxDialog_label { text-align: left; padding-bottom: 12px; } -.mx_TextInputDialog_input { +.mx_TextInputDialog_input, .mx_TextInputWithCheckboxDialog_input { font-size: 15px; border-radius: 3px; border: 1px solid $input-border-color; From f0967d4f18188a926ebf0e495a40c1b56dcf04e6 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 17 Aug 2017 13:31:09 +0100 Subject: [PATCH 3/3] split css out as the modal is no longer generic Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/skins/vector/css/_common.scss | 4 +-- src/skins/vector/css/_components.scss | 1 + .../views/dialogs/_CreateRoomDialog.scss | 33 +++++++++++++++++++ 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 src/skins/vector/css/matrix-react-sdk/views/dialogs/_CreateRoomDialog.scss diff --git a/src/skins/vector/css/_common.scss b/src/skins/vector/css/_common.scss index b40ed56d47..3189deb0b2 100644 --- a/src/skins/vector/css/_common.scss +++ b/src/skins/vector/css/_common.scss @@ -258,12 +258,12 @@ textarea { color: $warning-color; } -.mx_TextInputDialog_label, .mx_TextInputWithCheckboxDialog_label { +.mx_TextInputDialog_label { text-align: left; padding-bottom: 12px; } -.mx_TextInputDialog_input, .mx_TextInputWithCheckboxDialog_input { +.mx_TextInputDialog_input { font-size: 15px; border-radius: 3px; border: 1px solid $input-border-color; diff --git a/src/skins/vector/css/_components.scss b/src/skins/vector/css/_components.scss index 00c19b13da..2cfad15918 100644 --- a/src/skins/vector/css/_components.scss +++ b/src/skins/vector/css/_components.scss @@ -20,6 +20,7 @@ @import "./matrix-react-sdk/views/dialogs/_ChatInviteDialog.scss"; @import "./matrix-react-sdk/views/dialogs/_ConfirmUserActionDialog.scss"; @import "./matrix-react-sdk/views/dialogs/_CreateGroupDialog.scss"; +@import "./matrix-react-sdk/views/dialogs/_CreateRoomDialog.scss"; @import "./matrix-react-sdk/views/dialogs/_EncryptedEventDialog.scss"; @import "./matrix-react-sdk/views/dialogs/_SetMxIdDialog.scss"; @import "./matrix-react-sdk/views/dialogs/_UnknownDeviceDialog.scss"; diff --git a/src/skins/vector/css/matrix-react-sdk/views/dialogs/_CreateRoomDialog.scss b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_CreateRoomDialog.scss new file mode 100644 index 0000000000..888f147d21 --- /dev/null +++ b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_CreateRoomDialog.scss @@ -0,0 +1,33 @@ +/* +Copyright 2017 Michael Telatynski <7t3chguy@gmail.com> + +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_CreateRoomDialog_details_summary { + outline: none; +} + +.mx_CreateRoomDialog_label { + text-align: left; + padding-bottom: 12px; +} + +.mx_CreateRoomDialog_input { + font-size: 15px; + border-radius: 3px; + border: 1px solid $input-border-color; + padding: 9px; + color: $primary-fg-color; + background-color: $primary-bg-color; +}