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 2015/06/21 21:55:47 UTC
[1/2] ambari git commit: AMBARI-12014. Excessive padding in service
config page without Settings | Advanced tabs.(Ricard Zang via xiwang)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 e78f52c4f -> c015b7de0
AMBARI-12014. Excessive padding in service config page without Settings | Advanced tabs.(Ricard Zang via xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1a19419d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1a19419d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1a19419d
Branch: refs/heads/branch-2.1
Commit: 1a19419d9c72e38a63743e5e4b67947ec92c7b9d
Parents: e78f52c
Author: Xi Wang <xi...@apache.org>
Authored: Sun Jun 21 12:54:13 2015 -0700
Committer: Xi Wang <xi...@apache.org>
Committed: Sun Jun 21 12:55:57 2015 -0700
----------------------------------------------------------------------
ambari-web/app/styles/application.less | 6 +++++-
.../app/templates/common/configs/config_history_flow.hbs | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1a19419d/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 5866fb0..07fb5c2 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -4269,9 +4269,13 @@ ul.inline li {
}
#config_history_flow {
- margin-bottom: 60px;
+ margin-bottom: 20px;
+ &.with-enhanced-config {
+ margin-bottom: 60px;
+ }
}
+
.pointer {
cursor: pointer;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/1a19419d/ambari-web/app/templates/common/configs/config_history_flow.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/config_history_flow.hbs b/ambari-web/app/templates/common/configs/config_history_flow.hbs
index a8aa9be..ce8cba9 100644
--- a/ambari-web/app/templates/common/configs/config_history_flow.hbs
+++ b/ambari-web/app/templates/common/configs/config_history_flow.hbs
@@ -17,7 +17,7 @@
}}
-<div id="config_history_flow">
+<div id="config_history_flow" {{bindAttr class="view.parentView.supportsConfigLayout:with-enhanced-config"}}>
<div class="version-slider">
<div {{bindAttr class=":icon-chevron-box :pull-left view.showLeftArrow::disabled"}} {{action shiftBack target="view"}} data-toggle="arrow-tooltip"
{{bindAttr data-original-title="view.leftArrowTooltip"}}><i class="icon-chevron-left icon-3x"></i></div>
[2/2] ambari git commit: AMBARI-12034. Template widget: content in
two lines get overlapped.(xiwang)
Posted by xi...@apache.org.
AMBARI-12034. Template widget: content in two lines get overlapped.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c015b7de
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c015b7de
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c015b7de
Branch: refs/heads/branch-2.1
Commit: c015b7de0e3ee7a7d064c278e6d771695e74a5eb
Parents: 1a19419
Author: Xi Wang <xi...@apache.org>
Authored: Fri Jun 19 17:03:42 2015 -0700
Committer: Xi Wang <xi...@apache.org>
Committed: Sun Jun 21 12:56:12 2015 -0700
----------------------------------------------------------------------
.../app/styles/enhanced_service_dashboard.less | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c015b7de/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 8745604..a734361 100644
--- a/ambari-web/app/styles/enhanced_service_dashboard.less
+++ b/ambari-web/app/styles/enhanced_service_dashboard.less
@@ -101,7 +101,20 @@
font-size: 35px;
width: 95%;
}
- .template-widget,
+ .template-widget {
+ .frame;
+ .content {
+ padding-top: 21px;
+ height: 75px;
+ line-height: 36px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
+ display: block;
+ display: -webkit-box;
+ }
+ }
.number-widget {
.frame;
.content {