diff --git a/internal_packages/composer/menus/inbox-composer.cson b/internal_packages/composer/menus/inbox-composer.cson deleted file mode 100644 index aebda3449..000000000 --- a/internal_packages/composer/menus/inbox-composer.cson +++ /dev/null @@ -1,16 +0,0 @@ -# See https://atom.io/docs/latest/creating-a-package#menus for more details -'context-menu': - '.overlayer': - 'Enable composer': 'composer:toggle' - -'menu': [ - { - 'label': 'Packages' - 'submenu': [ - 'label': 'composer' - 'submenu': [ - { 'label': 'Toggle', 'command': 'composer:toggle' } - ] - ] - } -] diff --git a/internal_packages/inbox-activity-bar/lib/activity-bar.cjsx b/internal_packages/inbox-activity-bar/lib/activity-bar.cjsx index 07c4f176b..b107ae68a 100644 --- a/internal_packages/inbox-activity-bar/lib/activity-bar.cjsx +++ b/internal_packages/inbox-activity-bar/lib/activity-bar.cjsx @@ -1,4 +1,5 @@ _ = require 'underscore-plus' +ipc = require 'ipc' React = require 'react/addons' {DatabaseStore, NamespaceStore, @@ -25,6 +26,7 @@ ActivityBar = React.createClass filter: '' componentDidMount: -> + ipc.on 'report-issue', => @_onFeedback() @taskQueueUnsubscribe = TaskQueue.listen @_onChange @activityStoreUnsubscribe = ActivityBarStore.listen @_onChange diff --git a/internal_packages/notification-update-available/menus/release-bar.cson b/internal_packages/notification-update-available/menus/release-bar.cson deleted file mode 100644 index 48f658f27..000000000 --- a/internal_packages/notification-update-available/menus/release-bar.cson +++ /dev/null @@ -1,7 +0,0 @@ -'menu': [ - 'label': 'Help' - 'submenu': [ - 'label': 'Release Notes' - 'command': 'release-notes:show' - ] -] diff --git a/menus/darwin.cson b/menus/darwin.cson index a4a7c5cea..3041a45b8 100644 --- a/menus/darwin.cson +++ b/menus/darwin.cson @@ -5,17 +5,15 @@ { label: 'About Edgehill', command: 'application:about' } { label: 'Link External Account', command: 'atom-workspace:add-account' } { label: 'Log Out', command: 'atom-workspace:logout' } - { label: 'View License', command: 'application:open-license' } { label: 'VERSION', enabled: false } { label: 'Restart and Install Update', command: 'application:install-update', visible: false} { label: 'Check for Update', command: 'application:check-for-update', visible: false} { label: 'Downloading Update', enabled: false, visible: false} { type: 'separator' } - { label: 'Preferences...', command: 'application:show-settings' } { type: 'separator' } { label: 'Services', submenu: [] } { type: 'separator' } - { label: 'Hide Atom', command: 'application:hide' } + { label: 'Hide Edgehill', command: 'application:hide' } { label: 'Hide Others', command: 'application:hide-other-applications' } { label: 'Show All', command: 'application:unhide-all-applications' } { type: 'separator' } @@ -27,10 +25,6 @@ submenu: [ { label: 'New Message', command: 'application:new-message' } { type: 'separator' } - { label: 'Save', command: 'core:save' } - { label: 'Save As...', command: 'core:save-as' } - { label: 'Save All', command: 'window:save-all' } - { type: 'separator' } { label: 'Close Window', command: 'window:close' } ] } @@ -48,33 +42,14 @@ ] } - { - label: 'Find' - submenu: [] - } - { label: 'View' submenu: [ { label: 'Reload', command: 'window:reload' } { label: 'Toggle Full Screen', command: 'window:toggle-full-screen' } - { - label: 'Developer' - submenu: [ - { label: 'Open In Dev Mode...', command: 'application:open-dev' } - { label: 'Run Edgehill Specs', command: 'application:run-all-specs' } - { label: 'Run Package Specs', command: 'window:run-package-specs' } - { label: 'Toggle Developer Tools', command: 'window:toggle-dev-tools' } - ] - } ] } - { - label: 'Packages' - submenu: [] - } - { label: 'Window' submenu: [ @@ -90,15 +65,7 @@ { label: 'Help' submenu: [ - { label: 'Terms of Use', command: 'application:open-terms-of-use' } - { label: 'Documentation', command: 'application:open-documentation' } - { label: 'Roadmap', command: 'application:open-roadmap' } - { label: 'Frequently Asked Questions', command: 'application:open-faq' } - { type: 'separator' } - { label: 'Community Discussions', command: 'application:open-discussions' } { label: 'Report Issue', command: 'application:report-issue' } - { label: 'Search Issues', command: 'application:search-issues' } - { type: 'separator' } ] } ] diff --git a/menus/linux.cson b/menus/linux.cson index 1124e5b0c..b9918b82d 100644 --- a/menus/linux.cson +++ b/menus/linux.cson @@ -4,14 +4,9 @@ submenu: [ { label: '&New Message', command: 'application:new-message' } { type: 'separator' } - { label: '&Save', command: 'core:save' } - { label: 'Save &As...', command: 'core:save-as' } - { label: 'Save A&ll', command: 'window:save-all' } - { type: 'separator' } - { label: 'Clos&e Window', command: 'window:close' } - { type: 'separator' } { label: 'Link External Account', command: 'atom-workspace:add-account' } { label: 'Log Out', command: 'atom-workspace:logout' } + { label: 'Clos&e Window', command: 'window:close' } { label: 'Quit', command: 'application:quit' } ] } @@ -26,9 +21,6 @@ { label: 'C&opy', command: 'core:copy' } { label: '&Paste', command: 'core:paste' } { label: 'Select &All', command: 'core:select-all' } - { type: 'separator' } - { label: '&Preferences', command: 'application:show-settings' } - { type: 'separator' } ] } @@ -38,43 +30,15 @@ { label: '&Reload', command: 'window:reload' } { label: 'Toggle &Full Screen', command: 'window:toggle-full-screen' } { label: 'Toggle Menu Bar', command: 'window:toggle-menu-bar' } - { - label: 'Developer' - submenu: [ - { label: 'Open In &Dev Mode...', command: 'application:open-dev' } - { label: 'Run &Atom Specs', command: 'application:run-all-specs' } - { label: 'Run Package &Specs', command: 'window:run-package-specs' } - { label: 'Toggle Developer &Tools', command: 'window:toggle-dev-tools' } - ] - } ] } - { - label: 'F&ind' - submenu: [] - } - - { - label: '&Packages' - submenu: [] - } - { label: '&Help' submenu: [ - { label: 'View &Terms of Use', command: 'application:open-terms-of-use' } - { label: 'View &License', command: 'application:open-license' } { label: "VERSION", enabled: false } { type: 'separator' } - { label: '&Documentation', command: 'application:open-documentation' } - { label: 'Roadmap', command: 'application:open-roadmap' } - { label: 'Frequently Asked Questions', command: 'application:open-faq' } - { type: 'separator' } - { label: 'Community Discussions', command: 'application:open-discussions' } { label: 'Report Issue', command: 'application:report-issue' } - { label: 'Search Issues', command: 'application:search-issues' } - { type: 'separator' } ] } ] diff --git a/menus/win32.cson b/menus/win32.cson index ad6b0653b..f9a339476 100644 --- a/menus/win32.cson +++ b/menus/win32.cson @@ -4,13 +4,7 @@ submenu: [ { label: '&New Message', command: 'application:new-message' } { type: 'separator' } - { label: 'Se&ttings', command: 'application:show-settings' } { label: 'Link External Account', command: 'atom-workspace:add-account' } - { type: 'separator' } - { label: '&Save', command: 'core:save' } - { label: 'Save &As...', command: 'core:save-as' } - { label: 'Save A&ll', command: 'window:save-all' } - { type: 'separator' } { label: 'Clos&e Window', command: 'window:close' } { type: 'separator' } { label: 'Log Out', command: 'atom-workspace:logout' } @@ -38,46 +32,18 @@ { label: '&Reload', command: 'window:reload' } { label: 'Toggle &Full Screen', command: 'window:toggle-full-screen' } { label: 'Toggle Menu Bar', command: 'window:toggle-menu-bar' } - { - label: 'Developer' - submenu: [ - { label: 'Open In &Dev Mode...', command: 'application:open-dev' } - { label: 'Run &Atom Specs', command: 'application:run-all-specs' } - { label: 'Run Package &Specs', command: 'window:run-package-specs' } - { label: 'Toggle Developer &Tools', command: 'window:toggle-dev-tools' } - ] - } ] } - { - label: 'F&ind' - submenu: [] - } - - { - label: '&Packages' - submenu: [] - } - { label: '&Help' submenu: [ - { label: 'View &Terms of Use', command: 'application:open-terms-of-use' } - { label: 'View &License', command: 'application:open-license' } { label: 'VERSION', enabled: false } { label: 'Restart and Install Update', command: 'application:install-update', visible: false} { label: 'Check for Update', command: 'application:check-for-update', visible: false} { label: 'Downloading Update', enabled: false, visible: false} { type: 'separator' } - { label: '&Documentation', command: 'application:open-documentation' } - { label: 'Roadmap', command: 'application:open-roadmap' } - { label: 'Frequently Asked Questions', command: 'application:open-faq' } - { type: 'separator' } - { label: 'Community Discussions', command: 'application:open-discussions' } { label: 'Report Issue', command: 'application:report-issue' } - { label: 'Search Issues', command: 'application:search-issues' } - { type: 'separator' } ] } ] diff --git a/src/browser/edgehill-application.coffee b/src/browser/edgehill-application.coffee index ae37643d4..bed938f47 100644 --- a/src/browser/edgehill-application.coffee +++ b/src/browser/edgehill-application.coffee @@ -224,7 +224,7 @@ class AtomApplication @on 'application:open-roadmap', -> require('shell').openExternal('https://atom.io/roadmap?app') @on 'application:open-faq', -> require('shell').openExternal('https://atom.io/faq') @on 'application:open-terms-of-use', -> require('shell').openExternal('https://atom.io/terms') - @on 'application:report-issue', -> require('shell').openExternal('https://github.com/atom/atom/issues/new') + @on 'application:report-issue', => @_reportIssue() @on 'application:search-issues', -> require('shell').openExternal('https://github.com/issues?q=+is%3Aissue+user%3Aatom') @on 'application:show-main-window', => @showMainWindow() @@ -536,3 +536,7 @@ class AtomApplication isSpec = true devMode = true new AtomWindow({bootstrapScript, @resourcePath, exitWhenDone, isSpec, specDirectory, devMode}) + + _reportIssue: -> + return unless @mainWindow + @mainWindow.browserWindow.webContents.send('report-issue') diff --git a/static/type.less b/static/type.less index c3c0df58d..bd766d48f 100644 --- a/static/type.less +++ b/static/type.less @@ -217,7 +217,6 @@ abbr[data-original-title] { blockquote { padding: (@line-height-computed / 2) @line-height-computed; margin: 0 0 @line-height-computed; - font-size: @blockquote-font-size; border-left: 5px solid @blockquote-border-color; p,