mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Merge branch 'master' into development

Browse source
This commit is contained in:
Scott Nonnenberg 2018-03-01 14:13:00 -08:00
commit e40bd8d348
No known key found for this signature in database
GPG key ID: A4931C09644C654B
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/menu.js
View file

@ -245,8 +245,9 @@ function updateForMac(template, messages, options) {
); );
// Replace Window menu // Replace Window menu
const windowIndex = options.includeSetup ? 4 : 3;
// eslint-disable-next-line no-param-reassign // eslint-disable-next-line no-param-reassign
template[3].submenu = [ template[windowIndex].submenu = [
{ {
accelerator: 'CmdOrCtrl+W', accelerator: 'CmdOrCtrl+W',
role: 'close', role: 'close',

2
package.json
View file

@ -3,7 +3,7 @@
"productName": "Signal", "productName": "Signal",
"description": "Private messaging from your desktop", "description": "Private messaging from your desktop",
"repository": "https://github.com/signalapp/Signal-Desktop.git", "repository": "https://github.com/signalapp/Signal-Desktop.git",
"version": "1.5.1", "version": "1.5.2",
"license": "GPL-3.0", "license": "GPL-3.0",
"author": { "author": {
"name": "Open Whisper Systems", "name": "Open Whisper Systems",

1
stylesheets/_global.scss
View file

@ -610,7 +610,6 @@ input[type=text], input[type=search], textarea {
} }
.full-screen-flow { .full-screen-flow {
z-index: 1000;
position: absolute; position: absolute;
left: 0; left: 0;
right: 0; right: 0;