You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by xi...@apache.org on 2016/12/28 22:17:28 UTC
[1/2] ambari git commit: AMBARI-19312. Improve and Fix 'Alerts page'
after new guidelines. (xiwang)
Repository: ambari
Updated Branches:
refs/heads/trunk 74d636392 -> 6add93ea4
AMBARI-19312. Improve and Fix 'Alerts page' after new guidelines. (xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6add93ea
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6add93ea
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6add93ea
Branch: refs/heads/trunk
Commit: 6add93ea482555084e5d001c47bf1f86f2dfe99b
Parents: a2c907b
Author: Xi Wang <xi...@apache.org>
Authored: Wed Dec 28 13:52:46 2016 -0800
Committer: Xi Wang <xi...@apache.org>
Committed: Wed Dec 28 13:52:53 2016 -0800
----------------------------------------------------------------------
ambari-web/app/styles/alerts.less | 16 ++++++++++++++++
ambari-web/app/styles/application.less | 4 +---
2 files changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6add93ea/ambari-web/app/styles/alerts.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/alerts.less b/ambari-web/app/styles/alerts.less
index a04db8a..c13c8c9 100644
--- a/ambari-web/app/styles/alerts.less
+++ b/ambari-web/app/styles/alerts.less
@@ -87,6 +87,16 @@
}
}
+ > thead > tr > th, > thead > tr > td,
+ > tbody > tr > th, > tbody > tr > td,
+ > tfoot > tr > th, > tfoot > tr > td {
+ vertical-align: middle;
+ }
+
+ a.ui-icon-circle-close {
+ visibility: hidden;
+ }
+
.filter-input-width {
width: ~"calc(100% - 20px)";
}
@@ -135,6 +145,12 @@
}
#alert-instances-table {
+ > thead > tr > th, > thead > tr > td,
+ > tbody > tr > th, > tbody > tr > td,
+ > tfoot > tr > th, > tfoot > tr > td {
+ vertical-align: middle;
+ }
+
.col0,
td:first-child,
th:first-child {
http://git-wip-us.apache.org/repos/asf/ambari/blob/6add93ea/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index c35f0d1..a89296c 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -1745,7 +1745,7 @@ ul.inline li {
opacity: 0.2;
padding: 1px;
position: relative;
- margin-top: 6px;
+ margin-top: 8px;
z-index: 10;
&:hover {
opacity: 0.7;
@@ -1765,7 +1765,6 @@ ul.inline li {
.active-sort {
color: #555;
text-decoration: none;
- background-color: #e5e5e5;
border-radius: 0;
}
}
@@ -1777,7 +1776,6 @@ ul.inline li {
color: #555;
text-decoration: none;
background-color: #e5e5e5;
- box-shadow: inset 0 -5px 8px rgba(0, 0, 0, 0.05);
}
.filter-btn {
color: #999;
[2/2] ambari git commit: AMBARI-19305. Improve and Fix 'Services
page' after new guidelines.(xiwang)
Posted by xi...@apache.org.
AMBARI-19305. Improve and Fix 'Services page' after new guidelines.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a2c907b2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a2c907b2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a2c907b2
Branch: refs/heads/trunk
Commit: a2c907b2d9c2da58c7907e0ee9a3b5ad5376f361
Parents: 74d6363
Author: Xi Wang <xi...@apache.org>
Authored: Tue Dec 27 18:44:57 2016 -0800
Committer: Xi Wang <xi...@apache.org>
Committed: Wed Dec 28 13:52:53 2016 -0800
----------------------------------------------------------------------
.../app/styles/enhanced_service_dashboard.less | 40 +++++++++++++++++++-
.../service/widgets/create/expression_view.js | 1 +
2 files changed, 39 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a2c907b2/ambari-web/app/styles/enhanced_service_dashboard.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/enhanced_service_dashboard.less b/ambari-web/app/styles/enhanced_service_dashboard.less
index 0d549d7..dfbe042 100644
--- a/ambari-web/app/styles/enhanced_service_dashboard.less
+++ b/ambari-web/app/styles/enhanced_service_dashboard.less
@@ -180,6 +180,8 @@
#widget-preview {
max-width: 200px;
+ margin: auto;
+ margin-bottom: 20px;
.widget {
.img-thumbnail .corner-icon {
display: none;
@@ -475,12 +477,46 @@
}
.add-metric-menu{
- .select-options-dropdown {
+ .dropdown-menu.select-options-dropdown {
width: 240px;
- border: none;
+ padding: 0px;
+ -moz-background-clip: padding;
+ -webkit-background-clip: padding;
+ background-clip: padding-box;
+ border-bottom: 250px transparent solid;
+ border-left: none;
+ border-right: none;
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
&>li>div {
padding: 3px;
}
+ li.metric-select {
+ padding: 5px;
+ padding-bottom: 0px;
+ border-left: 1px #ccc solid;
+ border-right: 1px #ccc solid;
+ border-bottom: none;
+ border-top: none;
+ }
+ li.aggregator-select {
+ padding: 5px;
+ padding-bottom: 0px;
+ border-left: 1px #ccc solid;
+ border-right: 1px #ccc solid;
+ border-bottom: none;
+ border-top: none;
+ }
+ li.actions-buttons{
+ padding: 5px;
+ padding-left: 8px;
+ border: 1px #ccc solid;
+ border-top: none;
+ button {
+ margin-right: 5px;
+ }
+ }
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/a2c907b2/ambari-web/app/views/main/service/widgets/create/expression_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/widgets/create/expression_view.js b/ambari-web/app/views/main/service/widgets/create/expression_view.js
index 436e3e9..c4a1a3e 100644
--- a/ambari-web/app/views/main/service/widgets/create/expression_view.js
+++ b/ambari-web/app/views/main/service/widgets/create/expression_view.js
@@ -266,6 +266,7 @@ App.AddMetricExpressionView = Em.View.extend({
var component = this.get('componentMap').findProperty('serviceName', event.context.get('serviceName'))
.get('components').findProperty('id', event.context.get('id'));
this.set('currentSelectedComponent', component);
+ event.stopPropagation();
},
/**