From ea5f7dba8cc85d36535de90e9e8e703089200a07 Mon Sep 17 00:00:00 2001 From: Sean Li Date: Mon, 8 Jun 2015 18:18:50 -0700 Subject: [PATCH] Fixed sizing for homepage grid. --- src/components/ContainerDetailsSubheader.react.js | 7 ------- src/components/ContainerHome.react.js | 11 +++++------ styles/container-home.less | 7 ++++++- styles/new-container.less | 3 +-- styles/right-panel.less | 14 ++++++++------ 5 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/components/ContainerDetailsSubheader.react.js b/src/components/ContainerDetailsSubheader.react.js index 73d86cbd3b..8e2dd754d1 100644 --- a/src/components/ContainerDetailsSubheader.react.js +++ b/src/components/ContainerDetailsSubheader.react.js @@ -60,12 +60,6 @@ var ContainerDetailsSubheader = React.createClass({ this.context.router.transitionTo('containerHome', {name: this.context.router.getCurrentParams().name}); } }, - showLogs: function () { - if (!this.disableTab()) { - metrics.track('Viewed Logs'); - this.context.router.transitionTo('containerLogs', {name: this.context.router.getCurrentParams().name}); - } - }, showSettings: function () { if (!this.disableTab()) { metrics.track('Viewed Settings'); @@ -192,7 +186,6 @@ var ContainerDetailsSubheader = React.createClass({
Home - Logs Settings
diff --git a/src/components/ContainerHome.react.js b/src/components/ContainerHome.react.js index 86f1f05712..478cb8d929 100644 --- a/src/components/ContainerHome.react.js +++ b/src/components/ContainerHome.react.js @@ -27,8 +27,9 @@ var ContainerHome = React.createClass({ }, handleResize: function () { + $('.full .wrapper').height(window.innerHeight - 105); $('.left .wrapper').height(window.innerHeight - 105); - $('.right .wrapper').height(window.innerHeight / 2 - 100); + $('.right .wrapper').height(window.innerHeight / 2 - 55); }, handleErrorClick: function () { @@ -36,14 +37,10 @@ var ContainerHome = React.createClass({ }, showWeb: function () { - console.log(_.keys(this.props.ports)); return _.keys(this.props.ports).length > 0; }, showFolders: function () { - console.log('SUPETEST'); - console.log(this.props.container.Volumes); - console.log(_.keys(this.props.container.Volumes).length); return this.props.container.Volumes && _.keys(this.props.container.Volumes).length > 0 && this.props.container.State.Running; }, @@ -119,7 +116,9 @@ var ContainerHome = React.createClass({ body = (
- {logWidget} +
+ {logWidget} +
); diff --git a/styles/container-home.less b/styles/container-home.less index 1fbbdaf2d9..ed62c07489 100644 --- a/styles/container-home.less +++ b/styles/container-home.less @@ -7,14 +7,19 @@ flex-direction: row; padding: 1rem; .left { - width: 60%; + width: 100%; flex-direction: column; margin-right: 1rem; } .right { width: 40%; + min-width: 200px; + max-width: 600px; flex-direction: column; } + .full { + width: 100%; + } .web-preview { margin-bottom: 1rem; .widget { diff --git a/styles/new-container.less b/styles/new-container.less index 95efb3246a..e5a2376aae 100644 --- a/styles/new-container.less +++ b/styles/new-container.less @@ -139,10 +139,9 @@ .results-filters { margin: 1.2rem 1.2rem 0 0; .results-filter-title { + font-size: 12px; color: @gray-lighter; font-weight: 500; - position: relative; - top: 1px; margin-right: 0.7rem; } } diff --git a/styles/right-panel.less b/styles/right-panel.less index 04a2cb928e..14cad4cda9 100644 --- a/styles/right-panel.less +++ b/styles/right-panel.less @@ -41,19 +41,21 @@ position: relative; border-bottom: 1px solid @color-divider; background-color: white; + top: -1px; height: 45px; font-size: 10px; .details-header-actions { flex: 1 auto; text-align: left; + position: relative; .action { display: inline-block; position: relative; - width: 60px; + width: 50px; height: 44px; - padding-top: 0.2rem; + top: 0rem; .box-button(); - border-right: 1px solid @color-divider; + //border-right: 1px solid @color-divider; &.disabled { background-color: white; color: fade(@gray-light, 20%); @@ -62,14 +64,14 @@ text-align: center; height: 44px; .icon { - font-size: 24px; + font-size: 20px; margin-left: 0.6rem; } &.stop { position: relative; top: 0.3rem; .icon { - font-size: 20px; + font-size: 16px; margin-top: 1rem; } } @@ -77,7 +79,7 @@ position: relative; top: 0.3rem; .icon { - font-size: 20px; + font-size: 16px; margin-top: 1rem; } }