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/07/19 12:55:42 UTC
[ambari] branch branch-2.7 updated: [Log Search UI] Make the app
header aligned with the design (#1780)
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 dba6fbb [Log Search UI] Make the app header aligned with the design (#1780)
dba6fbb is described below
commit dba6fbb15283121dc0481307ca1ded99f836c609
Author: Istvan Tobias <to...@gmail.com>
AuthorDate: Thu Jul 19 14:55:40 2018 +0200
[Log Search UI] Make the app header aligned with the design (#1780)
---
.../src/app/components/app.component.less | 5 ++---
.../src/app/components/breadrumbs/breadcrumbs.component.html | 2 +-
.../src/app/components/breadrumbs/breadcrumbs.component.less | 12 ++++++++++++
.../src/app/modules/shared/variables.less | 1 +
4 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.less b/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.less
index d78963b..aaa18ed 100644
--- a/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.less
+++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.less
@@ -34,10 +34,9 @@
h1 {
align-items: center;
align-self: stretch;
- background: lighten(@navbar-background-color, 5%) url('/resources/assets/images/ambari-logo.png') no-repeat;
+ background: @navbar-logo-background-color url('/resources/assets/images/ambari-logo.png') no-repeat;
background-position: .5em center;
background-size: 25px;
- background-color: lighten(@navbar-background-color, 5%);
display: flex;
font-size: 20px;
margin: 0 2em 0 0;
@@ -47,7 +46,7 @@
}
}
breadcrumbs {
- font-size: 18px;
+ font-size: 20px;
.stretch-flex;
}
diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/components/breadrumbs/breadcrumbs.component.html b/ambari-logsearch/ambari-logsearch-web/src/app/components/breadrumbs/breadcrumbs.component.html
index d7c63c4..05ed10b 100644
--- a/ambari-logsearch/ambari-logsearch-web/src/app/components/breadrumbs/breadcrumbs.component.html
+++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/breadrumbs/breadcrumbs.component.html
@@ -21,7 +21,7 @@
<span *ngIf="crumbs.length" class="breadcrumb-separator">/</span>
<ng-container *ngFor="let crumb of crumbs; index as i">
<a *ngIf="i < crumbs.length-1" [routerLink]="crumb.path" routerLinkActive="active">{{crumb.text | translate}}</a>
- <span *ngIf="i === crumbs.length-1">{{crumb.text | translate}}</span>
+ <span *ngIf="i === crumbs.length-1" class="breadcrumb-current">{{crumb.text | translate}}</span>
<span *ngIf="i < crumbs.length-1" class="breadcrumb-separator">/</span>
</ng-container>
</ng-container>
diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/components/breadrumbs/breadcrumbs.component.less b/ambari-logsearch/ambari-logsearch-web/src/app/components/breadrumbs/breadcrumbs.component.less
index 3f65d24..7e98fce 100644
--- a/ambari-logsearch/ambari-logsearch-web/src/app/components/breadrumbs/breadcrumbs.component.less
+++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/breadrumbs/breadcrumbs.component.less
@@ -19,5 +19,17 @@
.breadcrumbs {
align-items: center;
display: flex;
+ color: #fff;
+ font-size: 20px;
+ a, a:visited, a:active, a:hover {
+ color: #fff;
+ text-decoration: none;
+ }
+ .breadcrumb-separator {
+ color: #999;
+ }
+ .breadcrumb-current {
+ color: #ccc;
+ }
}
}
diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/variables.less b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/variables.less
index 9e1c7ff..4b2677f 100644
--- a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/variables.less
+++ b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/variables.less
@@ -19,6 +19,7 @@
// Variables
@base-font-color: #666;
@navbar-background-color: #323544;
+@navbar-logo-background-color: #303d54;
@h1-vertical-margin: 20px;
@button-border-radius: 4px;
@input-border-width: 1px;