Merge pull request #623 from wadkarsatish/v3.x/staging-css-fixes

Small CSS fixes
zowe · Sep 12, 2024 · 2d8f07b · 2d8f07b
2 parents 02599d5 + 5199ddf
commit 2d8f07b
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 28 deletions.
diff --git a/virtual-desktop/plugin-config/webpack5.base.js b/virtual-desktop/plugin-config/webpack5.base.js
@@ -14,7 +14,6 @@ const path = require('path');
 const desktopDir = path.resolve(__dirname, '..');
 
 const config = {
-  devtool: 'source-map',
   mode: 'production',
   output: {
     libraryTarget: 'umd',

diff --git a/virtual-desktop/src/app/shared/include-external-css.component.ts b/virtual-desktop/src/app/shared/include-external-css.component.ts
@@ -9,6 +9,7 @@ import { Component, ViewEncapsulation } from "@angular/core";
     "../../../node_modules/bootstrap/dist/css/bootstrap.min.css",
     "../../../node_modules/font-awesome/css/font-awesome.css",
     "../../assets/css/desktop.css",
+    "../../assets/css/animate.css",
     "../../styles.css"
   ],
   encapsulation: ViewEncapsulation.None

diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/desktop/desktop.component.html b/virtual-desktop/src/app/window-manager/mvd-window-manager/desktop/desktop.component.html
@@ -9,14 +9,14 @@
   
   Copyright Contributors to the Zowe Project.
 -->
-<include-external-css></include-external-css>
 <ng-container *ngIf="contextMenuDef != null">
   <com-rs-mvd-context-menu [xPos]="contextMenuDef.xPos" [yPos]="contextMenuDef.yPos" [menuItems]="contextMenuDef.items" (complete)="closeContextMenu()"></com-rs-mvd-context-menu>
 </ng-container>
 
 <rs-com-window-pane [theme]="_theme"></rs-com-window-pane>
 <rs-com-launchbar (changeTheme)="setTheme($event)" (previewTheme)="previewTheme($event)" [theme]="_theme"></rs-com-launchbar>
 <rs-com-personalization-panel *ngIf="isPersonalizationPanelVisible"></rs-com-personalization-panel>
+<include-external-css></include-external-css>
 
 <!-- 
   This program and the accompanying materials are

diff --git a/...p/window-manager/mvd-window-manager/launchbar/launchbar-icon/launchbar-icon.component.css b/...p/window-manager/mvd-window-manager/launchbar/launchbar-icon/launchbar-icon.component.css
@@ -1,5 +1,3 @@
-
-
 /*
   This program and the accompanying materials are
   made available under the terms of the Eclipse Public License v2.0 which accompanies
@@ -14,9 +12,7 @@
   display: inline-block;
   box-sizing: border-box;
   position: relative;
-  margin-top: 5px;
-  margin-left: 5px;
-  margin-right: 5px;
+  margin: 5px 5px 0px 5px;
   padding: 0;
   user-select: none;
   -ms-user-select: none;
@@ -26,6 +22,10 @@
   text-align: center;
 }
 
+.launchbar-icon-image {
+  margin-bottom: 3px;
+}
+
 .launchbar-icon-image.active {
   background-position-y: 0px;
 }
@@ -109,5 +109,4 @@
   SPDX-License-Identifier: EPL-2.0
   
   Copyright Contributors to the Zowe Project.
-*/
-
+*/
diff --git a/...op/src/app/window-manager/mvd-window-manager/launchbar/launchbar/launchbar.component.html b/...op/src/app/window-manager/mvd-window-manager/launchbar/launchbar/launchbar.component.html
@@ -18,7 +18,7 @@
   [style.display]="displayAppBar">
   <rs-com-launchbar-menu [menuItems]="allItems" [theme]="_theme" (itemClicked)="menuItemClicked($event)"  (refreshClicked)="getNewItems()"></rs-com-launchbar-menu>
 
-  <div class="applist row" 
+  <div class="applist" 
     [style.margin]="applistMargin"
     [style.background]="_theme.color.launchbarColor"
     [style.padding-left]="applistPadding"

diff --git a/virtual-desktop/src/app/window-manager/simple-window-manager/simple.component.html b/virtual-desktop/src/app/window-manager/simple-window-manager/simple.component.html
@@ -9,7 +9,6 @@
   
   Copyright Contributors to the Zowe Project.
 -->
-<include-external-css></include-external-css>
 <div class="degenerate-container">
   <h1 style="text-align:center" *ngIf="error.length > 0">
     {{error}}
@@ -33,6 +32,7 @@ <h1 style="text-align:center" *ngIf="error.length > 0">
     </div>
   </com-rs-mvd-viewport>
 </div>
+<include-external-css></include-external-css>
 <!-- 
   This program and the accompanying materials are
   made available under the terms of the Eclipse Public License v2.0 which accompanies

diff --git a/virtual-desktop/src/assets/css/desktop.css b/virtual-desktop/src/assets/css/desktop.css
@@ -1,5 +1,3 @@
-
-
 /*
   This program and the accompanying materials are
   made available under the terms of the Eclipse Public License v2.0 which accompanies
@@ -11,16 +9,16 @@
 */
 
 html {
- width: 100%;
- height: 100%;
+  width: 100%;
+  height: 100%;
 }
 
 body {
-  font-family: 'Roboto', sans-serif;
-  font-size: 14px;
-  line-height: 1.42857143;
-  width:100%;
-  height:100%;
+  font-family: 'Roboto', sans-serif !important;
+  font-size: 14px !important;
+  line-height: 1.42857143 !important;
+  width: 100%;
+  height: 100%;
 }
 
 .desktop {
@@ -34,14 +32,15 @@ body {
 
 /* Force the scroll bar to be show in webkit browser (Mac hides by default) */
 ::-webkit-scrollbar {
-    -webkit-appearance: none;
-    width: 8px;
-    height: 8px;
+  -webkit-appearance: none;
+  width: 8px;
+  height: 8px;
 }
+
 ::-webkit-scrollbar-thumb {
-    border-radius: 4px;
-    background-color: rgba(0,0,0,.35);
-    -webkit-box-shadow: 0 0 1px rgba(255,255,255,.5);
+  border-radius: 4px;
+  background-color: rgba(0, 0, 0, .35);
+  -webkit-box-shadow: 0 0 1px rgba(255, 255, 255, .5);
 }
 
 /*
@@ -52,5 +51,4 @@ body {
   SPDX-License-Identifier: EPL-2.0
   
   Copyright Contributors to the Zowe Project.
-*/
-
+*/