OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'kegan/invite-search' into matthew/roompreview

pull/668/head
Matthew Hodgson 2016-01-18 18:00:58 +00:00
parent d6f6f32c74 317e1fb9cd
commit d5c291ae62
8 changed files with 1153 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/component-index.js
View File

@ -33,9 +33,9 @@ module.exports.components['structures.ViewSource'] = require('./components/struc
module.exports.components['views.elements.ImageView'] = require('./components/views/elements/ImageView');
module.exports.components['views.elements.Spinner'] = require('./components/views/elements/Spinner');
module.exports.components['views.globals.MatrixToolbar'] = require('./components/views/globals/MatrixToolbar');
module.exports.components['views.login.CustomServerDialog'] = require('./components/views/login/VectorCustomServerDialog');
module.exports.components['views.login.LoginFooter'] = require('./components/views/login/VectorLoginFooter');
module.exports.components['views.login.LoginHeader'] = require('./components/views/login/VectorLoginHeader');
module.exports.components['views.login.VectorCustomServerDialog'] = require('./components/views/login/VectorCustomServerDialog');
module.exports.components['views.login.VectorLoginFooter'] = require('./components/views/login/VectorLoginFooter');
module.exports.components['views.login.VectorLoginHeader'] = require('./components/views/login/VectorLoginHeader');
module.exports.components['views.messages.DateSeparator'] = require('./components/views/messages/DateSeparator');
module.exports.components['views.messages.MessageTimestamp'] = require('./components/views/messages/MessageTimestamp');
module.exports.components['views.messages.SenderProfile'] = require('./components/views/messages/SenderProfile');
@ -45,3 +45,4 @@ module.exports.components['views.rooms.RoomDNDView'] = require('./components/vie
module.exports.components['views.rooms.RoomDropTarget'] = require('./components/views/rooms/RoomDropTarget');
module.exports.components['views.rooms.RoomTooltip'] = require('./components/views/rooms/RoomTooltip');
module.exports.components['views.rooms.SearchBar'] = require('./components/views/rooms/SearchBar');
module.exports.components['views.settings.Notifications'] = require('./components/views/settings/Notifications');

2
src/components/views/login/VectorCustomServerDialog.js
View File

@ -25,7 +25,7 @@ module.exports = React.createClass({
render: function() {
return (
<div className="mx_ErrorDialog">
<div className="mx_ErrorDialogTitle">
<div className="mx_Dialog_title">
Custom Server Options
</div>
<div className="mx_Dialog_content">

1020
src/components/views/settings/Notifications.js Normal file
View File

File diff suppressed because it is too large Load Diff

14
src/skins/vector/css/common.css
View File

@ -187,8 +187,7 @@ input[type=text]:focus, textarea:focus {
padding-right: 1em;
}
.mx_ErrorDialogTitle,
.mx_QuestionDialogTitle {
.mx_Dialog_title {
min-height: 16px;
padding: 12px;
border-bottom: 1px solid #a4a4a4;
@ -196,3 +195,14 @@ input[type=text]:focus, textarea:focus {
font-size: 18px;
line-height: 1.4;
}
.mx_TextInputDialog_label {
text-align: left;
padding-bottom: 12px;
}
.mx_TextInputDialog_input {
color: #747474;
font-weight: 300;
font-size: 15px;
}

28
src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css
View File

@ -86,6 +86,13 @@ limitations under the License.
border-bottom: 1px solid #eee;
}
.mx_UserSettings h3 {
font-weight: bold;
font-size: 15px;
margin-top: 4px;
margin-bottom: 4px;
}
.mx_UserSettings_section {
margin-left: 63px;
margin-top: 28px;
@ -104,8 +111,7 @@ limitations under the License.
float: left;
}
.mx_UserSettings_profileTableRow,
.mx_UserSettings_notifTableRow
.mx_UserSettings_profileTableRow
{
display: table-row;
}
@ -137,24 +143,6 @@ limitations under the License.
font-size: 16px;
}
.mx_UserSettings_profileInputCell .mx_EditableText_placeholder {
color: rgba(74, 74, 74, 0.5);
}
.mx_UserSettings_notifInputCell {
display: table-cell;
padding-bottom: 21px;
padding-right: 8px;
width: 16px;
}
.mx_UserSettings_notifLabelCell
{
padding-bottom: 21px;
width: 270px;
display: table-cell;
}
.mx_UserSettings_logout {
float: right;
margin-right: 32px;

58
src/skins/vector/css/matrix-react-sdk/views/rooms/MemberTile.css → src/skins/vector/css/matrix-react-sdk/views/rooms/EntityTile.css
View File

@ -14,14 +14,24 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
.mx_MemberTile {
.mx_EntityTile {
display: table-row;
position: relative;
color: #454545;
cursor: pointer;
}
.mx_MemberTile_avatar {
.mx_EntityTile_invite {
display: table-cell;
vertical-align: middle;
margin-left: 10px;
}
.mx_EntityTile:hover .mx_MessageTimestamp {
display: block;
}
.mx_EntityTile_avatar {
display: table-cell;
padding-left: 3px;
padding-right: 12px;
@ -33,66 +43,44 @@ limitations under the License.
position: relative;
}
.mx_MemberTile_power {
position: absolute;
width: 16px;
height: 17px;
top: 0px;
right: 6px;
}
.mx_MemberTile_name {
.mx_EntityTile_name {
display: table-cell;
vertical-align: middle;
overflow: hidden;
text-overflow: ellipsis;
}
.mx_MemberTile_details {
.mx_EntityTile_details {
display: table-cell;
padding-right: 14px;
vertical-align: middle;
}
.mx_MemberTile_userId {
.mx_EntityTile_name_hover {
font-size: 13px;
overflow: hidden;
text-overflow: ellipsis;
}
.mx_MemberTile_chevron {
.mx_EntityTile_chevron {
margin-top: 8px;
margin-right: -4px;
margin-left: 6px;
float: right;
}
/*
.mx_MemberTile_nameWrapper {
display: table-cell;
vertical-align: middle;
overflow: hidden;
text-overflow: ellipsis;
}
.mx_MemberTile_nameSpan {
}
*/
.mx_MemberTile_unavailable .mx_MemberTile_avatar,
.mx_MemberTile_unavailable .mx_MemberTile_name,
.mx_MemberTile_unavailable .mx_MemberTile_userId
.mx_EntityTile_unavailable .mx_EntityTile_avatar,
.mx_EntityTile_unavailable .mx_EntityTile_name,
.mx_EntityTile_unavailable .mx_EntityTile_name_hover
{
opacity: 0.66;
}
.mx_MemberTile_offline .mx_MemberTile_avatar,
.mx_MemberTile_offline .mx_MemberTile_name,
.mx_MemberTile_offline .mx_MemberTile_userId
.mx_EntityTile_offline .mx_EntityTile_avatar,
.mx_EntityTile_offline .mx_EntityTile_name,
.mx_EntityTile_offline .mx_EntityTile_name_hover
{
opacity: 0.25;
}
.mx_MemberTile:hover .mx_MessageTimestamp {
display: block;
}

23
src/skins/vector/css/matrix-react-sdk/views/rooms/SearchableEntityList.css Normal file
View File

@ -0,0 +1,23 @@
/*
Copyright 2016 OpenMarket 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_SearchableEntityList_list {
border-bottom: 1px solid #e1dddd;
}
.mx_SearchableEntityList_list:empty {
border-bottom: 0px;
}

62
src/skins/vector/css/vector-web/views/settings/Notifications.css Normal file
View File

@ -0,0 +1,62 @@
/*
Copyright 2015, 2016 OpenMarket 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_UserNotifSettings_tableRow
{
display: table-row;
}
.mx_UserNotifSettings_inputCell {
display: table-cell;
padding-bottom: 21px;
padding-right: 8px;
width: 16px;
}
.mx_UserNotifSettings_labelCell
{
padding-bottom: 21px;
width: 270px;
display: table-cell;
}
.mx_UserNotifSettings_pushRulesTableWrapper {
padding-bottom: 21px;
}
.mx_UserNotifSettings_pushRulesTable {
width: 100%;
table-layout: fixed;
}
.mx_UserNotifSettings_pushRulesTable thead {
font-weight: bold;
font-size: 15px;
}
.mx_UserNotifSettings_pushRulesTable tbody th {
font-weight: 400;
font-size: 15px;
}
.mx_UserNotifSettings_pushRulesTable tbody th:first-child {
text-align: left;
}
.mx_UserNotifSettings_keywords {
cursor: pointer;
color: #76cfa6;
}