This is an automated email from the ASF dual-hosted git repository.
tobiasistvan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ambari-logsearch.git
The following commit(s) were added to refs/heads/master by this push:
new c10bbee [AMBARI-25029] [Log Search UI] change the colors of the
service links (#62)
c10bbee is described below
commit c10bbee653e01493f1de31bce5169cd66ecc1aaf
Author: Istvan Tobias <[email protected]>
AuthorDate: Tue Dec 11 12:16:36 2018 +0100
[AMBARI-25029] [Log Search UI] change the colors of the service links (#62)
---
.../src/app/modules/shared/variables.less | 3 +-
.../shipper-cluster-service-list.component.less | 47 ++++++++++++++--------
.../shipper-configuration.component.html | 2 +-
.../shipper-configuration.component.less | 28 ++++++++-----
4 files changed, 51 insertions(+), 29 deletions(-)
diff --git a/ambari-logsearch-web/src/app/modules/shared/variables.less
b/ambari-logsearch-web/src/app/modules/shared/variables.less
index 1d7fc94..da4ba6a 100644
--- a/ambari-logsearch-web/src/app/modules/shared/variables.less
+++ b/ambari-logsearch-web/src/app/modules/shared/variables.less
@@ -33,7 +33,8 @@
@green: #3FAE2A;
@base-font-color: #666;
-@navbar-background-color: #323544;
+@navbar-background-color: #313544;
+@navbar-active-background-color: #414354;
@navbar-logo-background-color: #303d54;
@h1-vertical-margin: 20px;
@button-border-radius: 4px;
diff --git
a/ambari-logsearch-web/src/app/modules/shipper/components/shipper-cluster-service-list/shipper-cluster-service-list.component.less
b/ambari-logsearch-web/src/app/modules/shipper/components/shipper-cluster-service-list/shipper-cluster-service-list.component.less
index 8294c4a..a58e21e 100644
---
a/ambari-logsearch-web/src/app/modules/shipper/components/shipper-cluster-service-list/shipper-cluster-service-list.component.less
+++
b/ambari-logsearch-web/src/app/modules/shipper/components/shipper-cluster-service-list/shipper-cluster-service-list.component.less
@@ -16,24 +16,39 @@
* limitations under the License.
*/
-.navigation-bar-container, .navigation-bar-container ul.nav.side-nav-header,
-.navigation-bar-container ul.nav.side-nav-menu {
- overflow: hidden;
- text-overflow: ellipsis;
- width: 100%;
-}
+ @import "../../../shared/variables";
-.navigation-header {
- color: #fff;
- font-size: 2rem;
-}
+ :host {
+
+ .navigation-bar-container, .navigation-bar-container ul.nav.side-nav-header,
+ .navigation-bar-container ul.nav.side-nav-menu {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ width: 100%;
+ }
-ul.nav.side-nav-menu li.active:not(.has-sub-menu) {
- background-color: #fff;
- a {
- color: darken(#1491C1, 25%);
- &:hover {
- background-color: transparent;
+ .navigation-header {
+ color: #fff;
+ font-size: 2rem;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+
+ ul.nav.side-nav-menu li {
+ color: @fluid-gray-2;
+ background: @navbar-background-color;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ &.active, &:hover {
+ background: @navbar-active-background-color;
+ color: @white;
+ a {
+ color: @white;
+ }
+ }
+ a {
+ color: @fluid-gray-2;
}
}
+
}
diff --git
a/ambari-logsearch-web/src/app/modules/shipper/components/shipper-configuration/shipper-configuration.component.html
b/ambari-logsearch-web/src/app/modules/shipper/components/shipper-configuration/shipper-configuration.component.html
index 610fb3e..cc10abd 100644
---
a/ambari-logsearch-web/src/app/modules/shipper/components/shipper-configuration/shipper-configuration.component.html
+++
b/ambari-logsearch-web/src/app/modules/shipper/components/shipper-configuration/shipper-configuration.component.html
@@ -25,7 +25,7 @@
</h1>
<div class="container-fluid">
<div class="row">
- <div class="col-md-2">
+ <div class="col-md-2 service-list">
<shipper-cluster-service-list *ngIf="clusterName$ | async"
[clusterName]="clusterName$ | async"
[serviceNamesList]="serviceNamesList$ | async"
diff --git
a/ambari-logsearch-web/src/app/modules/shipper/components/shipper-configuration/shipper-configuration.component.less
b/ambari-logsearch-web/src/app/modules/shipper/components/shipper-configuration/shipper-configuration.component.less
index f416b07..a481295 100644
---
a/ambari-logsearch-web/src/app/modules/shipper/components/shipper-configuration/shipper-configuration.component.less
+++
b/ambari-logsearch-web/src/app/modules/shipper/components/shipper-configuration/shipper-configuration.component.less
@@ -17,17 +17,23 @@
*/
@import "../../../shared/variables";
+:host {
+ .shipper-configuration {
+ background-color: @filters-panel-background-color;
+ margin-top: 40px;
+ min-height: 100vh;
+ }
-.shipper-configuration {
- background-color: @filters-panel-background-color;
- margin-top: 40px;
- min-height: 100vh;
-}
+ a.btn, a.btn:focus, a.btn:visited {
+ color: #fff;
+ }
-a.btn, a.btn:focus, a.btn:visited {
- color: #fff;
-}
+ /deep/ .navigation-bar-container {
+ padding-bottom: 1em;
+ }
-/deep/ .navigation-bar-container {
- padding-bottom: 1em;
-}
+ .row .col-md-2.service-list {
+ padding: 0
+ }
+
+}
\ No newline at end of file
