Merge pull request #2861 from wazuh/Features/Fixed-bug-in-sca-and-reg…

…ulatory-compliance-tables-and-fix-in-wz-menu-firefox-sca Fixed bug in sca and regulatory compliance tables and in wz menu on f…
wazuh · Jan 28, 2021 · 386b9d6 · 386b9d6
2 parents 4491099 + 5e082be
commit 386b9d6
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/public/components/overview/compliance-table/compliance-table.tsx b/public/components/overview/compliance-table/compliance-table.tsx
@@ -282,8 +282,8 @@ export class ComplianceTable extends Component {
         <EuiFlexItem style={{ width: "calc(100% - 24px)" }}>
           <EuiPanel paddingSize="none">
             {!!Object.keys(complianceObject).length && this.state.filterParams.time.from !== "init" &&
-              <EuiFlexGroup>
-                <EuiFlexItem grow={false} style={{ width: "15%", minWidth: 145, maxHeight: "calc(100vh - 300px)", overflowX: "hidden" }}>
+                <EuiFlexGroup>
+                <EuiFlexItem grow={false} style={{ width: "15%", minWidth: 145, maxHeight: "calc(100vh - 320px)", overflowX: "hidden" }}>
                   <ComplianceRequirements
                     indexPattern={this.indexPattern}
                     section={this.props.section}

diff --git a/public/components/overview/compliance-table/components/subrequirements/subrequirements.tsx b/public/components/overview/compliance-table/components/subrequirements/subrequirements.tsx
@@ -204,7 +204,7 @@ export class ComplianceSubrequirements extends Component {
     })
     if (tacticsToRender.length) {
       return (
-        <EuiFlexGrid columns={4} gutterSize="s" style={{ maxHeight: "calc(100vh - 385px)", overflow: "overlay", overflowX: "hidden", maxWidth: "82vw", paddingRight: 10 }}>
+        <EuiFlexGrid columns={4} gutterSize="s" style={{ maxHeight: "calc(100vh - 420px)", overflow: "overlay", overflowX: "hidden", maxWidth: "82vw", paddingRight: 10 }}>
           {tacticsToRenderOrdered}
         </EuiFlexGrid>
       )

diff --git a/public/components/overview/mitre/components/techniques/techniques.tsx b/public/components/overview/mitre/components/techniques/techniques.tsx
@@ -254,14 +254,14 @@ export const Techniques = withWindowSize(class Techniques extends Component {
     })
     if(this.state.isSearching || this.state.loadingAlerts || this.props.isLoading){
       return (
-        <EuiFlexItem style={{ height: "calc(100vh - 410px)", alignItems: 'center' }} >
+        <EuiFlexItem style={{ height: "calc(100vh - 450px)", alignItems: 'center' }} >
           <EuiLoadingSpinner size='xl'/>
         </EuiFlexItem>
       )
     }
     if(tacticsToRender.length){
       return (
-      <EuiFlexGrid columns={this.techniqueColumnsResponsive()} gutterSize="s" style={{ maxHeight: "calc(100vh - 385px)", overflow: "overlay", overflowX: "hidden", paddingRight: 10}}>
+      <EuiFlexGrid columns={this.techniqueColumnsResponsive()} gutterSize="s" style={{ maxHeight: "calc(100vh - 420px)", overflow: "overlay", overflowX: "hidden", paddingRight: 10}}>
         {tacticsToRenderOrdered}
       </EuiFlexGrid>
       )

diff --git a/public/components/overview/mitre/mitre.tsx b/public/components/overview/mitre/mitre.tsx
@@ -160,7 +160,7 @@ export class Mitre extends Component {
           <EuiFlexItem>
             <EuiPanel paddingSize="none">
                 <EuiFlexGroup >
-                  <EuiFlexItem grow={false} style={{width: "15%", minWidth: 145, height: "calc(100vh - 280px)",overflowX: "hidden"}}>
+                  <EuiFlexItem grow={false} style={{width: "15%", minWidth: 145, height: "calc(100vh - 325px)",overflowX: "hidden"}}>
                     <Tactics 
                       indexPattern={this.indexPattern}
                       onChangeSelectedTactics={this.onChangeSelectedTactics}

diff --git a/public/components/wz-menu/wz-menu.scss b/public/components/wz-menu/wz-menu.scss
@@ -115,7 +115,7 @@ wz-menu {
 }
 
 .wz-menu-overview {
-    min-width: 700px;
+    min-width: 716px;
 }
 
 @media only screen and (max-width: 767px){