From 2d5bb8bd8bcf3f2d2702091bb310d971a3ecc2a2 Mon Sep 17 00:00:00 2001 From: probablycorey Date: Fri, 26 Apr 2013 11:23:30 -0700 Subject: [PATCH] Move `open .atom` button to config menu --- src/app/config-view.coffee | 7 ++++++- src/app/general-config-panel.coffee | 5 ----- static/config.less | 24 ++++++++++++++++++------ 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/src/app/config-view.coffee b/src/app/config-view.coffee index f11e2aebd..921ca2178 100644 --- a/src/app/config-view.coffee +++ b/src/app/config-view.coffee @@ -17,7 +17,9 @@ class ConfigView extends View @content: -> @div id: 'config-view', => - @ul id: 'panels-menu', class: 'nav nav-pills nav-stacked', outlet: 'panelMenu' + @div id: 'config-menu', => + @ul id: 'panels-menu', class: 'nav nav-pills nav-stacked', outlet: 'panelMenu' + @button "open .atom", id: 'open-dot-atom', class: 'btn btn-default btn-small' @div id: 'panels', outlet: 'panels' initialize: -> @@ -26,6 +28,9 @@ class ConfigView extends View @on 'click', '#panels-menu li a', (e) => @showPanel($(e.target).closest('li').attr('name')) + @on 'click', '#open-dot-atom', -> + atom.open(config.configDirPath) + @addPanel('General', new GeneralConfigPanel) @addPanel('Editor', new EditorConfigPanel) @addPanel('Themes', new ThemeConfigPanel) diff --git a/src/app/general-config-panel.coffee b/src/app/general-config-panel.coffee index b13329023..18734f750 100644 --- a/src/app/general-config-panel.coffee +++ b/src/app/general-config-panel.coffee @@ -20,8 +20,3 @@ class GeneralConfigPanel extends ConfigPanel @label for: 'core.autosave', => @input id: 'core.autosave', type: 'checkbox' @text 'Auto-Save on Focus Change' - - @button outlet: 'openDotAtomButton', type: 'button', class: 'btn btn-default', "Open '#{config.configDirPath}'" - - initialize: -> - @openDotAtomButton.on 'click', -> atom.open(config.configDirPath) diff --git a/static/config.less b/static/config.less index 04ce94296..ddebb5fd4 100644 --- a/static/config.less +++ b/static/config.less @@ -7,13 +7,25 @@ background: white; display: -webkit-flex; - #panels-menu { - width: 150px; - margin-top: @line-height-base; - margin-left: @line-height-base; + #config-menu { + display: -webkit-flex; + -webkit-flex-direction: column; - li a { - cursor: pointer; + #panels-menu { + width: 150px; + margin-left: @line-height-base; + margin-top: @line-height-base; + -webkit-flex-grow: 1; + + li a { + cursor: pointer; + } + } + + #open-dot-atom { + width: 150px; + margin-left: @line-height-base; + margin-bottom: @line-height-base; } }