Repository: ambari Updated Branches: refs/heads/trunk f32be8ae9 -> 3d9072733
AMBARI-10985. Undo action causing layout changes along with misc issues (Richard Zang via srimanth) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3d907273 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3d907273 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3d907273 Branch: refs/heads/trunk Commit: 3d9072733908c2d0d4910e0ebe833da320b4433d Parents: f32be8a Author: Srimanth Gunturi <sgunt...@hortonworks.com> Authored: Thu May 14 15:49:11 2015 -0700 Committer: Srimanth Gunturi <sgunt...@hortonworks.com> Committed: Thu May 14 15:49:11 2015 -0700 ---------------------------------------------------------------------- ambari-web/app/styles/application.less | 32 +++++++++++--------- ambari-web/app/styles/widgets.less | 2 ++ .../configs/service_config_layout_tab.hbs | 9 ++++-- .../views/common/configs/service_config_view.js | 2 ++ 4 files changed, 29 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3d907273/ambari-web/app/styles/application.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index 806d356..a3d8483 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -5662,7 +5662,7 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox { overflow: visible; height: 100%; padding: 18px; - border: 1px solid #aaa; + border: 1px solid #e4e4e4; vertical-align: top; h4 { margin: 0px; @@ -5673,18 +5673,6 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox { font-size: 18px; font-weight: 400; } - .vertical-splitter-r { - border-right: 2px solid #ccc; // vertical splitter - padding-right: 20px; - padding-left: 0px; - } - - .vertical-splitter-l { - border-left: 2px solid #ccc; // vertical splitter - margin-left: -2px; - padding-left: 20px; - padding-right: 0px; - } div.with-border { border: 1px solid #aaa; padding: 10px; @@ -5696,20 +5684,36 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox { height: ~"calc(100% - 30px)"; border-collapse: separate; table-layout: fixed; + @-moz-document url-prefix() { // for firefox only AMBARI-10985 + .config-subsection { + height: 100% !important; + } + } .config-subsection { padding: 0px; vertical-align: top; + height: 0px; // td with height set allows inner div to have % height AMBARI-10985 + .vertical-splitter-l { + border-left: 1px solid #e4e4e4; // vertical splitter + margin-left: -2px; + padding-left: 20px; + padding-right: 0px; + height: 88%; + } &.no-horizontal-splitter { border-bottom: none; // no horizontal splitter for subsection on the last row } &.top-horizontal-splitter { - border-top: 2px solid #ccc; // horizontal splitter + border-top: 1px solid #e4e4e4; // horizontal splitter padding-top: 15px; padding-bottom: 15px; } .directories { min-width: 0px !important; } + .subsection-display-name { + padding-top: 5px; + } } } } http://git-wip-us.apache.org/repos/asf/ambari/blob/3d907273/ambari-web/app/styles/widgets.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/widgets.less b/ambari-web/app/styles/widgets.less index d79ef07..b033d59 100644 --- a/ambari-web/app/styles/widgets.less +++ b/ambari-web/app/styles/widgets.less @@ -224,6 +224,8 @@ } .slider-tick-label-container { margin-top: 0; + position: relative; + z-index: -1; // prevent it from covering up other widgets } .slider-tick-label { color: @slider-widget-tick-label-color; http://git-wip-us.apache.org/repos/asf/ambari/blob/3d907273/ambari-web/app/templates/common/configs/service_config_layout_tab.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/service_config_layout_tab.hbs b/ambari-web/app/templates/common/configs/service_config_layout_tab.hbs index dd566bf..ac1dcc7 100644 --- a/ambari-web/app/templates/common/configs/service_config_layout_tab.hbs +++ b/ambari-web/app/templates/common/configs/service_config_layout_tab.hbs @@ -30,9 +30,14 @@ <tr> {{#each subsection in subRow}} <td {{bindAttr class="subsection.isHiddenByFilter:invisible subsection.showTopSplitter:top-horizontal-splitter:no-horizontal-splitter :config-subsection" colspan="subsection.columnSpan" rowspan="subsection.rowSpan"}}> - <div {{bindAttr class="subsection.addLeftVerticalSplitter:vertical-splitter-l subsection.addRightVerticalSplitter:vertical-splitter-r"}}> + <div {{bindAttr class="subsection.addLeftVerticalSplitter:vertical-splitter-l"}}> <div {{bindAttr class="subsection.border:with-border"}}> - <h5>{{subsection.displayName}} </h5> + <h5 class="subsection-display-name"> + {{subsection.displayName}} + {{#if subRow.hasTitleGap}} + + {{/if}} + </h5> {{#each config in subsection.configs}} {{#if config.widget}} {{#unless config.isHiddenByFilter}} http://git-wip-us.apache.org/repos/asf/ambari/blob/3d907273/ambari-web/app/views/common/configs/service_config_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/configs/service_config_view.js b/ambari-web/app/views/common/configs/service_config_view.js index a33c5d6..2d00bde 100644 --- a/ambari-web/app/views/common/configs/service_config_view.js +++ b/ambari-web/app/views/common/configs/service_config_view.js @@ -205,6 +205,8 @@ App.ServiceConfigView = Em.View.extend({ var subsectionRow = subsectionRows[subsection.get('rowIndex')]; if (!subsectionRow) { subsectionRow = subsectionRows[subsection.get('rowIndex')] = []; } subsectionRow.push(subsection); + // leave a title gap if one of the subsection on the same row within the same section has title + if (subsection.get('displayName')) {subsectionRow.hasTitleGap = true;} } section.set('subsectionRows', subsectionRows); }