Skip to content

Commit 939733b

Browse files
dbkrdbkr
committed
Merge branch 'develop' into require-css
2 parents 7ff5e42 + 6db1151 commit 939733b

File tree

12 files changed

+183
-102
lines changed

12 files changed

+183
-102
lines changed

‎package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
},
1010
"license": "Apache-2.0",
1111
"style": "bundle.css",
12+
"matrix-react-parent": "matrix-react-sdk",
1213
"scripts": {
13-
"reskindex": "reskindex vector -h src/skins/vector/header",
14+
"reskindex": "reskindex -h src/header",
1415
"build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
1516
"build:css": "catw \"src/skins/vector/css/**/*.css\" -o vector/components.css --no-watch",
1617
"build:compile": "babel --source-maps -d lib src",
@@ -30,7 +31,7 @@
3031
"flux": "~2.0.3",
3132
"gemini-scrollbar": "^1.3.0",
3233
"gfm.css": "^1.1.1",
33-
"highlight.js": "^8.9.1",
34+
"highlight.js": "^9.0.0",
3435
"linkifyjs": "^2.0.0-beta.4",
3536
"matrix-js-sdk": "https://github.com/matrix-org/matrix-js-sdk.git#develop",
3637
"matrix-react-sdk": "https://github.com/matrix-org/matrix-react-sdk.git#develop",

‎src/component-index.js‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
/*
2+
Copyright 2015 OpenMarket Ltd
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
/*
18+
* THIS FILE IS AUTO-GENERATED
19+
* You can edit it you like, but your changes will be overwritten,
20+
* so you'd just be trying to swim upstream like a salmon.
21+
* You are not a salmon.
22+
*/
23+
24+
module.exports.components = require('matrix-react-sdk/lib/component-index').components;
25+
26+
module.exports.components['structures.BottomLeftMenu'] = require('./components/structures/BottomLeftMenu');
27+
module.exports.components['structures.CompatibilityPage'] = require('./components/structures/CompatibilityPage');
28+
module.exports.components['structures.LeftPanel'] = require('./components/structures/LeftPanel');
29+
module.exports.components['structures.RightPanel'] = require('./components/structures/RightPanel');
30+
module.exports.components['structures.RoomDirectory'] = require('./components/structures/RoomDirectory');
31+
module.exports.components['structures.RoomSubList'] = require('./components/structures/RoomSubList');
32+
module.exports.components['structures.ViewSource'] = require('./components/structures/ViewSource');
33+
module.exports.components['views.elements.ImageView'] = require('./components/views/elements/ImageView');
34+
module.exports.components['views.elements.Spinner'] = require('./components/views/elements/Spinner');
35+
module.exports.components['views.globals.MatrixToolbar'] = require('./components/views/globals/MatrixToolbar');
36+
module.exports.components['views.login.CustomServerDialog'] = require('./components/views/login/VectorCustomServerDialog');
37+
module.exports.components['views.login.LoginFooter'] = require('./components/views/login/VectorLoginFooter');
38+
module.exports.components['views.login.LoginHeader'] = require('./components/views/login/VectorLoginHeader');
39+
module.exports.components['views.messages.DateSeparator'] = require('./components/views/messages/DateSeparator');
40+
module.exports.components['views.messages.MessageTimestamp'] = require('./components/views/messages/MessageTimestamp');
41+
module.exports.components['views.messages.SenderProfile'] = require('./components/views/messages/SenderProfile');
42+
module.exports.components['views.rooms.BottomLeftMenuTile'] = require('./components/views/rooms/BottomLeftMenuTile');
43+
module.exports.components['views.rooms.MessageContextMenu'] = require('./components/views/rooms/MessageContextMenu');
44+
module.exports.components['views.rooms.RoomDNDView'] = require('./components/views/rooms/RoomDNDView');
45+
module.exports.components['views.rooms.RoomDropTarget'] = require('./components/views/rooms/RoomDropTarget');
46+
module.exports.components['views.rooms.RoomTooltip'] = require('./components/views/rooms/RoomTooltip');
47+
module.exports.components['views.rooms.SearchBar'] = require('./components/views/rooms/SearchBar');

‎src/components/views/login/VectorCustomServerDialog.js‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
/*
2+
Copyright 2015 OpenMarket Ltd
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
var React = require("react");
18+
19+
module.exports = React.createClass({
20+
displayName: 'VectorCustomServerDialog',
21+
statics: {
22+
replaces: 'CustomServerDialog',
23+
},
24+
25+
render: function() {
26+
return (
27+
<div className="mx_ErrorDialog">
28+
<div className="mx_ErrorDialogTitle">
29+
Custom Server Options
30+
</div>
31+
<div className="mx_Dialog_content">
32+
<span>
33+
You can use the custom server options to log into other Matrix
34+
servers by specifying a different Home server URL.
35+
<br/>
36+
This allows you to use Vector with an existing Matrix account on
37+
a different Home server.
38+
<br/>
39+
<br/>
40+
You can also set a custom Identity server but this will affect
41+
people&#39;s ability to find you if you use a server in a group other
42+
than the main Matrix.org group.
43+
</span>
44+
</div>
45+
<div className="mx_Dialog_buttons">
46+
<button onClick={this.props.onFinished} autoFocus={true}>
47+
Dismiss
48+
</button>
49+
</div>
50+
</div>
51+
);
52+
}
53+
});

‎src/components/views/login/VectorLoginFooter.js‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
/*
2+
Copyright 2015 OpenMarket Ltd
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
'use strict';
18+
19+
var React = require('react');
20+
21+
module.exports = React.createClass({
22+
displayName: 'VectorLoginFooter',
23+
statics: {
24+
replaces: 'LoginFooter',
25+
},
26+
27+
render: function() {
28+
return (
29+
<div className="mx_Login_links">
30+
<a href="https://medium.com/@Vector">blog</a>&nbsp;&nbsp;&middot;&nbsp;&nbsp;
31+
<a href="https://twitter.com/@VectorCo">twitter</a>&nbsp;&nbsp;&middot;&nbsp;&nbsp;
32+
<a href="https://github.com/vector-im/vector-web">github</a>&nbsp;&nbsp;&middot;&nbsp;&nbsp;
33+
<a href="https://matrix.org">powered by Matrix</a>
34+
</div>
35+
);
36+
}
37+
});

‎src/components/views/login/VectorLoginHeader.js‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/*
2+
Copyright 2015 OpenMarket Ltd
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
'use strict';
18+
19+
var React = require('react');
20+
21+
module.exports = React.createClass({
22+
displayName: 'VectorLoginHeader',
23+
statics: {
24+
replaces: 'LoginHeader',
25+
},
26+
27+
render: function() {
28+
return (
29+
<div className="mx_Login_logo">
30+
<img src="img/logo.png" width="249" height="78" alt="vector"/>
31+
</div>
32+
);
33+
}
34+
});

‎src/components/views/rooms/RoomDNDView.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,4 +201,6 @@ DragSource('RoomTile', roomTileSource, function(connect, monitor) {
201201
// You can ask the monitor about the current drag state:
202202
isDragging: monitor.isDragging()
203203
};
204-
})(RoomTile));
204+
})(RoomTile));
205+
206+
module.exports.replaces = 'RoomTile';

src/skins/vector/header renamed to src/header

File renamed without changes.

‎src/skins/vector/css/molecules/EventTile.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ limitations under the License.
7575
font-family: inherit ! important;
7676
white-space: normal ! important;
7777
line-height: inherit ! important;
78+
color: inherit;
7879
font-size: 15px;
7980
}
8081

‎src/skins/vector/css/molecules/RoomTile.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,10 @@ limitations under the License.
112112
color: #76cfa6 ! important;
113113
}
114114

115+
.mx_RoomTile_highlight .mx_RoomTile_name {
116+
color: #ff0064 ! important;
117+
}
118+
115119
.mx_RoomTile.mx_RoomTile_selected .mx_RoomTile_name {
116120
background: url('img/selected.png');
117121
background-repeat: no-repeat;

‎src/skins/vector/skindex.js‎

Lines changed: 0 additions & 95 deletions
This file was deleted.

0 commit comments

Comments
 (0)