From 7256065ca1e750e16892eacbfb798ea112b18418 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Wed, 10 Jun 2015 16:20:01 -0700 Subject: [PATCH] Minor bugfixes --- package.json | 2 +- src/components/Containers.react.js | 2 +- src/menutemplate.js | 15 ++++++++++----- styles/right-panel.less | 8 ++++---- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 619fe4df..447b9c12 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Kitematic", - "version": "0.6.4", + "version": "0.6.5", "author": "Kitematic", "description": "Simple Docker Container management for Mac OS X.", "homepage": "https://kitematic.com/", diff --git a/src/components/Containers.react.js b/src/components/Containers.react.js index b7ef82dc..20e7a8b6 100644 --- a/src/components/Containers.react.js +++ b/src/components/Containers.react.js @@ -161,7 +161,7 @@ var Containers = React.createClass({

Containers

- +
diff --git a/src/menutemplate.js b/src/menutemplate.js index fd508765..df41ffa2 100644 --- a/src/menutemplate.js +++ b/src/menutemplate.js @@ -42,25 +42,30 @@ var MenuTemplate = function () { click: function () { metrics.track('Installed Docker Commands'); if (!setupUtil.shouldUpdateBinaries()) { + dialog.showMessageBox({ + message: 'Docker binaries are already installed in /usr/local/bin', + buttons: ['OK'] + }); return; } let copy = setupUtil.needsBinaryFix() ? - util.exec(setupUtil.copyBinariesCmd() + ' && ' + setupUtil.fixBinariesCmd()) : + util.exec(setupUtil.macSudoCmd(setupUtil.copyBinariesCmd() + ' && ' + setupUtil.fixBinariesCmd())) : util.exec(setupUtil.copyBinariesCmd()); copy.then(() => { dialog.showMessageBox({ - message: 'Docker binaries have been copied to /usr/local/bin', + message: 'Docker binaries have been installed under /usr/local/bin', buttons: ['OK'] }); - }).catch(() => {}); + }).catch((err) => { + console.log(err); + }); }, }, { type: 'separator' - }, - { + }, { label: 'Hide Kitematic', accelerator: util.CommandOrCtrl() + '+H', selector: 'hide:' diff --git a/styles/right-panel.less b/styles/right-panel.less index d67a9f99..1f2844ff 100644 --- a/styles/right-panel.less +++ b/styles/right-panel.less @@ -3,11 +3,11 @@ margin: 0; padding: 0; box-sizing: border-box; - flex: 1; + flex: 1 auto; display: flex; flex-direction: column; .details-subheader { - flex: 0 auto; + flex: 0 0; display: flex; flex-direction: row; position: relative; @@ -78,7 +78,7 @@ } } .details-header { - flex: 0 auto; + flex: 0 0; display: flex; flex-direction: row; padding: 18px 24px 24px 24px; @@ -148,7 +148,7 @@ } } .details-panel { - flex: 1; + flex: 1 auto; overflow: auto; background-color: white; }