diff --git a/src/headers-table/measurement-column-header.jsx b/src/headers-table/measurement-column-header.jsx index 2f376c3..6252b89 100644 --- a/src/headers-table/measurement-column-header.jsx +++ b/src/headers-table/measurement-column-header.jsx @@ -6,7 +6,7 @@ import Tooltip from '../tooltip/index.jsx'; const MeasurementColumnHeader = ({ baseCSS, general, hasSecondDimension, measurement, styling }) => { const title = `${measurement.name} ${measurement.magnitudeLabelSuffix}`; const { fontSizeAdjustment } = styling.headerOptions; - const isMediumFontSize = styling.headerOptions.fontSizeAdjustment === HEADER_FONT_SIZE.MEDIUM; + const isMediumFontSize = fontSizeAdjustment === HEADER_FONT_SIZE.MEDIUM; if (hasSecondDimension) { const isPercentageFormat = measurement.format.substring(measurement.format.length - 1) === '%'; @@ -20,7 +20,7 @@ const MeasurementColumnHeader = ({ baseCSS, general, hasSecondDimension, measure ...baseCSS, cursor: 'default', fontSize: `${baseFontSize + fontSizeAdjustment}px`, - height: isMediumFontSize ? '50px' : '25px', + height: isMediumFontSize ? '40px' : '25px', verticalAlign: 'middle' }; return ( @@ -39,7 +39,8 @@ const MeasurementColumnHeader = ({ baseCSS, general, hasSecondDimension, measure ); } - const isLong = (title.length > 11 && fontSizeAdjustment === 0) || (title.length > 12 && fontSizeAdjustment === -2); + const isLong = (title.length > 11 && fontSizeAdjustment === HEADER_FONT_SIZE.SMALL) + || (title.length > 12 && fontSizeAdjustment === HEADER_FONT_SIZE.MEDIUM); const suffixWrap = isLong ? '70' : 'empty'; const style = { ...baseCSS, diff --git a/src/initialize-transformed.js b/src/initialize-transformed.js index b008a33..b30a452 100644 --- a/src/initialize-transformed.js +++ b/src/initialize-transformed.js @@ -18,8 +18,7 @@ function getAlignment (option) { function getFontSizeAdjustment (option) { const fontSizeAdjustmentOptions = { 1: HEADER_FONT_SIZE.SMALL, - 2: HEADER_FONT_SIZE.MEDIUM, - 3: 2 + 2: HEADER_FONT_SIZE.MEDIUM }; return fontSizeAdjustmentOptions[option] || 0; diff --git a/src/main.less b/src/main.less index 118d25c..b1cbd99 100644 --- a/src/main.less +++ b/src/main.less @@ -87,14 +87,6 @@ text-overflow: ellipsis; } - .wrapclass45 { - width: 100%; - height: 45px; - white-space: pre-line; - overflow: hidden; - display: block; - } - .wrapclass70 { width: 100%; height: 70px;