You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2021/07/19 21:13:26 UTC
[incubator-streampipes] 02/07: [STREAMPIPES-395] Decrease toolbar
height
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch STREAMPIPES-319
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 1d042b3f49370dfd9953626201f0da9df75b7d0c
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Sun Jul 18 11:41:17 2021 +0200
[STREAMPIPES-395] Decrease toolbar height
---
ui/src/app/core/components/iconbar/iconbar.component.html | 8 ++++----
.../iconbar.component.scss} | 11 ++---------
ui/src/app/core/components/iconbar/iconbar.component.ts | 3 ++-
.../core/components/streampipes/streampipes.component.html | 6 +++---
.../core/components/streampipes/streampipes.component.scss | 4 ++++
ui/src/app/core/components/toolbar/toolbar.component.html | 6 +++---
ui/src/app/core/components/toolbar/toolbar.component.scss | 6 ++++++
ui/src/scss/sp/main.scss | 4 ++--
8 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/ui/src/app/core/components/iconbar/iconbar.component.html b/ui/src/app/core/components/iconbar/iconbar.component.html
index 4185019..d6e8bc0 100644
--- a/ui/src/app/core/components/iconbar/iconbar.component.html
+++ b/ui/src/app/core/components/iconbar/iconbar.component.html
@@ -19,7 +19,7 @@
<div style="padding-top:0px;">
<div [ngClass]="item.link === activePage ? 'sp-navbar-item-selected': 'sp-navbar-item'"
*ngFor="let item of menu" style="min-width:0px;padding:0px;padding-top:5px;padding-bottom:5px;">
- <button mat-button mat-icon-button class="button-margin-iconbar" (click)="go(item.link)"
+ <button mat-button mat-icon-button class="button-margin-iconbar iconbar-size" (click)="go(item.link)"
matTooltip="{{item.title}}" matTooltipPosition="right">
<mat-icon [ngClass]="item.link === activePage ? 'sp-navbar-icon-selected' : 'sp-navbar-icon'">
{{item.icon}}
@@ -28,7 +28,7 @@
</div>
<div [ngClass]="'notifications' === activePage ? 'sp-navbar-item-selected' : 'sp-navbar-item'"
style="padding-top:5px;padding-bottom:5px;">
- <button mat-button mat-icon-button class="md-icon-button button-margin-iconbar"
+ <button mat-button mat-icon-button class="md-icon-button button-margin-iconbar iconbar-size"
(click)="go('notifications')"
matTooltip="Notifications" matTooltipPosition="right">
<mat-icon [matBadge]="NotificationCountService.unreadNotificationCount" [matBadgeHidden]="NotificationCountService.unreadNotificationCount == 0" [ngClass]="'notifications' === activePage ?'sp-navbar-icon-selected' : 'sp-navbar-icon'">chat
@@ -38,10 +38,10 @@
<mat-divider style="border-top-color:white;"></mat-divider>
<div [ngClass]="item.link === activePage ? 'sp-navbar-item-selected' : 'sp-navbar-item'"
*ngFor="let item of admin" style="padding-top:5px;padding-bottom:5px;">
- <button mat-button mat-icon-button class="md-icon-button button-margin-iconbar" (click)="go(item.link)"
+ <button mat-button mat-icon-button class="md-icon-button button-margin-iconbar iconbar-size" (click)="go(item.link)"
matTooltip="{{item.title}}">
<mat-icon
[ngClass]="item.link === activePage ?'sp-navbar-icon-selected' : 'sp-navbar-icon'">{{item.icon}}</mat-icon>
</button>
</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/ui/src/app/core/components/streampipes/streampipes.component.scss b/ui/src/app/core/components/iconbar/iconbar.component.scss
similarity index 82%
copy from ui/src/app/core/components/streampipes/streampipes.component.scss
copy to ui/src/app/core/components/iconbar/iconbar.component.scss
index 2230324..33d1429 100644
--- a/ui/src/app/core/components/streampipes/streampipes.component.scss
+++ b/ui/src/app/core/components/iconbar/iconbar.component.scss
@@ -16,13 +16,6 @@
*
*/
-@import "../../../../scss/variables";
-
-.iconbar {
- background: var(--color-navigation-bg);
-}
-
-.base {
- color: var(--color-default-text);
- background: var(--color-bg-0);
+.iconbar-size {
+ width: 35px;
}
diff --git a/ui/src/app/core/components/iconbar/iconbar.component.ts b/ui/src/app/core/components/iconbar/iconbar.component.ts
index 39328db..2d2b9b7 100644
--- a/ui/src/app/core/components/iconbar/iconbar.component.ts
+++ b/ui/src/app/core/components/iconbar/iconbar.component.ts
@@ -27,6 +27,7 @@ import {NotificationCountService} from "../../../services/notification-count-ser
@Component({
selector: 'iconbar',
templateUrl: './iconbar.component.html',
+ styleUrls: ['./iconbar.component.scss']
})
export class IconbarComponent extends BaseNavigationComponent implements OnInit {
@@ -70,4 +71,4 @@ export class IconbarComponent extends BaseNavigationComponent implements OnInit
stompClient.activate();
}
-}
\ No newline at end of file
+}
diff --git a/ui/src/app/core/components/streampipes/streampipes.component.html b/ui/src/app/core/components/streampipes/streampipes.component.html
index cb811f7..3154e84 100644
--- a/ui/src/app/core/components/streampipes/streampipes.component.html
+++ b/ui/src/app/core/components/streampipes/streampipes.component.html
@@ -17,11 +17,11 @@
-->
<div [ngClass]="authStatusService.darkMode ? 'dark-mode base-style' : 'light-mode base-style'">
- <div style="height: 50px;">
+ <div class="sp-toolbar-outer">
<toolbar></toolbar>
</div>
- <div style="display: flex;flex-direction:row; height: calc(100vh - 50px);">
- <div style="width:40px;color:white;" class="iconbar">
+ <div style="display: flex;flex-direction:row; height: calc(100vh - 40px);">
+ <div style="width:35px;color:white;" class="iconbar">
<iconbar></iconbar>
</div>
<div style="width: 100%; height: 100%; overflow-y: auto;" class="base">
diff --git a/ui/src/app/core/components/streampipes/streampipes.component.scss b/ui/src/app/core/components/streampipes/streampipes.component.scss
index 2230324..e6fb5ea 100644
--- a/ui/src/app/core/components/streampipes/streampipes.component.scss
+++ b/ui/src/app/core/components/streampipes/streampipes.component.scss
@@ -26,3 +26,7 @@
color: var(--color-default-text);
background: var(--color-bg-0);
}
+
+.sp-toolbar-outer {
+ height: 40px;
+}
diff --git a/ui/src/app/core/components/toolbar/toolbar.component.html b/ui/src/app/core/components/toolbar/toolbar.component.html
index 1700097..35cc13a 100644
--- a/ui/src/app/core/components/toolbar/toolbar.component.html
+++ b/ui/src/app/core/components/toolbar/toolbar.component.html
@@ -17,11 +17,11 @@
-->
<mat-toolbar class="md-primary md-hue-2 top-nav toolbar-bg">
- <div class="md-toolbar-tools" style="height:50px;max-height:50px;width:100%;">
+ <div class="md-toolbar-tools sp-toolbar">
<div fxFlex="60" fxLayout fxLayoutAlign="start center">
- <div class="md-toolbar-tools" style="height:50px;max-height:50px;" fxFlex fxLayout="row" fxLayoutAlign="start center">
+ <div class="md-toolbar-tools" style="height:40px;max-height:40px;" fxFlex fxLayout="row" fxLayoutAlign="start center">
<div style="padding:5px;border-radius:0px;margin-right:15px;position:relative;left:20px;">
- <img alt="icon" src="../../../../assets/img/sp/logo-navigation.png" style="height:35px;">
+ <img alt="icon" src="../../../../assets/img/sp/logo-navigation.png" style="height:30px;">
</div>
<div style="padding: 5px 5px;font-size:15px;margin-left:10px;">
<h4 style="margin-top:16px;font-size:12pt;font-weight:bold;">{{activePageName}}</h4>
diff --git a/ui/src/app/core/components/toolbar/toolbar.component.scss b/ui/src/app/core/components/toolbar/toolbar.component.scss
index cd99037..57f14f5 100644
--- a/ui/src/app/core/components/toolbar/toolbar.component.scss
+++ b/ui/src/app/core/components/toolbar/toolbar.component.scss
@@ -38,3 +38,9 @@
border-bottom: 2px solid var(--color-navigation-divider);
color: var(--color-navigation-text);
}
+
+.sp-toolbar {
+ height:40px;
+ max-height:40px;
+ width:100%;
+}
diff --git a/ui/src/scss/sp/main.scss b/ui/src/scss/sp/main.scss
index 15d6e19..91063a9 100644
--- a/ui/src/scss/sp/main.scss
+++ b/ui/src/scss/sp/main.scss
@@ -392,11 +392,11 @@ md-content {
}
md-toolbar.top-nav {
- min-height: 50px !important;
+ min-height: 40px !important;
}
.top-nav {
- height: 50px !important;
+ height: 40px !important;
border-bottom: 0px solid $sp-color-accent;
}