Merge pull request #219 from dmpl1/feature/table-fix

Added header Pacbot, Side Panel removed and table related CSS changes.
tmobile · Jun 4, 2019 · de63b5f · de63b5f
2 parents 87ceb59 + 59c53af
commit de63b5f
Show file tree

Hide file tree

Showing 68 changed files with 1,349 additions and 8,956 deletions.
diff --git a/webapp/package.json b/webapp/package.json
@@ -38,7 +38,7 @@
     "core-js": "^2.4.1",
     "d3": "^4.11.0",
     "font-awesome": "^4.7.0",
-    "html2canvas": "^1.0.0-alpha.8",
+    "html2canvas": "^1.0.0-alpha.12",
     "lodash": "^4.17.4",
     "moment": "^2.21.0",
     "ng2-datepicker": "~2.1.7",

diff --git a/webapp/src/app/pacman-features/modules/admin/admin.component.css b/webapp/src/app/pacman-features/modules/admin/admin.component.css
@@ -18,50 +18,3 @@
     font-size: 1em;
 }
 
-.contextual-menu-container {
-    width: 15%;
-    height: 100%;
-}
-
-.contextual-content-container {
-    width: 85%;
-    height: 100%;
-}
-
-.main-panel {
-    width: 94.3%;
-    height: 100%;
-    overflow: hidden;
-    margin: 0 .93%;
-    border-radius: 5px;
-    background-color: #fbfbfb;
-    box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.5);
-}
-
-.main-panel.tv-selected {
-    margin: auto;
-}
-
-.panel {
-    width: 1.875%;
-    height: 100%;
-}
-
-
-/* Animate routes */
-
-.contextual-content-container {
-    /* flex: 1; */
-    position: relative;
-}
-
-
-/* This class is added in animation file while :enter and :leave due to scroll issue */
-
-
-/*/deep/ router-outlet ~ * {
-           position: absolute;
-           width: 100%;
-           height: 100%;
-       }
-*/
diff --git a/webapp/src/app/pacman-features/modules/admin/admin.component.html b/webapp/src/app/pacman-features/modules/admin/admin.component.html
@@ -13,7 +13,6 @@
  -->
 
  <div class="admin-wrapper flex flex-between">
-    <app-canvas-side-panel *ngIf="tvState!=true && tvState!='true'" [rightPointing]='true' class="panel"></app-canvas-side-panel>
     <div class="main-panel flex flex-between" [class.tv-selected]="tvState==true || tvState=='true'">
         <div class="contextual-menu-container" *ngIf="tvState!=true && tvState!='true'">
             <app-contextual-menu [pageTitle]="pageTitle" [listOfMenus]="listOfContextualMenuItems"></app-contextual-menu>
@@ -22,5 +21,4 @@
             <router-outlet #route="outlet"></router-outlet>
         </div>
     </div>
-    <app-canvas-side-panel *ngIf="tvState!=true && tvState!='true'" [moduleName]="'tools'" [rightPointing]='false' class="panel" [displayProperty]="false"></app-canvas-side-panel>
 </div>
diff --git a/webapp/src/app/pacman-features/modules/admin/asset-groups/asset-groups.component.css b/webapp/src/app/pacman-features/modules/admin/asset-groups/asset-groups.component.css
@@ -69,34 +69,6 @@
     color: rgb(85, 85, 85);
 }
 
-.issue-listing-wrapper /deep/ .data-table-wrap {
-    min-height: calc( 100vh - 24em);
-}
-
-.issue-listing-wrapper /deep/ .data-table-content {
-    min-height: calc( 100vh - 32em);
-}
-
-.issue-listing-wrapper /deep/ .data-table-inner-wrap {
-    max-height: calc(100vh - 35em)
-}
-
-.issue-listing-wrapper /deep/ .data-table-wrap.loading {
-    min-height: calc( 100vh - 24em);
-}
-
-.filter-absent.issue-listing-wrapper /deep/ .data-table-wrap {
-    min-height: calc(100vh - 20em);
-}
-
-.filter-absent.issue-listing-wrapper /deep/ .data-table-content {
-    min-height: calc( 100vh - 28em);
-}
-
-.filter-absent.issue-listing-wrapper /deep/ .data-table-inner-wrap {
-    max-height: calc(100vh - 31em)
-}
-
 .details-bar[_ngcontent-c14] {
     width: 50em !important;
 }

diff --git a/webapp/src/app/pacman-features/modules/admin/asset-groups/asset-groups.component.html b/webapp/src/app/pacman-features/modules/admin/asset-groups/asset-groups.component.html
@@ -24,7 +24,7 @@ <h1 class="title-text">{{pageTitle}}</h1>
             <button class="submit-btn uppercase" type="button" (click)='goToCreateAssetGroup()'><i class="fa fa-plus"></i> Create Asset Group</button>
         </div>
     </div>
-    <div class="floating-widgets-container">
+    <div class="floating-widgets-container data-table-container data-table-container">
         <section>
             <ul>
                 <li class="widget-wrapper relative">