forked from matrix/element-web
Merge pull request #3849 from psaavedra/set_default_federate_by_settings
Added default_federate property
This commit is contained in:
commit
508ff4f917
|
@ -6,6 +6,7 @@
|
||||||
"integrations_rest_url": "https://scalar.vector.im/api",
|
"integrations_rest_url": "https://scalar.vector.im/api",
|
||||||
"bug_report_endpoint_url": "https://riot.im/bugreports/submit",
|
"bug_report_endpoint_url": "https://riot.im/bugreports/submit",
|
||||||
"enableLabs": true,
|
"enableLabs": true,
|
||||||
|
"default_federate": true,
|
||||||
"roomDirectory": {
|
"roomDirectory": {
|
||||||
"servers": [
|
"servers": [
|
||||||
"matrix.org"
|
"matrix.org"
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
@import "./matrix-react-sdk/views/dialogs/_ChatInviteDialog.scss";
|
@import "./matrix-react-sdk/views/dialogs/_ChatInviteDialog.scss";
|
||||||
@import "./matrix-react-sdk/views/dialogs/_ConfirmUserActionDialog.scss";
|
@import "./matrix-react-sdk/views/dialogs/_ConfirmUserActionDialog.scss";
|
||||||
@import "./matrix-react-sdk/views/dialogs/_CreateGroupDialog.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/_EncryptedEventDialog.scss";
|
||||||
@import "./matrix-react-sdk/views/dialogs/_QuestionDialog.scss";
|
@import "./matrix-react-sdk/views/dialogs/_QuestionDialog.scss";
|
||||||
@import "./matrix-react-sdk/views/dialogs/_SetMxIdDialog.scss";
|
@import "./matrix-react-sdk/views/dialogs/_SetMxIdDialog.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;
|
||||||
|
}
|
Loading…
Reference in New Issue