Skip to content

Commit 059f519

Browse files
wmwraggwmwragg
committed
Merge branch 'develop' into wmwragg/one-to-one-chat
2 parents 2acbad3 + 5e9a95f commit 059f519

File tree

9 files changed

+34
-18
lines changed

9 files changed

+34
-18
lines changed

‎CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
Changes in [0.7.5-r3](https://github.com/vector-im/vector-web/releases/tag/v0.7.5-r3) (2016-09-02)
2+
==================================================================================================
3+
[Full Changelog](https://github.com/vector-im/vector-web/compare/v0.7.5-r2...v0.7.5-r3)
4+
5+
* Bump to matrix-react-sdk 0.6.5-r3 in order to fix bug #2020 (tightloop when flooded with join events)
6+
7+
8+
Changes in [0.7.5-r2](https://github.com/vector-im/vector-web/releases/tag/v0.7.5-r2) (2016-09-01)
9+
==================================================================================================
10+
[Full Changelog](https://github.com/vector-im/vector-web/compare/v0.7.5-r1...v0.7.5-r2)
11+
12+
* Bump to matrix-react-sdk 0.6.5-r1 in order to fix guest access
13+
114
Changes in [0.7.5-r1](https://github.com/vector-im/vector-web/releases/tag/v0.7.5-r1) (2016-08-28)
215
==================================================================================================
316
[Full Changelog](https://github.com/vector-im/vector-web/compare/v0.7.5...v0.7.5-r1)

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vector-web",
3-
"version": "0.7.5-r1",
3+
"version": "0.7.5-r3",
44
"description": "Vector webapp",
55
"author": "matrix.org",
66
"repository": {
@@ -90,6 +90,6 @@
9090
"webpack": "^1.12.14"
9191
},
9292
"optionalDependencies": {
93-
"olm": "https://matrix.org/packages/npm/olm/olm-1.0.0.tgz"
93+
"olm": "https://matrix.org/packages/npm/olm/olm-1.1.0.tgz"
9494
}
9595
}

‎src/components/views/dialogs/ChangelogDialog.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,11 @@ export default class ChangelogDialog extends React.Component {
5050
return (
5151
<div key={repo}>
5252
<h2>{repo}</h2>
53+
<ul>
5354
{this.state[repo].map(commit =>
54-
<div key={commit.commit.url}><a href={commit.commit.url}>{commit.commit.message}</a></div>
55+
<li key={commit.commit.url} className="mx_ChangelogDialog_li"><a href={commit.commit.url}>{commit.commit.message}</a></li>
5556
)}
57+
</ul>
5658
</div>
5759
)
5860
});

‎src/skins/vector/css/common.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,8 @@ input[type=text]:focus, textarea:focus {
153153
width: 60%;
154154
max-width: 704px;
155155
box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.2);
156+
max-height: 80%;
157+
overflow-y: auto;
156158
}
157159

158160
.mx_Dialog_background {

‎src/skins/vector/css/matrix-react-sdk/structures/RoomStatusBar.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ limitations under the License.
7575
}
7676

7777
.mx_RoomStatusBar_unreadMessagesBar {
78+
padding-top: 10px;
7879
color: #ff0064;
7980
cursor: pointer;
8081
}

‎src/skins/vector/css/matrix-react-sdk/structures/RoomView.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,3 +278,7 @@ hr.mx_RoomView_myReadMarker {
278278
padding: 6px 0;
279279
cursor: pointer;
280280
}
281+
282+
.mx_RoomView_ongoingConfCallNotification a {
283+
color: #fff ! important;
284+
}

‎src/skins/vector/css/matrix-react-sdk/views/rooms/MemberDeviceInfo.css

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,9 @@ limitations under the License.
1515
*/
1616

1717
.mx_MemberDeviceInfo {
18-
font-size: 12px;
19-
display: table-row;
20-
height: 17px;
18+
padding: 10px 0px;
2119
}
2220

23-
.mx_MemberDeviceInfo div {
24-
display: table-cell;
25-
}
2621

2722
.mx_MemberDeviceInfo_textButton {
2823
color: #fff;
@@ -33,25 +28,25 @@ limitations under the License.
3328
padding-right: 1em;
3429

3530
cursor: pointer;
31+
display: inline;
3632
}
3733

3834
.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_verified,
3935
.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_unverified,
4036
.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_blocked {
41-
color: #fff;
4237
width: 17px;
4338
border-radius: 17px;
4439
text-align: center;
4540
}
4641

4742
.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_verified {
48-
background-color: #76cfa6;
43+
color: #76cfa6;
4944
}
5045

5146
.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_unverified {
52-
background-color: #eca46f;
47+
color: #b2b2b2;
5348
}
5449

5550
.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_blocked {
56-
background-color: #e55e5e;
51+
color: #e55e5e;
5752
}

‎src/skins/vector/css/matrix-react-sdk/views/rooms/MemberInfo.css

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,3 @@ limitations under the License.
7373
margin-left: 8px;
7474
line-height: 23px;
7575
}
76-
77-
.mx_MemberInfo_devices {
78-
display: table;
79-
border-spacing: 5px;
80-
}

‎src/skins/vector/css/vector-web/views/dialogs/ChangelogDialog.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,7 @@ limitations under the License.
1818
max-height: 300px;
1919
overflow: auto;
2020
}
21+
22+
.mx_ChangelogDialog_li {
23+
padding: 0.2em;
24+
}

0 commit comments

Comments
 (0)