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 2022/07/28 12:20:34 UTC
[incubator-streampipes] branch dev updated: [hotfix] Use accent color for loading bar
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new 698e3af64 [hotfix] Use accent color for loading bar
698e3af64 is described below
commit 698e3af645872a6837ca908efbc35b3d488a8125
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Thu Jul 28 14:20:23 2022 +0200
[hotfix] Use accent color for loading bar
---
ui/deployment/sp-theme.scss | 3 +++
ui/src/app/app.component.html | 4 ++--
ui/src/scss/main.scss | 1 -
ui/src/scss/sp/loading-bar.scss | 49 -----------------------------------------
4 files changed, 5 insertions(+), 52 deletions(-)
diff --git a/ui/deployment/sp-theme.scss b/ui/deployment/sp-theme.scss
index 72c79d776..286bd6106 100644
--- a/ui/deployment/sp-theme.scss
+++ b/ui/deployment/sp-theme.scss
@@ -163,7 +163,10 @@ $accent: map-get($custom-theme-light, accent);
.small .mat-tab-label-content {
text-transform: none;
font-size: 11pt;
+}
+:root {
+ --color-loading-bar: #{mat-color($accent)};
}
.dark-mode {
diff --git a/ui/src/app/app.component.html b/ui/src/app/app.component.html
index 83e668ea6..fb59095e6 100644
--- a/ui/src/app/app.component.html
+++ b/ui/src/app/app.component.html
@@ -15,7 +15,7 @@
~ limitations under the License.
~
-->
-<ngx-loading-bar [color]="'rgb(27, 20, 100)'"></ngx-loading-bar>
+<ngx-loading-bar [color]="'var(--color-loading-bar)'"></ngx-loading-bar>
<div [@routeAnimations]="prepareRoute(outlet)">
<router-outlet #outlet="outlet"></router-outlet>
-</div>
\ No newline at end of file
+</div>
diff --git a/ui/src/scss/main.scss b/ui/src/scss/main.scss
index 083b9b767..c50faa0dd 100644
--- a/ui/src/scss/main.scss
+++ b/ui/src/scss/main.scss
@@ -37,7 +37,6 @@
@import './sp/main';
@import './sp/data-explorer';
-@import './sp/loading-bar';
@import './sp/buttons';
@import './sp/buttons.ng1';
@import './sp/spinner';
diff --git a/ui/src/scss/sp/loading-bar.scss b/ui/src/scss/sp/loading-bar.scss
deleted file mode 100644
index e50006b43..000000000
--- a/ui/src/scss/sp/loading-bar.scss
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#loading-bar .bar {
- -webkit-transition: width 350ms;
- -moz-transition: width 350ms;
- -o-transition: width 350ms;
- transition: width 350ms;
-
- background: $sp-color-accent;
- position: fixed;
- z-index: 10002;
- top: 0px;
- left: 0;
- width: 100%;
- height: 3px;
- border-bottom-right-radius: 1px;
- border-top-right-radius: 1px;
-}
-
-#loading-bar-spinner .spinner-icon {
- width: 14px;
- height: 14px;
-
- border: solid 2px transparent;
- border-top-color: $sp-color-accent;
- border-left-color: $sp-color-accent;
- border-radius: 50%;
-
- -webkit-animation: loading-bar-spinner 400ms linear infinite;
- -moz-animation: loading-bar-spinner 400ms linear infinite;
- -ms-animation: loading-bar-spinner 400ms linear infinite;
- -o-animation: loading-bar-spinner 400ms linear infinite;
- animation: loading-bar-spinner 400ms linear infinite;
-}
\ No newline at end of file