You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by to...@apache.org on 2018/08/14 14:23:40 UTC
[ambari] branch branch-2.7 updated: [AMBARI-24439] [Log Search UI]
center the log tabs so they're aligned with the buttons (#2057)
This is an automated email from the ASF dual-hosted git repository.
tobiasistvan pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new 22ba363 [AMBARI-24439] [Log Search UI] center the log tabs so they're aligned with the buttons (#2057)
22ba363 is described below
commit 22ba363715e31d7b7bcfc3088ab3d66bdf34670b
Author: Istvan Tobias <to...@gmail.com>
AuthorDate: Tue Aug 14 16:23:38 2018 +0200
[AMBARI-24439] [Log Search UI] center the log tabs so they're aligned with the buttons (#2057)
(cherry picked from commit aa2996853aaea64c69be34ce859311a4708c7341)
---
.../src/app/components/action-menu/action-menu.component.less | 1 -
.../app/components/logs-container/logs-container.component.html | 4 ++--
.../app/components/logs-container/logs-container.component.less | 7 +++++++
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/components/action-menu/action-menu.component.less b/ambari-logsearch/ambari-logsearch-web/src/app/components/action-menu/action-menu.component.less
index 66648bb..090b544 100644
--- a/ambari-logsearch/ambari-logsearch-web/src/app/components/action-menu/action-menu.component.less
+++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/action-menu/action-menu.component.less
@@ -19,7 +19,6 @@
:host {
display: block;
- margin-left: auto;
menu-button {
margin: 0 1em;
/deep/ .stop-icon {
diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.html b/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.html
index 0c130fa..7d0bb62 100644
--- a/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.html
+++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.html
@@ -18,10 +18,10 @@
<div class="tabs-container container-fluid">
<div class="row">
<div class="col-md-12 tabs-menu-container">
- <tabs class="pull-left" [items]="tabs | async" (tabSwitched)="onSwitchTab($event)"
+ <tabs [items]="tabs | async" (tabSwitched)="onSwitchTab($event)"
(tabClosed)="onCloseTab($event[0], $event[1])"
[switchMode]="'ROUTE_SEGMENT'" [basePathForRoutingMode]="routerPath" queryParamsHandling="merge"></tabs>
- <action-menu class="pull-right"></action-menu>
+ <action-menu></action-menu>
</div>
</div>
</div>
diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.less b/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.less
index 9ce88b0..5056003 100644
--- a/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.less
+++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.less
@@ -28,6 +28,13 @@
border-bottom: 1px solid @table-border-color;
.tabs-menu-container {
.flex-vertical-align;
+ height: 62px;
+ action-menu {
+ margin-left: auto;
+ }
+ /deep/ tabs ul.nav.nav-tabs {
+ margin: 0;
+ }
}
}