Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
f033234abe
src/skins/vector/css
|
@ -6,6 +6,7 @@
|
||||||
@import "./matrix-react-sdk/structures/_GroupView.scss";
|
@import "./matrix-react-sdk/structures/_GroupView.scss";
|
||||||
@import "./matrix-react-sdk/structures/_LoginBox.scss";
|
@import "./matrix-react-sdk/structures/_LoginBox.scss";
|
||||||
@import "./matrix-react-sdk/structures/_MatrixChat.scss";
|
@import "./matrix-react-sdk/structures/_MatrixChat.scss";
|
||||||
|
@import "./matrix-react-sdk/structures/_MyGroups.scss";
|
||||||
@import "./matrix-react-sdk/structures/_NotificationPanel.scss";
|
@import "./matrix-react-sdk/structures/_NotificationPanel.scss";
|
||||||
@import "./matrix-react-sdk/structures/_RoomStatusBar.scss";
|
@import "./matrix-react-sdk/structures/_RoomStatusBar.scss";
|
||||||
@import "./matrix-react-sdk/structures/_RoomView.scss";
|
@import "./matrix-react-sdk/structures/_RoomView.scss";
|
||||||
|
@ -18,6 +19,7 @@
|
||||||
@import "./matrix-react-sdk/views/dialogs/_ChatCreateOrReuseChatDialog.scss";
|
@import "./matrix-react-sdk/views/dialogs/_ChatCreateOrReuseChatDialog.scss";
|
||||||
@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/_EncryptedEventDialog.scss";
|
@import "./matrix-react-sdk/views/dialogs/_EncryptedEventDialog.scss";
|
||||||
@import "./matrix-react-sdk/views/dialogs/_SetMxIdDialog.scss";
|
@import "./matrix-react-sdk/views/dialogs/_SetMxIdDialog.scss";
|
||||||
@import "./matrix-react-sdk/views/dialogs/_UnknownDeviceDialog.scss";
|
@import "./matrix-react-sdk/views/dialogs/_UnknownDeviceDialog.scss";
|
||||||
|
|
|
@ -0,0 +1,44 @@
|
||||||
|
/*
|
||||||
|
Copyright 2017 Vector Creations 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_MyGroups_joinCreateBox {
|
||||||
|
display: table;
|
||||||
|
margin-bottom: 30px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_MyGroups_createBox, .mx_MyGroups_joinBox {
|
||||||
|
display: table-cell;
|
||||||
|
width: 40%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_MyGroups_joinCreateHeader {
|
||||||
|
font-weight: bold;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_MyGroups_joinCreateButton {
|
||||||
|
float: left;
|
||||||
|
margin: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_MyGroups_joinCreateButton object {
|
||||||
|
/* Otherwise the SVG object absorbs clicks and the button doesn't work */
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_MyGroups_content {
|
||||||
|
clear: left;
|
||||||
|
}
|
|
@ -0,0 +1,35 @@
|
||||||
|
/*
|
||||||
|
Copyright 2017 Vector Creations 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_CreateGroupDialog_inputRow {
|
||||||
|
margin-top: 10px;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_CreateGroupDialog_label {
|
||||||
|
text-align: left;
|
||||||
|
padding-bottom: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_CreateGroupDialog_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