Merge branch 'develop' into wmwragg/one-to-one-chat

This commit is contained in:
wmwragg 2016-09-05 12:07:21 +01:00
commit 059f5198e5
9 changed files with 34 additions and 18 deletions

View File

@ -1,3 +1,16 @@
Changes in [0.7.5-r3](https://github.com/vector-im/vector-web/releases/tag/v0.7.5-r3) (2016-09-02)
==================================================================================================
[Full Changelog](https://github.com/vector-im/vector-web/compare/v0.7.5-r2...v0.7.5-r3)
* Bump to matrix-react-sdk 0.6.5-r3 in order to fix bug #2020 (tightloop when flooded with join events)
Changes in [0.7.5-r2](https://github.com/vector-im/vector-web/releases/tag/v0.7.5-r2) (2016-09-01)
==================================================================================================
[Full Changelog](https://github.com/vector-im/vector-web/compare/v0.7.5-r1...v0.7.5-r2)
* Bump to matrix-react-sdk 0.6.5-r1 in order to fix guest access
Changes in [0.7.5-r1](https://github.com/vector-im/vector-web/releases/tag/v0.7.5-r1) (2016-08-28) Changes in [0.7.5-r1](https://github.com/vector-im/vector-web/releases/tag/v0.7.5-r1) (2016-08-28)
================================================================================================== ==================================================================================================
[Full Changelog](https://github.com/vector-im/vector-web/compare/v0.7.5...v0.7.5-r1) [Full Changelog](https://github.com/vector-im/vector-web/compare/v0.7.5...v0.7.5-r1)

View File

@ -1,6 +1,6 @@
{ {
"name": "vector-web", "name": "vector-web",
"version": "0.7.5-r1", "version": "0.7.5-r3",
"description": "Vector webapp", "description": "Vector webapp",
"author": "matrix.org", "author": "matrix.org",
"repository": { "repository": {
@ -90,6 +90,6 @@
"webpack": "^1.12.14" "webpack": "^1.12.14"
}, },
"optionalDependencies": { "optionalDependencies": {
"olm": "https://matrix.org/packages/npm/olm/olm-1.0.0.tgz" "olm": "https://matrix.org/packages/npm/olm/olm-1.1.0.tgz"
} }
} }

View File

@ -50,9 +50,11 @@ export default class ChangelogDialog extends React.Component {
return ( return (
<div key={repo}> <div key={repo}>
<h2>{repo}</h2> <h2>{repo}</h2>
<ul>
{this.state[repo].map(commit => {this.state[repo].map(commit =>
<div key={commit.commit.url}><a href={commit.commit.url}>{commit.commit.message}</a></div> <li key={commit.commit.url} className="mx_ChangelogDialog_li"><a href={commit.commit.url}>{commit.commit.message}</a></li>
)} )}
</ul>
</div> </div>
) )
}); });

View File

@ -153,6 +153,8 @@ input[type=text]:focus, textarea:focus {
width: 60%; width: 60%;
max-width: 704px; max-width: 704px;
box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.2); box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.2);
max-height: 80%;
overflow-y: auto;
} }
.mx_Dialog_background { .mx_Dialog_background {

View File

@ -75,6 +75,7 @@ limitations under the License.
} }
.mx_RoomStatusBar_unreadMessagesBar { .mx_RoomStatusBar_unreadMessagesBar {
padding-top: 10px;
color: #ff0064; color: #ff0064;
cursor: pointer; cursor: pointer;
} }

View File

@ -278,3 +278,7 @@ hr.mx_RoomView_myReadMarker {
padding: 6px 0; padding: 6px 0;
cursor: pointer; cursor: pointer;
} }
.mx_RoomView_ongoingConfCallNotification a {
color: #fff ! important;
}

View File

@ -15,14 +15,9 @@ limitations under the License.
*/ */
.mx_MemberDeviceInfo { .mx_MemberDeviceInfo {
font-size: 12px; padding: 10px 0px;
display: table-row;
height: 17px;
} }
.mx_MemberDeviceInfo div {
display: table-cell;
}
.mx_MemberDeviceInfo_textButton { .mx_MemberDeviceInfo_textButton {
color: #fff; color: #fff;
@ -33,25 +28,25 @@ limitations under the License.
padding-right: 1em; padding-right: 1em;
cursor: pointer; cursor: pointer;
display: inline;
} }
.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_verified, .mx_MemberDeviceInfo div.mx_MemberDeviceInfo_verified,
.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_unverified, .mx_MemberDeviceInfo div.mx_MemberDeviceInfo_unverified,
.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_blocked { .mx_MemberDeviceInfo div.mx_MemberDeviceInfo_blocked {
color: #fff;
width: 17px; width: 17px;
border-radius: 17px; border-radius: 17px;
text-align: center; text-align: center;
} }
.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_verified { .mx_MemberDeviceInfo div.mx_MemberDeviceInfo_verified {
background-color: #76cfa6; color: #76cfa6;
} }
.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_unverified { .mx_MemberDeviceInfo div.mx_MemberDeviceInfo_unverified {
background-color: #eca46f; color: #b2b2b2;
} }
.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_blocked { .mx_MemberDeviceInfo div.mx_MemberDeviceInfo_blocked {
background-color: #e55e5e; color: #e55e5e;
} }

View File

@ -73,8 +73,3 @@ limitations under the License.
margin-left: 8px; margin-left: 8px;
line-height: 23px; line-height: 23px;
} }
.mx_MemberInfo_devices {
display: table;
border-spacing: 5px;
}

View File

@ -18,3 +18,7 @@ limitations under the License.
max-height: 300px; max-height: 300px;
overflow: auto; overflow: auto;
} }
.mx_ChangelogDialog_li {
padding: 0.2em;
}