From a103660954205f9748e4601cad0fefd254044e5d Mon Sep 17 00:00:00 2001
From: "Hartung, Michael" <michael.hartung@uni-hamburg.de>
Date: Thu, 10 Nov 2022 17:44:53 +0100
Subject: [PATCH] bugfix: prefixed css classes
---
prefixCSS.py | 2 +-
.../analysis-panel/analysis-panel.component.scss | 9 ---------
.../network-menu-left/network-menu-left.component.html | 2 +-
.../network/network-menu/network-menu.component.html | 2 +-
src/app/components/network/network.component.scss | 9 ---------
src/stylesheets/styles.scss | 3 +++
6 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/prefixCSS.py b/prefixCSS.py
index 7f24a9d7..16bc2ec7 100644
--- a/prefixCSS.py
+++ b/prefixCSS.py
@@ -348,7 +348,7 @@ class ParserCSS:
if file.endswith(".scss") or file.endswith(".css") or file.endswith(".sass"):
path = os.path.join(root, file)
# skip ng select classes
- if '@ng-select' in path:
+ if '@ng-select' in path or '-no-prefix.scss' in path:
continue
print('parsing', path)
scss = self.parseCSS(path)
diff --git a/src/app/components/analysis-panel/analysis-panel.component.scss b/src/app/components/analysis-panel/analysis-panel.component.scss
index 1bd44595..e57f4632 100644
--- a/src/app/components/analysis-panel/analysis-panel.component.scss
+++ b/src/app/components/analysis-panel/analysis-panel.component.scss
@@ -6,15 +6,6 @@
width: 100% !important;
}
-.fullscreen{
- position: fixed !important;
- height: 100vh !important;
- width: 100vw !important;
- top: 0 !important;
- left: 0 !important;
- z-index: $fullscreen-z;
-}
-
.tab-header-small {
padding: 0 !important;
}
diff --git a/src/app/components/network/network-menu-left/network-menu-left.component.html b/src/app/components/network/network-menu-left/network-menu-left.component.html
index 45fb257e..c44c0d93 100644
--- a/src/app/components/network/network-menu-left/network-menu-left.component.html
+++ b/src/app/components/network/network-menu-left/network-menu-left.component.html
@@ -9,7 +9,7 @@
<a
(click)="networkHandler.activeNetwork.toggleNetworkSidebar()"
class="button is-small is-primary network-toolbar-toggle"
- [ngClass]="{ rotated: !networkHandler.activeNetwork.networkSidebarOpen }"
+ [ngClass]="{ 'rotated': !networkHandler.activeNetwork.networkSidebarOpen }"
>
<app-fa-solid-icon
icon="angle-left"
diff --git a/src/app/components/network/network-menu/network-menu.component.html b/src/app/components/network/network-menu/network-menu.component.html
index 13356069..46340a8c 100644
--- a/src/app/components/network/network-menu/network-menu.component.html
+++ b/src/app/components/network/network-menu/network-menu.component.html
@@ -9,7 +9,7 @@
<a
(click)="networkHandler.activeNetwork.toggleNetworkSidebar()"
class="button is-small is-primary network-toolbar-toggle"
- [ngClass]="{ rotated: networkHandler.activeNetwork.networkSidebarOpen }"
+ [ngClass]="{ 'rotated': networkHandler.activeNetwork.networkSidebarOpen }"
>
<app-fa-solid-icon
icon="angle-left"
diff --git a/src/app/components/network/network.component.scss b/src/app/components/network/network.component.scss
index 8f2669e6..e7d0a467 100644
--- a/src/app/components/network/network.component.scss
+++ b/src/app/components/network/network.component.scss
@@ -13,12 +13,3 @@
.dropdown-menu{
z-index: $network-tissue-options-z !important;
}
-
-.fullscreen{
- position: fixed !important;
- height: 100vh !important;
- width: 100vw !important;
- top: 0 !important;
- left: 0 !important;
- z-index: $fullscreen-z;
-}
diff --git a/src/stylesheets/styles.scss b/src/stylesheets/styles.scss
index 24c5dd4a..0b0a7ba5 100644
--- a/src/stylesheets/styles.scss
+++ b/src/stylesheets/styles.scss
@@ -6,6 +6,9 @@
@import "variables";
#appWindow {
+
+ @import "./styles-no-prefix.scss";
+
font-family: var(--drgstn-font-family) !important;
height: var(--drgstn-height, 500px) !important;
display: block !important;
--
GitLab