Merge pull request #22 from qlik-oss/fix-merge-issues

remove some duplicated css from merge conflicts
qlik-oss · Feb 22, 2019 · 9eeaecb · 9eeaecb
2 parents ca5f442 + 7305175
commit 9eeaecb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 17 deletions.
diff --git a/src/data-table/data-cell.jsx b/src/data-table/data-cell.jsx
@@ -96,18 +96,25 @@ class DataCell extends React.PureComponent {
       textAlignment = textAlignmentProp;
     }
 
+    let cellStyle = {
+      fontFamily: styling.options.fontFamily,
+      ...styleBuilder.getStyle(),
+      paddingLeft: '5px',
+      textAlign: textAlignment
+
+    };
+
     const { semaphoreColors, semaphoreColors: { fieldsToApplyTo } } = styling;
     const isValidSemaphoreValue = !styleBuilder.hasComments() && !isNaN(measurement.value);
-    const shouldHaveSemaphoreColors = fieldsToApplyTo.applyToMetric && (fieldsToApplyTo.applyToAll || fieldsToApplyTo.specificFields.indexOf(measurement.name) !== -1);
-    let cellStyle;
+    const shouldHaveSemaphoreColors = (fieldsToApplyTo.applyToMetric || fieldsToApplyTo.specificFields.indexOf(measurement.parents.dimension1.header) !== -1);
     if (isValidSemaphoreValue && shouldHaveSemaphoreColors) {
       const { backgroundColor, color } = getSemaphoreColors(measurement, semaphoreColors);
       cellStyle = {
+        ...styleBuilder.getStyle(),
         backgroundColor,
         color,
         fontFamily: styling.options.fontFamily,
-        ...styleBuilder.getStyle(),
-        paddingLeft: '4px',
+        paddingLeft: '5px',
         textAlign: textAlignment
       };
     }

diff --git a/src/main.less b/src/main.less
@@ -204,13 +204,6 @@
     width: 350px;
   }
 
-  /* popups for headers */
-  .header-wrapper {
-    position: absolute;
-    top: 0;
-    z-index: 1;
-  }
-
   .tooltip {
     position: fixed !important;
     color: rgb(70, 70, 70);
@@ -219,12 +212,6 @@
     border: groove;
   }
 
-  .row-wrapper {
-    height: calc(~"100% - 97px");
-    padding: 0;
-    margin-top: 0;
-  }
-
   .kpi-table .fdim-cells,
   .data-table td {
     line-height: 1em !important;
@@ -280,6 +267,8 @@
   .kpi-table .row-wrapper,
   .data-table .header-wrapper,
   .data-table .row-wrapper {
+    /* stylelint-disable-next-line property-no-unknown */
+    scrollbar-width: none;
     -ms-overflow-style: none; // IE 10+
     -moz-overflow: -moz-scrollbars-none; // Firefox