diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ee5466a69..9795e48b9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -63,7 +63,7 @@ yarn install --frozen-lockfile # Install and build dependencies (this will take yarn grunt # Generate final JS and CSS assets yarn icon-gen # Generate full set of icons for Electron yarn test # A good idea to make sure tests run first -yarn start # Start Session Messenger! +yarn start # Start Session! ``` You'll need to restart the application regularly to see your changes, as there @@ -84,7 +84,7 @@ yarn grunt dev # runs until you stop it, re-generating built assets on file chan ## Additional storage profiles -Since there is no registration for Session Messenger, you can create as many accounts as you +Since there is no registration for Session, you can create as many accounts as you can public keys. To test the P2P functionality on the same machine, however, requries that each client binds their message server to a different port. diff --git a/README.md b/README.md index 9f6330131..6175fa925 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# Session Messenger +# Session [![Build Status](https://travis-ci.org/loki-project/loki-messenger.svg?branch=development)](https://travis-ci.org/loki-project/loki-messenger) -Session Messenger allows for truly decentralized, end to end, and private encrypted chats. Session Messenger is built to handle both online and fully Asynchronous offline messages. Loki messenger implements the Signal protocol for message encryption. Our Client interface is a fork of [Signal Messenger](https://signal.org/). All communication that passes through Loki messenger is routed through [Lokinet](https://github.com/loki-project/loki-network). +Session allows for truly decentralized, end to end, and private encrypted chats. Session is built to handle both online and fully Asynchronous offline messages. Loki messenger implements the Signal protocol for message encryption. Our Client interface is a fork of [Signal Messenger](https://signal.org/). All communication that passes through Loki messenger is routed through [Lokinet](https://github.com/loki-project/loki-network). ## Summary @@ -14,11 +14,11 @@ If Alice and Bob are both online they can simply resolve each others public keys **Offline messages** -Offline messaging uses Swarms, given any users public key the user can resolve a public key to a specific grouping of Service Nodes (AKA Swarm) each user in Session Messenger belongs to a Swarm. When routing a message offline the user selects a Service node in the destination users Swarm, when the user comes online they query any node in their Swarm, if the Swarm is holding any messages for the user they disseminate those messages to the user. +Offline messaging uses Swarms, given any users public key the user can resolve a public key to a specific grouping of Service Nodes (AKA Swarm) each user in Session belongs to a Swarm. When routing a message offline the user selects a Service node in the destination users Swarm, when the user comes online they query any node in their Swarm, if the Swarm is holding any messages for the user they disseminate those messages to the user. ![Swarm Messaging](https://i.imgur.com/o13Knds.png) -Spam protections for Session Messenger are based on a Proof of Work which is attached to any message that exceeds a default size or Time To Live, this process is discussed further in the [Loki whitepaper](https://loki.network/whitepaper). +Spam protections for Session are based on a Proof of Work which is attached to any message that exceeds a default size or Time To Live, this process is discussed further in the [Loki whitepaper](https://loki.network/whitepaper). ## Want to Contribute? Found a Bug or Have a feature request? diff --git a/_locales/ar/messages.json b/_locales/ar/messages.json index 993a39213..990d0b237 100644 --- a/_locales/ar/messages.json +++ b/_locales/ar/messages.json @@ -52,7 +52,7 @@ "description": "Application menu command to show all application windows" }, "appMenuQuit": { - "message": "Quit Session Messenger", + "message": "Quit Session", "description": "Application menu command to close the application" }, "editMenuUndo": { diff --git a/_locales/bg/messages.json b/_locales/bg/messages.json index cf82f467d..57ba10be6 100644 --- a/_locales/bg/messages.json +++ b/_locales/bg/messages.json @@ -52,7 +52,7 @@ "description": "Application menu command to show all application windows" }, "appMenuQuit": { - "message": "Quit Session Messenger", + "message": "Quit Session", "description": "Application menu command to close the application" }, "editMenuUndo": { diff --git a/_locales/cs/messages.json b/_locales/cs/messages.json index 2954a7f02..4a62d77cc 100644 --- a/_locales/cs/messages.json +++ b/_locales/cs/messages.json @@ -52,7 +52,7 @@ "description": "Application menu command to show all application windows" }, "appMenuQuit": { - "message": "Opustit Session Messenger", + "message": "Opustit Session", "description": "Application menu command to close the application" }, "editMenuUndo": { diff --git a/_locales/en/messages.json b/_locales/en/messages.json index a02f1d40f..a148d2ef1 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -66,7 +66,7 @@ "description": "Application menu command to show all application windows" }, "appMenuQuit": { - "message": "Quit Session Messenger", + "message": "Quit Session", "description": "Application menu command to close the application" }, "editMenuUndo": { @@ -265,7 +265,7 @@ "Header shown on the screen at the end of a successful import process" }, "importCompleteStartButton": { - "message": "Start using Session Messenger", + "message": "Start using Session", "description": "Button shown at end of successful import process, nothing left but a restart" }, @@ -295,6 +295,9 @@ } } }, + "capsLockOn": { + "message": "Caps lock is on." + }, "me": { "message": "Me", "description": "The label for yourself when shown in a group member list" @@ -719,12 +722,12 @@ "Item under the Help menu, takes you to GitHub new issue form (title case)" }, "signalDesktopPreferences": { - "message": "Session Messenger Preferences", + "message": "Session Preferences", "description": "Title of the window that pops up with Signal Desktop preferences in it" }, "aboutSignalDesktop": { - "message": "About Session Messenger", + "message": "About Session", "description": "Item under the Help menu, which opens a small about window" }, "speech": { @@ -745,7 +748,7 @@ "description": "Command in the tray icon menu, to quit the application" }, "lokiMessenger": { - "message": "Session Messenger" + "message": "Session" }, "search": { "message": "Search", @@ -895,7 +898,7 @@ }, "audioPermissionNeeded": { "message": - "To send audio messages, allow Session Messenger to access your microphone.", + "To send audio messages, allow Session to access your microphone.", "description": "Shown if the user attempts to send an audio message without audio permssions turned on" }, @@ -1093,7 +1096,7 @@ "Placeholder text in the message entry field when it is disabled while we are waiting for a friend request approval" }, "sendMessageFriendRequest": { - "message": "Hi there! This is !", + "message": "Hi there! This is ...!", "description": "Placeholder text in the message entry field when it is the first message sent to that contact" }, @@ -1169,7 +1172,7 @@ "Confirmation dialog title that asks the user if they really wish to delete a public channel. Answer buttons use the strings 'ok' and 'cancel'. The deletion is permanent, i.e. it cannot be undone." }, "deletePublicChannelConfirmation": { - "message": "Leave this public channel?", + "message": "Leave this Open Group?", "description": "Confirmation dialog text that tells the user what will happen if they leave the public channel." }, @@ -1212,7 +1215,7 @@ "This is a past tense, informational message. In other words, your secure session has been reset." }, "betaDisclaimerTitle": { - "message": "Thanks for using Session Messenger!", + "message": "Thanks for using Session!", "description": "Title for beta disclaimer modal" }, "betaDisclaimerSubtitle": { @@ -1273,7 +1276,7 @@ } }, "installWelcome": { - "message": "Welcome to Session Messenger", + "message": "Welcome to Session", "description": "Welcome title on the install page" }, "installTagline": { @@ -1282,12 +1285,12 @@ "Tagline displayed under 'installWelcome' string on the install page" }, "linkYourPhone": { - "message": "Link your phone to Session Messenger", + "message": "Link your phone to Session", "description": "Shown on the front page when the application first starst, above the QR code" }, "signalSettings": { - "message": "Session Messenger Settings", + "message": "Session Settings", "description": "Used in the guidance to help people find the 'link new device' area of their Signal mobile app" }, @@ -1507,7 +1510,7 @@ }, "expiredWarning": { "message": - "This version of Session Messenger has expired. Please upgrade to the latest version to continue messaging.", + "This version of Session has expired. Please upgrade to the latest version to continue messaging.", "description": "Warning notification that this version of the app has expired" }, diff --git a/_locales/es_419/messages.json b/_locales/es_419/messages.json index cf464767c..bc939dfbe 100644 --- a/_locales/es_419/messages.json +++ b/_locales/es_419/messages.json @@ -36,7 +36,7 @@ "description": "Application menu command to show all application windows" }, "appMenuQuit": { - "message": "Quit Session Messenger", + "message": "Quit Session", "description": "Application menu command to close the application" }, "editMenuUndo": { diff --git a/_locales/hi/messages.json b/_locales/hi/messages.json index 79cd0bd2f..2cb546554 100644 --- a/_locales/hi/messages.json +++ b/_locales/hi/messages.json @@ -52,7 +52,7 @@ "description": "Application menu command to show all application windows" }, "appMenuQuit": { - "message": "Quit Session Messenger", + "message": "Quit Session", "description": "Application menu command to close the application" }, "editMenuUndo": { diff --git a/_locales/hr/messages.json b/_locales/hr/messages.json index 7fd8f3751..d9f250898 100644 --- a/_locales/hr/messages.json +++ b/_locales/hr/messages.json @@ -52,7 +52,7 @@ "description": "Application menu command to show all application windows" }, "appMenuQuit": { - "message": "Quit Session Messenger", + "message": "Quit Session", "description": "Application menu command to close the application" }, "editMenuUndo": { diff --git a/_locales/kn/messages.json b/_locales/kn/messages.json index ebf75f012..060936e14 100644 --- a/_locales/kn/messages.json +++ b/_locales/kn/messages.json @@ -52,7 +52,7 @@ "description": "Application menu command to show all application windows" }, "appMenuQuit": { - "message": "Quit Session Messenger", + "message": "Quit Session", "description": "Application menu command to close the application" }, "editMenuUndo": { diff --git a/_locales/ko/messages.json b/_locales/ko/messages.json index 3490d6cd5..87d8210ea 100644 --- a/_locales/ko/messages.json +++ b/_locales/ko/messages.json @@ -52,7 +52,7 @@ "description": "Application menu command to show all application windows" }, "appMenuQuit": { - "message": "Quit Session Messenger", + "message": "Quit Session", "description": "Application menu command to close the application" }, "editMenuUndo": { diff --git a/_locales/mk/messages.json b/_locales/mk/messages.json index 918606845..96f9489c9 100644 --- a/_locales/mk/messages.json +++ b/_locales/mk/messages.json @@ -52,7 +52,7 @@ "description": "Application menu command to show all application windows" }, "appMenuQuit": { - "message": "Quit Session Messenger", + "message": "Quit Session", "description": "Application menu command to close the application" }, "editMenuUndo": { diff --git a/_locales/sr/messages.json b/_locales/sr/messages.json index 0e31da6f0..0c134955a 100644 --- a/_locales/sr/messages.json +++ b/_locales/sr/messages.json @@ -52,7 +52,7 @@ "description": "Application menu command to show all application windows" }, "appMenuQuit": { - "message": "Quit Session Messenger", + "message": "Quit Session", "description": "Application menu command to close the application" }, "editMenuUndo": { diff --git a/_locales/uk/messages.json b/_locales/uk/messages.json index 1722f6c01..00c23e90d 100644 --- a/_locales/uk/messages.json +++ b/_locales/uk/messages.json @@ -52,7 +52,7 @@ "description": "Application menu command to show all application windows" }, "appMenuQuit": { - "message": "Quit Session Messenger", + "message": "Quit Session", "description": "Application menu command to close the application" }, "editMenuUndo": { diff --git a/_locales/vi/messages.json b/_locales/vi/messages.json index d82d41e12..5ef1b70a2 100644 --- a/_locales/vi/messages.json +++ b/_locales/vi/messages.json @@ -52,7 +52,7 @@ "description": "Application menu command to show all application windows" }, "appMenuQuit": { - "message": "Quit Session Messenger", + "message": "Quit Session", "description": "Application menu command to close the application" }, "editMenuUndo": { diff --git a/app/sql.js b/app/sql.js index 0caf3c3fa..f84ac2373 100644 --- a/app/sql.js +++ b/app/sql.js @@ -902,7 +902,7 @@ async function updateToLokiSchemaVersion1(currentVersion, instance) { rssFeed: 'https://loki.network/feed/', closable: true, name: 'Loki.network News', - profileAvatar: 'images/loki/loki_icon.png', + profileAvatar: 'images/loki/session_icon.png', }; const updatesRssFeedData = { @@ -911,7 +911,7 @@ async function updateToLokiSchemaVersion1(currentVersion, instance) { rssFeed: 'https://loki.network/category/messenger-updates/feed/', closable: false, name: 'Messenger updates', - profileAvatar: 'images/loki/loki_icon.png', + profileAvatar: 'images/loki/session_icon.png', }; const autoJoinLokiChats = false; diff --git a/background.html b/background.html index 401680d5f..7a137b73c 100644 --- a/background.html +++ b/background.html @@ -19,7 +19,7 @@ script-src 'self'; style-src 'self' 'unsafe-inline';" > - Session Messenger + Session diff --git a/fixtures/ghost-kitty.mp4 b/fixtures/ghost-kitty.mp4 deleted file mode 100644 index 936349ea5..000000000 Binary files a/fixtures/ghost-kitty.mp4 and /dev/null differ diff --git a/fixtures/pixabay-Soap-Bubble-7141.mp4 b/fixtures/pixabay-Soap-Bubble-7141.mp4 deleted file mode 100644 index f600bea00..000000000 Binary files a/fixtures/pixabay-Soap-Bubble-7141.mp4 and /dev/null differ diff --git a/images/icon_1024.png b/images/icon_1024.png index 37c4eb40b..5fe3a21d3 100644 Binary files a/images/icon_1024.png and b/images/icon_1024.png differ diff --git a/images/icon_128.png b/images/icon_128.png index 3e19b6988..f581c523c 100644 Binary files a/images/icon_128.png and b/images/icon_128.png differ diff --git a/images/icon_16.png b/images/icon_16.png index 427c6f5b4..e7a2f5150 100644 Binary files a/images/icon_16.png and b/images/icon_16.png differ diff --git a/images/icon_256.png b/images/icon_256.png index 826bd7984..027e60116 100644 Binary files a/images/icon_256.png and b/images/icon_256.png differ diff --git a/images/icon_32.png b/images/icon_32.png index 93455816b..8c138ea7e 100644 Binary files a/images/icon_32.png and b/images/icon_32.png differ diff --git a/images/icon_48.png b/images/icon_48.png index 147727eff..a9397fc88 100644 Binary files a/images/icon_48.png and b/images/icon_48.png differ diff --git a/images/loki/loki_icon.png b/images/loki/loki_icon.png deleted file mode 100644 index 71e3de339..000000000 Binary files a/images/loki/loki_icon.png and /dev/null differ diff --git a/images/loki/loki_icon_128.png b/images/loki/loki_icon_128.png deleted file mode 100644 index 1940490eb..000000000 Binary files a/images/loki/loki_icon_128.png and /dev/null differ diff --git a/images/loki/loki_icon_text.png b/images/loki/loki_icon_text.png deleted file mode 100644 index 9d79d6091..000000000 Binary files a/images/loki/loki_icon_text.png and /dev/null differ diff --git a/images/loki/session_icon.png b/images/loki/session_icon.png new file mode 100644 index 000000000..8555d93fe Binary files /dev/null and b/images/loki/session_icon.png differ diff --git a/images/loki/session_icon_128.png b/images/loki/session_icon_128.png new file mode 100644 index 000000000..e3a410547 Binary files /dev/null and b/images/loki/session_icon_128.png differ diff --git a/js/background.js b/js/background.js index 883501299..737355de4 100644 --- a/js/background.js +++ b/js/background.js @@ -122,7 +122,7 @@ 'x_white.svg', 'icon-paste.svg', 'loki/loki_icon_text.png', - 'loki/loki_icon_128.png', + 'loki/session_icon_128.png', ]); // Set server-client time difference diff --git a/js/modules/debuglogs.js b/js/modules/debuglogs.js index 5ef030a54..6bed2f0e4 100644 --- a/js/modules/debuglogs.js +++ b/js/modules/debuglogs.js @@ -6,7 +6,7 @@ const got = require('got'); const BASE_URL = 'https://debuglogs.org'; const VERSION = window.getVersion(); -const USER_AGENT = `Session Messenger ${VERSION}`; +const USER_AGENT = `Session ${VERSION}`; // Workaround: Submitting `FormData` using native `FormData::submit` procedure // as integration with `got` results in S3 error saying we haven’t set the diff --git a/js/modules/web_api.js b/js/modules/web_api.js index 973d37af6..7d446bace 100644 --- a/js/modules/web_api.js +++ b/js/modules/web_api.js @@ -222,7 +222,7 @@ function _promiseAjax(providedUrl, options) { method: options.type, body: options.data || null, headers: { - 'User-Agent': 'Session Messenger', + 'User-Agent': 'Session', 'X-Loki-Messenger-Agent': 'OWD', ...options.headers, }, diff --git a/js/notifications.js b/js/notifications.js index 2c532aebc..d053ea717 100644 --- a/js/notifications.js +++ b/js/notifications.js @@ -108,7 +108,7 @@ const last = this.last().toJSON(); switch (userSetting) { case SettingNames.COUNT: - title = 'Session Messenger'; + title = 'Session'; if (last.isFriendRequest) { message = `Friend request ${last.friendRequestType}`; diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js index c6fd292a8..64251e1f9 100644 --- a/js/views/conversation_view.js +++ b/js/views/conversation_view.js @@ -1738,8 +1738,12 @@ if (event.key !== 'Escape') { return; } + // TODO: this view is not always in focus (e.g. after I've selected a message), // so need to make Esc more robust + // Perhaps look into ConversationHeader.tsx and add an event listener in there. + // Up and down arrows should scroll + // Alt + up and down should swap between conversations / setting categories this.model.resetMessageSelection(); this.closeEmojiPanel(); }, diff --git a/libloki/test/snode_channel_test.js b/libloki/test/snode_channel_test.js index f17786f59..cb535c73e 100644 --- a/libloki/test/snode_channel_test.js +++ b/libloki/test/snode_channel_test.js @@ -75,7 +75,7 @@ describe('Snode Channel', () => { }); it('should encrypt data correctly', async () => { - // message sent by Session Messenger + // message sent by Session const snode = await generateSnodeKeysAndAddress(); const messageSent = 'I am Groot'; const textEncoder = new TextEncoder(); @@ -133,7 +133,7 @@ describe('Snode Channel', () => { const encryptedBase64 = dcodeIO.ByteBuffer.wrap(encrypted).toString( 'base64' ); - // message received by Session Messenger + // message received by Session const decrypted = await channel.decrypt(snode.address, encryptedBase64); assert.strictEqual(messageSent, decrypted); }); diff --git a/libtextsecure/outgoing_message.js b/libtextsecure/outgoing_message.js index a133c0bce..0a0de2c29 100644 --- a/libtextsecure/outgoing_message.js +++ b/libtextsecure/outgoing_message.js @@ -308,7 +308,7 @@ OutgoingMessage.prototype = { return Promise.all( devicesPubKeys.map(async devicePubKey => { - // Session Messenger doesn't use the deviceId scheme, it's always 1. + // Session doesn't use the deviceId scheme, it's always 1. // Instead, there are multiple device public keys. const deviceId = 1; const updatedDevices = await this.getStaleDeviceIdsForNumber( diff --git a/package.json b/package.json index c0e0fd125..3fb07d135 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "name": "session-messenger-desktop", - "productName": "Session Messenger", + "productName": "Session", "description": "Private messaging from your desktop", "repository": "https://github.com/loki-project/loki-messenger.git", - "version": "1.0.0-beta10", + "version": "1.0.0", "license": "GPL-3.0", "author": { "name": "Loki Project", @@ -240,7 +240,7 @@ "linux": { "category": "Network", "desktop": { - "StartupWMClass": "Session Messenger" + "StartupWMClass": "Session" }, "asarUnpack": "node_modules/spellchecker/vendor/hunspell_dictionaries", "target": [ diff --git a/prepare_beta_build.js b/prepare_beta_build.js index 8809e6712..13e297297 100644 --- a/prepare_beta_build.js +++ b/prepare_beta_build.js @@ -27,16 +27,16 @@ const PRODUCTION_NAME = 'loki-messenger-desktop'; const BETA_NAME = 'loki-messenger-desktop-beta'; const PRODUCT_NAME_PATH = 'productName'; -const PRODUCTION_PRODUCT_NAME = 'Session Messenger'; -const BETA_PRODUCT_NAME = 'Session Messenger Beta'; +const PRODUCTION_PRODUCT_NAME = 'Session'; +const BETA_PRODUCT_NAME = 'Session Beta'; const APP_ID_PATH = 'build.appId'; const PRODUCTION_APP_ID = 'com.loki-project.messenger-desktop'; const BETA_APP_ID = 'com.loki-project.messenger-desktop-beta'; const STARTUP_WM_CLASS_PATH = 'build.linux.desktop.StartupWMClass'; -const PRODUCTION_STARTUP_WM_CLASS = 'Session Messenger'; -const BETA_STARTUP_WM_CLASS = 'Session Messenger Beta'; +const PRODUCTION_STARTUP_WM_CLASS = 'Session'; +const BETA_STARTUP_WM_CLASS = 'Session Beta'; // ------- diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss index c482b7a82..2336bc93c 100644 --- a/stylesheets/_modules.scss +++ b/stylesheets/_modules.scss @@ -1469,6 +1469,7 @@ } .module-conversation-header__avatar { + cursor: pointer; min-width: 28px; user-select: none; } @@ -1735,6 +1736,7 @@ // Module: Document List Item .module-document-list-item { + padding-right: 10px; width: 100%; height: 72px; } @@ -2595,7 +2597,7 @@ .module-typing-animation { display: inline-flex; - flex-directin: row; + flex-direction: row; align-items: center; height: 8px; diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss index 2190342e7..957e416cb 100644 --- a/stylesheets/_session.scss +++ b/stylesheets/_session.scss @@ -476,6 +476,12 @@ $session-element-border-green: 4px solid $session-color-green; width: 100%; display: flex; + &-text { + @include session-color-subtle($session-color-white); + font-family: 'SF Pro Text'; + font-weight: 300; + } + .module-contact-name { width: 100%; } @@ -1277,6 +1283,10 @@ label { } } +.dark-theme .bottom-bar .send-message[disabled='disabled'] { + background: $session-shade-4 !important; +} + .session-radio-group fieldset { border: none; margin-left: $session-margin-sm; @@ -1325,15 +1335,16 @@ label { } .session-id-editable { - resize: none; - overflow: hidden; -} + padding: $session-margin-lg; -.user-details-dialog { - .session-id-editable { + textarea { width: 30vh; } } +.session-id-editable textarea { + resize: none; + overflow: hidden; +} input { user-select: text; diff --git a/stylesheets/_session_group_panel.scss b/stylesheets/_session_group_panel.scss index a719c4c18..9cf26d536 100644 --- a/stylesheets/_session_group_panel.scss +++ b/stylesheets/_session_group_panel.scss @@ -79,8 +79,15 @@ } .module-attachment-section__items { - display: grid; - grid-template-columns: repeat(3, 1fr); + &-media { + display: grid; + grid-template-columns: repeat(3, 1fr); + width: 100%; + } + + &-documents { + width: 100%; + } } .module-media { diff --git a/stylesheets/_session_left_pane.scss b/stylesheets/_session_left_pane.scss index 326139ea9..8379fa2d7 100644 --- a/stylesheets/_session_left_pane.scss +++ b/stylesheets/_session_left_pane.scss @@ -296,7 +296,7 @@ $session-compose-margin: 20px; margin: 0px 20px; } - .session-id-editable { + .session-id-editable textarea::-webkit-inner-spin-button { margin: 0px 20px; width: -webkit-fill-available; flex-shrink: 0; @@ -362,6 +362,7 @@ $session-compose-margin: 20px; height: inherit; border: none; flex-grow: 1; + font-size: $session-font-md; &:focus { outline: none !important; diff --git a/stylesheets/_session_signin.scss b/stylesheets/_session_signin.scss index d74ac66d6..fce598e06 100644 --- a/stylesheets/_session_signin.scss +++ b/stylesheets/_session_signin.scss @@ -224,22 +224,30 @@ } &-id-editable { + display: flex; + align-items: center; + justify-content: center; height: 94px; - width: 100%; + padding: 20px; border-radius: 8px; - border: 2px solid $session-color-dark-grey; - outline: 0; - background: transparent; - color: $session-color-white; - font-size: 15px; - line-height: 18px; - text-align: center; + border: 2px solid #353535; margin-bottom: 20px; - overflow-wrap: break-word; - padding: 20px 5px 20px 5px; - display: inline-block; - font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace; - user-select: all; + + textarea { + width: 100%; + outline: 0; + border: none; + background: transparent; + color: #fff; + font-size: 15px; + line-height: 18px; + text-align: center; + overflow-wrap: break-word; + padding: 20px 5px 20px 5px; + display: inline-block; + font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace; + user-select: all; + } } } diff --git a/test/app/fixtures/menu-mac-os-setup.json b/test/app/fixtures/menu-mac-os-setup.json index 3d6d65f13..861511f8a 100644 --- a/test/app/fixtures/menu-mac-os-setup.json +++ b/test/app/fixtures/menu-mac-os-setup.json @@ -1,9 +1,9 @@ [ { - "label": "Session Messenger", + "label": "Session", "submenu": [ { - "label": "About Session Messenger", + "label": "About Session", "click": null }, { @@ -28,7 +28,7 @@ "type": "separator" }, { - "label": "Quit Session Messenger", + "label": "Quit Session", "role": "quit" } ] diff --git a/test/app/fixtures/menu-mac-os.json b/test/app/fixtures/menu-mac-os.json index 4d9f91080..b2ea56aaf 100644 --- a/test/app/fixtures/menu-mac-os.json +++ b/test/app/fixtures/menu-mac-os.json @@ -1,9 +1,9 @@ [ { - "label": "Session Messenger", + "label": "Session", "submenu": [ { - "label": "About Session Messenger", + "label": "About Session", "click": null }, { @@ -28,7 +28,7 @@ "type": "separator" }, { - "label": "Quit Session Messenger", + "label": "Quit Session", "role": "quit" } ] diff --git a/test/app/fixtures/menu-windows-linux-setup.json b/test/app/fixtures/menu-windows-linux-setup.json index 5bc5542d2..e72303d39 100644 --- a/test/app/fixtures/menu-windows-linux-setup.json +++ b/test/app/fixtures/menu-windows-linux-setup.json @@ -17,7 +17,7 @@ "type": "separator" }, { - "label": "Quit Session Messenger", + "label": "Quit Session", "role": "quit" } ] @@ -134,7 +134,7 @@ "type": "separator" }, { - "label": "About Session Messenger", + "label": "About Session", "click": null } ] diff --git a/test/app/fixtures/menu-windows-linux.json b/test/app/fixtures/menu-windows-linux.json index 9926da812..aa6a1171d 100644 --- a/test/app/fixtures/menu-windows-linux.json +++ b/test/app/fixtures/menu-windows-linux.json @@ -6,7 +6,7 @@ "type": "separator" }, { - "label": "Quit Session Messenger", + "label": "Quit Session", "role": "quit" } ] @@ -123,7 +123,7 @@ "type": "separator" }, { - "label": "About Session Messenger", + "label": "About Session", "click": null } ] diff --git a/test/index.html b/test/index.html index c883b598e..fd200152f 100644 --- a/test/index.html +++ b/test/index.html @@ -146,15 +146,15 @@