AMBARI-22132 Reconfigure spacing of widgets view. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3e6aa878 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3e6aa878 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3e6aa878 Branch: refs/heads/branch-feature-AMBARI-14714 Commit: 3e6aa87887932dbfe71dc24a1255320f1ab7bbd8 Parents: 8e7654a Author: Andrii Tkach <[email protected]> Authored: Wed Oct 4 19:24:58 2017 +0300 Committer: Andrii Tkach <[email protected]> Committed: Wed Oct 4 19:27:17 2017 +0300 ---------------------------------------------------------------------- ambari-web/app/styles/alerts.less | 8 +++---- ambari-web/app/styles/dashboard.less | 22 ++++++++++++++++---- .../app/templates/main/service/info/summary.hbs | 5 ++--- .../service/info/summary/master_components.hbs | 4 ---- 4 files changed, 24 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3e6aa878/ambari-web/app/styles/alerts.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/alerts.less b/ambari-web/app/styles/alerts.less index 775c0ef..a1d3468 100644 --- a/ambari-web/app/styles/alerts.less +++ b/ambari-web/app/styles/alerts.less @@ -397,16 +397,16 @@ .summary-value { .alerts-crit-count, .alerts-warn-count, .no-alerts-label { - padding: 2px 3px 2px 3px; + padding: 3px 0; font-size: 9px; border-radius: 50%; - width: 13px; - height: 13px; + width: 15px; + height: 15px; color: #ffffff; text-align: center; display: inline-block; position: relative; - top: -2px; + top: -3px; } } http://git-wip-us.apache.org/repos/asf/ambari/blob/3e6aa878/ambari-web/app/styles/dashboard.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/dashboard.less b/ambari-web/app/styles/dashboard.less index f413caa..02835bd 100644 --- a/ambari-web/app/styles/dashboard.less +++ b/ambari-web/app/styles/dashboard.less @@ -30,7 +30,7 @@ .dashboard-widgets-box { clear: both; display: inline-block; - padding: 10px; + padding: 10px 1.1% 10px 1.1%; background-color: #ffffff; } #widgets-options-menu { @@ -351,11 +351,14 @@ #dashboard-widgets-container { + .dashboard-widgets-box { + padding: 10px 1.3% 10px 1.3%; + } + #dashboard-widgets { .span2p4 { - float: left; - width: 22.3%; - *width: 22.3%; + width: 23.2%; + *width: 23.2%; } .img-thumbnail { .caption { @@ -373,4 +376,15 @@ } } +} + +@media (min-width: 1500px) { + #dashboard-widgets-container { + #dashboard-widgets { + .span2p4 { + width: 23.4%; + *width: 23.4%; + } + } + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/3e6aa878/ambari-web/app/templates/main/service/info/summary.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/info/summary.hbs b/ambari-web/app/templates/main/service/info/summary.hbs index 789a6fc..b1b0a42 100644 --- a/ambari-web/app/templates/main/service/info/summary.hbs +++ b/ambari-web/app/templates/main/service/info/summary.hbs @@ -60,9 +60,8 @@ <i class="glyphicon glyphicon-bell"></i> {{#if view.alertsCount}} <span {{bindAttr class=":label view.hasCriticalAlerts:alerts-crit-count:alerts-warn-count"}}> - {{view.alertsCount}}</span> - {{else}} - <span class="label no-alerts-label">{{t services.service.summary.alerts.noAlerts}}</span> + {{view.alertsCount}} + </span> {{/if}} </span> {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/3e6aa878/ambari-web/app/templates/main/service/info/summary/master_components.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/info/summary/master_components.hbs b/ambari-web/app/templates/main/service/info/summary/master_components.hbs index 8126d1f..8925d87 100644 --- a/ambari-web/app/templates/main/service/info/summary/master_components.hbs +++ b/ambari-web/app/templates/main/service/info/summary/master_components.hbs @@ -25,10 +25,6 @@ <span {{action "showServiceAlertsPopup" comp target="controller"}} {{bindAttr class=":label comp.hasCriticalAlerts:alerts-crit-count:alerts-warn-count"}}> {{comp.alertsCount}} </span> - {{else}} - <span {{action "showServiceAlertsPopup" comp target="controller"}} class="label no-alerts-label"> - {{t services.service.summary.alerts.noAlerts}} - </span> {{/if}} </div> <div {{bindAttr class=":summary-label comp.summaryLabelClassName"}}>
