gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into dbkr/electron_dist_tweaks

This commit is contained in:
David Baker 2016-12-02 14:32:31 +00:00
parent f1998497f2 d5a5abe202
commit 970a029cea
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
README.md
View File

@ -59,16 +59,16 @@ to build.
web server. web server.
Note that `npm run dist` is not supported on Windows, so Windows users can run `npm Note that `npm run dist` is not supported on Windows, so Windows users can run `npm
run build`, which will build all the necessary files into the `vector` run build`, which will build all the necessary files into the `webapp`
directory. The version of Vector will not appear in Settings without directory. The version of Riot will not appear in Settings without
using the dist script. You can then mount the vector directory on your using the dist script. You can then mount the `webapp` directory on your
webserver to actually serve up the app, which is entirely static content. webserver to actually serve up the app, which is entirely static content.
config.json config.json
=========== ===========
You can configure the app by copying `vector/config.sample.json` to You can configure the app by copying `config.sample.json` to
`vector/config.json` and customising it: `config.json` and customising it:
1. `default_hs_url` is the default home server url. 1. `default_hs_url` is the default home server url.
1. `default_is_url` is the default identity server url (this is the server used 1. `default_is_url` is the default identity server url (this is the server used
@ -110,6 +110,11 @@ You can configure the app by copying `vector/config.sample.json` to
1. `update_base_url` (electron app only): HTTPS URL to a web server to download 1. `update_base_url` (electron app only): HTTPS URL to a web server to download
updates from. This should be the path to the directory containing `install` updates from. This should be the path to the directory containing `install`
and `update`. and `update`.
1. `cross_origin_renderer_url`: URL to a static HTML page hosting code to help display
encrypted file attachments. This MUST be hosted on a completely separate domain to
anything else since it is used to isolate the privileges of file attachments to this
domain. Default: `usercontent.riot.im`. This needs to contain v1.html from
https://github.com/matrix-org/usercontent/blob/master/v1.html
Running as a Desktop app Running as a Desktop app
======================== ========================

14
src/skins/vector/css/matrix-react-sdk/views/messages/MImageBody.css
View File

@ -44,3 +44,17 @@ limitations under the License.
vertical-align: middle; vertical-align: middle;
pointer-events: none; pointer-events: none;
} }
/* Remove the border and padding for iframes for download links. */
.mx_MImageBody_download iframe {
margin: 0px;
padding: 0px;
border: none;
width: 100%;
/* Set the height of the iframe to be 1 line of text.
* Iframes don't automatically size themselves to fit their content.
* So either we have to fix the height of the iframe using CSS or
* use javascript's cross-origin postMessage API to communicate how
* big the content of the iframe is. */
height: 1.5em;
}