From 717ef7f96fdffeae3b3137896e4c400dbc4d3c4d Mon Sep 17 00:00:00 2001 From: manajdov Date: Wed, 13 Mar 2019 13:44:21 -0700 Subject: [PATCH 01/15] -added border-box in the global styles --- .../react/src/themes/teams/staticStyles/normalizeCSS.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/react/src/themes/teams/staticStyles/normalizeCSS.ts b/packages/react/src/themes/teams/staticStyles/normalizeCSS.ts index 5173dd5f68..3be61a3ca5 100644 --- a/packages/react/src/themes/teams/staticStyles/normalizeCSS.ts +++ b/packages/react/src/themes/teams/staticStyles/normalizeCSS.ts @@ -28,6 +28,15 @@ body { margin: 0; } +/** + * Adds consistency to the elements size. + */ +*, *:after, *:before { + -webkit-box-sizing:border-box; + -moz-box-sizing:border-box; + box-sizing:border-box; + } + /** * Correct the font size and margin on \`h1\` elements within \`section\` and * \`article\` contexts in Chrome, Firefox, and Safari. From d69744b87f1080a972226b3878c979ad770fb029 Mon Sep 17 00:00:00 2001 From: manajdov Date: Wed, 13 Mar 2019 14:17:10 -0700 Subject: [PATCH 02/15] -updated icon styles --- packages/react/src/themes/teams/components/Icon/iconStyles.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/src/themes/teams/components/Icon/iconStyles.ts b/packages/react/src/themes/teams/components/Icon/iconStyles.ts index db5ca276a3..e81037f45f 100644 --- a/packages/react/src/themes/teams/components/Icon/iconStyles.ts +++ b/packages/react/src/themes/teams/components/Icon/iconStyles.ts @@ -107,7 +107,7 @@ const iconStyles: ComponentSlotStylesInput = { speak: 'none', verticalAlign: 'middle', - ...(!isFontBased && { boxSizing: 'border-box' }), + ...(isFontBased && { boxSizing: 'content-box' }), ...(isFontBased && getFontStyles(getIconSize(size, v.sizeModifier), name)), From e02e687737bc69f886194ae0cd935b0cea837681 Mon Sep 17 00:00:00 2001 From: manajdov Date: Thu, 14 Mar 2019 10:48:51 -0700 Subject: [PATCH 03/15] -fixed dropdown styles --- .../src/themes/teams/components/Dropdown/dropdownVariables.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react/src/themes/teams/components/Dropdown/dropdownVariables.ts b/packages/react/src/themes/teams/components/Dropdown/dropdownVariables.ts index dfab693f62..920ead882e 100644 --- a/packages/react/src/themes/teams/components/Dropdown/dropdownVariables.ts +++ b/packages/react/src/themes/teams/components/Dropdown/dropdownVariables.ts @@ -30,12 +30,12 @@ export default (siteVars): DropdownVariables => ({ borderWidth: `0 0 ${pxToRem(2)} 0`, color: siteVars.bodyColor, comboboxPaddingButton: `0 ${_12px_asRem}`, - comboboxFlexBasis: '50px', + comboboxFlexBasis: pxToRem(50), listBackgroundColor: siteVars.colors.white, listBorderRadius: _3px_asRem, listPadding: `${pxToRem(8)} 0`, listBoxShadow: `0 .2rem .6rem 0 ${siteVars.gray06}`, - listMaxHeight: '20rem', + listMaxHeight: pxToRem(296), listItemBackgroundColor: siteVars.colors.white, listItemBackgroundColorActive: siteVars.colors.primary[500], listItemColorActive: siteVars.colors.white, From 58cb46ebaa297d33fec9ab7f158c6054e028d14b Mon Sep 17 00:00:00 2001 From: manajdov Date: Thu, 14 Mar 2019 11:12:18 -0700 Subject: [PATCH 04/15] -moved styles to globalStyles --- .../react/src/themes/teams/staticStyles/globalStyles.ts | 9 +++++++++ .../react/src/themes/teams/staticStyles/normalizeCSS.ts | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/react/src/themes/teams/staticStyles/globalStyles.ts b/packages/react/src/themes/teams/staticStyles/globalStyles.ts index fdec79ddbb..a7ad7efaaf 100644 --- a/packages/react/src/themes/teams/staticStyles/globalStyles.ts +++ b/packages/react/src/themes/teams/staticStyles/globalStyles.ts @@ -11,6 +11,15 @@ const globalStyles: StaticStyleFunction = siteVars => ({ fontSize: siteVars.bodyFontSize, lineHeight: siteVars.bodyLineHeight, }, + '*': { + boxSizing: 'border-box', + }, + '*:before': { + boxSizing: 'border-box', + }, + '*:after': { + boxSizing: 'border-box', + }, }) export default globalStyles diff --git a/packages/react/src/themes/teams/staticStyles/normalizeCSS.ts b/packages/react/src/themes/teams/staticStyles/normalizeCSS.ts index 3be61a3ca5..5173dd5f68 100644 --- a/packages/react/src/themes/teams/staticStyles/normalizeCSS.ts +++ b/packages/react/src/themes/teams/staticStyles/normalizeCSS.ts @@ -28,15 +28,6 @@ body { margin: 0; } -/** - * Adds consistency to the elements size. - */ -*, *:after, *:before { - -webkit-box-sizing:border-box; - -moz-box-sizing:border-box; - box-sizing:border-box; - } - /** * Correct the font size and margin on \`h1\` elements within \`section\` and * \`article\` contexts in Chrome, Firefox, and Safari. From c53fcc6dd7ad722cde3c446cda00ed70ac7c01c3 Mon Sep 17 00:00:00 2001 From: manajdov Date: Thu, 14 Mar 2019 13:05:24 -0700 Subject: [PATCH 05/15] -removed unnecessary box sizing styles --- .../react/src/themes/base/components/Loader/loaderStyles.ts | 2 -- .../react/src/themes/teams/components/Avatar/avatarStyles.ts | 3 --- .../src/themes/teams/components/Dropdown/dropdownStyles.ts | 1 - .../react/src/themes/teams/components/Image/imageStyles.ts | 1 - .../react/src/themes/teams/components/Input/inputStyles.ts | 1 - .../react/src/themes/teams/components/Status/statusStyles.ts | 1 - 6 files changed, 9 deletions(-) diff --git a/packages/react/src/themes/base/components/Loader/loaderStyles.ts b/packages/react/src/themes/base/components/Loader/loaderStyles.ts index 8d7b48aae0..6a1bf3982c 100644 --- a/packages/react/src/themes/base/components/Loader/loaderStyles.ts +++ b/packages/react/src/themes/base/components/Loader/loaderStyles.ts @@ -52,8 +52,6 @@ export default { borderStyle: 'solid', borderWidth: v.borderSizes[p.size], - boxSizing: 'border-box', - width: v.indicatorSizes[p.size], height: v.indicatorSizes[p.size], } diff --git a/packages/react/src/themes/teams/components/Avatar/avatarStyles.ts b/packages/react/src/themes/teams/components/Avatar/avatarStyles.ts index d6a849d6c2..d64e1c8ba7 100644 --- a/packages/react/src/themes/teams/components/Avatar/avatarStyles.ts +++ b/packages/react/src/themes/teams/components/Avatar/avatarStyles.ts @@ -17,7 +17,6 @@ const avatarStyles: ComponentSlotStylesInput = { const sizeInRem = pxToRem(sizeToPxValue[size]) return { - boxSizing: 'border-box', position: 'relative', backgroundColor: 'inherit', display: 'inline-block', @@ -27,7 +26,6 @@ const avatarStyles: ComponentSlotStylesInput = { } }, image: ({ variables: v }): ICSSInJSStyle => ({ - boxSizing: 'border-box', borderColor: v.avatarBorderColor, borderStyle: 'solid', borderWidth: `${v.avatarBorderWidth}px`, @@ -40,7 +38,6 @@ const avatarStyles: ComponentSlotStylesInput = { label: ({ props: { size } }): ICSSInJSStyle => { const sizeInRem = pxToRem(sizeToPxValue[size]) return { - boxSizing: 'border-box', display: 'inline-block', width: sizeInRem, height: sizeInRem, diff --git a/packages/react/src/themes/teams/components/Dropdown/dropdownStyles.ts b/packages/react/src/themes/teams/components/Dropdown/dropdownStyles.ts index 468d41015b..f1dea31aab 100644 --- a/packages/react/src/themes/teams/components/Dropdown/dropdownStyles.ts +++ b/packages/react/src/themes/teams/components/Dropdown/dropdownStyles.ts @@ -64,7 +64,6 @@ const dropdownStyles: ComponentSlotStylesInput ({ - boxSizing: 'border-box', display: 'inline-block', verticalAlign: 'middle', width: (props.fluid && '100%') || variables.width, diff --git a/packages/react/src/themes/teams/components/Input/inputStyles.ts b/packages/react/src/themes/teams/components/Input/inputStyles.ts index e9349e1e60..c84ee34813 100644 --- a/packages/react/src/themes/teams/components/Input/inputStyles.ts +++ b/packages/react/src/themes/teams/components/Input/inputStyles.ts @@ -14,7 +14,6 @@ const inputStyles: ComponentSlotStylesInput = { input: ({ props: p, variables: v }): ICSSInJSStyle => ({ outline: 0, - boxSizing: 'border-box', borderStyle: 'solid', borderColor: 'transparent', borderWidth: v.borderWidth, diff --git a/packages/react/src/themes/teams/components/Status/statusStyles.ts b/packages/react/src/themes/teams/components/Status/statusStyles.ts index 422185c72a..87e05838ef 100644 --- a/packages/react/src/themes/teams/components/Status/statusStyles.ts +++ b/packages/react/src/themes/teams/components/Status/statusStyles.ts @@ -58,7 +58,6 @@ export const getSizeStyles = (sizeInPx: number, variables: StatusVariables) => { const statusStyles: ComponentSlotStylesInput = { root: ({ props: { color, size, state }, variables }): ICSSInJSStyle => { return { - boxSizing: 'border-box', display: 'inline-flex', alignItems: 'center', justifyContent: 'center', From 7308386305d0e336fd3f3eff2223538ac9c4c07a Mon Sep 17 00:00:00 2001 From: manajdov Date: Thu, 14 Mar 2019 14:40:12 -0700 Subject: [PATCH 06/15] -updates changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8721ea08be..947d864efa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased] +### BREAKING CHANGES +- added `box-sizing: border-box` to all elements, as well as before and after pseudo elements in Teams theme @mnajdova ([]()) + ## [v0.23.1](https://github.com/stardust-ui/react/tree/v0.23.1) (2019-03-13) [Compare changes](https://github.com/stardust-ui/react/compare/v0.23.0...v0.23.1) From 525aafc2baa6d79fc67fd78ac6b411f180d15008 Mon Sep 17 00:00:00 2001 From: manajdov Date: Mon, 18 Mar 2019 11:41:58 +0100 Subject: [PATCH 07/15] -reverted loader styles form base theme --- .../react/src/themes/base/components/Loader/loaderStyles.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/react/src/themes/base/components/Loader/loaderStyles.ts b/packages/react/src/themes/base/components/Loader/loaderStyles.ts index 6a1bf3982c..8d7b48aae0 100644 --- a/packages/react/src/themes/base/components/Loader/loaderStyles.ts +++ b/packages/react/src/themes/base/components/Loader/loaderStyles.ts @@ -52,6 +52,8 @@ export default { borderStyle: 'solid', borderWidth: v.borderSizes[p.size], + boxSizing: 'border-box', + width: v.indicatorSizes[p.size], height: v.indicatorSizes[p.size], } From d8d4ef668de91e808c4ab654371dc8221534fd3e Mon Sep 17 00:00:00 2001 From: manajdov Date: Mon, 18 Mar 2019 11:46:54 +0100 Subject: [PATCH 08/15] -updated changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 947d864efa..f6d51b5ee6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased] ### BREAKING CHANGES -- added `box-sizing: border-box` to all elements, as well as before and after pseudo elements in Teams theme @mnajdova ([]()) +- added `box-sizing: border-box` to all elements, as well as before and after pseudo elements in Teams theme @mnajdova ([#1057](https://github.com/stardust-ui/react/pull/1057)) ## [v0.23.1](https://github.com/stardust-ui/react/tree/v0.23.1) (2019-03-13) From 14f3e7d6a03e1dd2a913c5865e1c52f292202805 Mon Sep 17 00:00:00 2001 From: manajdov Date: Tue, 26 Mar 2019 16:39:15 +0100 Subject: [PATCH 09/15] -removed unnecessary border-box styles --- docs/src/prototypes/chatPane/composeMessage.tsx | 1 - .../src/themes/base/components/Loader/loaderStyles.ts | 2 -- .../react/src/themes/teams/components/Alert/alertStyles.ts | 1 - .../teams/components/RadioGroup/radioGroupItemStyles.ts | 7 ------- 4 files changed, 11 deletions(-) diff --git a/docs/src/prototypes/chatPane/composeMessage.tsx b/docs/src/prototypes/chatPane/composeMessage.tsx index d40f874eda..d51c749c24 100644 --- a/docs/src/prototypes/chatPane/composeMessage.tsx +++ b/docs/src/prototypes/chatPane/composeMessage.tsx @@ -57,7 +57,6 @@ const getInputWrapperStyles = ({ attached }: ComposeMessageProps): React.CSSProp const borderWidth = '1px' return { - boxSizing: 'border-box', borderStyle: 'solid', borderWidth, borderRadius: `${borderTopRadius} ${borderTopRadius} ${borderBottomRadius} ${borderBottomRadius}`, diff --git a/packages/react/src/themes/base/components/Loader/loaderStyles.ts b/packages/react/src/themes/base/components/Loader/loaderStyles.ts index 8d7b48aae0..6a1bf3982c 100644 --- a/packages/react/src/themes/base/components/Loader/loaderStyles.ts +++ b/packages/react/src/themes/base/components/Loader/loaderStyles.ts @@ -52,8 +52,6 @@ export default { borderStyle: 'solid', borderWidth: v.borderSizes[p.size], - boxSizing: 'border-box', - width: v.indicatorSizes[p.size], height: v.indicatorSizes[p.size], } diff --git a/packages/react/src/themes/teams/components/Alert/alertStyles.ts b/packages/react/src/themes/teams/components/Alert/alertStyles.ts index 2ca5e0eb3e..bdc4ee81cb 100644 --- a/packages/react/src/themes/teams/components/Alert/alertStyles.ts +++ b/packages/react/src/themes/teams/components/Alert/alertStyles.ts @@ -61,7 +61,6 @@ const alertStyles: ComponentSlotStylesInput = { alignItems: 'center', position: 'relative', width: '100%', - boxSizing: 'border-box', borderStyle: v.borderStyle, borderWidth: v.borderWidth, borderRadius: v.borderRadius, diff --git a/packages/react/src/themes/teams/components/RadioGroup/radioGroupItemStyles.ts b/packages/react/src/themes/teams/components/RadioGroup/radioGroupItemStyles.ts index 3435e41220..d592b4c2b4 100644 --- a/packages/react/src/themes/teams/components/RadioGroup/radioGroupItemStyles.ts +++ b/packages/react/src/themes/teams/components/RadioGroup/radioGroupItemStyles.ts @@ -24,9 +24,6 @@ const radioStyles: ComponentSlotStylesInput< RadioGroupItemVariables > = { root: ({ props: p, variables: v }): ICSSInJSStyle => ({ - // can remove this after global style for border-box goes in - boxSizing: 'border-box', - alignItems: 'center', borderStyle: 'solid', borderWidth: `${pxToRem(1)}`, @@ -69,10 +66,6 @@ const radioStyles: ComponentSlotStylesInput< // overrides from icon styles backgroundColor: 'transparent', boxShadow: 'none', - - // can remove this after global style for border-box goes in - boxSizing: 'border-box', - borderStyle: 'solid', borderWidth: `${pxToRem(1)}`, borderColor: 'currentColor', From 5c3597d59bdfab63b88611e7ff4ced998b74df2c Mon Sep 17 00:00:00 2001 From: manajdov Date: Tue, 26 Mar 2019 16:46:49 +0100 Subject: [PATCH 10/15] -changed changelog -moved content-box for font icons near the width and height props --- CHANGELOG.md | 2 +- packages/react/src/themes/teams/components/Icon/iconStyles.ts | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d656659503..933ef26889 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +21,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - Fix narration for `Menu` @miroslavstastny ([#1105](https://github.com/stardust-ui/react/pull/1105)) ### BREAKING CHANGES -- added `box-sizing: border-box` to all elements, as well as before and after pseudo elements in Teams theme @mnajdova ([#1057](https://github.com/stardust-ui/react/pull/1057)) +- Add `box-sizing: border-box` to all elements, as well as before and after pseudo elements in Teams theme @mnajdova ([#1057](https://github.com/stardust-ui/react/pull/1057)) ## [v0.25.0](https://github.com/stardust-ui/react/tree/v0.25.0) (2019-03-26) diff --git a/packages/react/src/themes/teams/components/Icon/iconStyles.ts b/packages/react/src/themes/teams/components/Icon/iconStyles.ts index e81037f45f..7388c5c285 100644 --- a/packages/react/src/themes/teams/components/Icon/iconStyles.ts +++ b/packages/react/src/themes/teams/components/Icon/iconStyles.ts @@ -39,6 +39,7 @@ const getFontStyles = ( justifyContent: 'center', alignItems: 'center', + boxSizing: 'content-box', width: sizeInRems, height: sizeInRems, @@ -107,8 +108,6 @@ const iconStyles: ComponentSlotStylesInput = { speak: 'none', verticalAlign: 'middle', - ...(isFontBased && { boxSizing: 'content-box' }), - ...(isFontBased && getFontStyles(getIconSize(size, v.sizeModifier), name)), ...(isFontBased && { From 192593b1f34c7374bd1af282b9c8cdd4e5caf9a9 Mon Sep 17 00:00:00 2001 From: manajdov Date: Tue, 26 Mar 2019 16:50:27 +0100 Subject: [PATCH 11/15] -reverted border-box in loader styles --- .../react/src/themes/base/components/Loader/loaderStyles.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/react/src/themes/base/components/Loader/loaderStyles.ts b/packages/react/src/themes/base/components/Loader/loaderStyles.ts index 6a1bf3982c..8d7b48aae0 100644 --- a/packages/react/src/themes/base/components/Loader/loaderStyles.ts +++ b/packages/react/src/themes/base/components/Loader/loaderStyles.ts @@ -52,6 +52,8 @@ export default { borderStyle: 'solid', borderWidth: v.borderSizes[p.size], + boxSizing: 'border-box', + width: v.indicatorSizes[p.size], height: v.indicatorSizes[p.size], } From 9185ff599b2f6454fff173531abf5123e2610be7 Mon Sep 17 00:00:00 2001 From: manajdov Date: Wed, 10 Apr 2019 15:44:11 +0200 Subject: [PATCH 12/15] -updates on the box sizing prop --- .../themes/teams/components/Attachment/attachmentStyles.ts | 6 ------ .../react/src/themes/teams/components/Icon/iconStyles.ts | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/packages/react/src/themes/teams/components/Attachment/attachmentStyles.ts b/packages/react/src/themes/teams/components/Attachment/attachmentStyles.ts index 8ea6324bae..c5f224934f 100644 --- a/packages/react/src/themes/teams/components/Attachment/attachmentStyles.ts +++ b/packages/react/src/themes/teams/components/Attachment/attachmentStyles.ts @@ -24,12 +24,6 @@ const attachmentStyles: ComponentSlotStylesInput = { return { backgroundColor: v.backgroundColor, + boxSizing: isFontBased ? 'content-box' : 'border-box', // overriding the base theme default transformation as in teams theme the svg/svgFlippingInRtl slots are used for this ...(!isFontBased && { From 117a792f0a4651a82cd65596d6d1ee30bf82ff26 Mon Sep 17 00:00:00 2001 From: manajdov Date: Wed, 10 Apr 2019 20:12:54 +0200 Subject: [PATCH 13/15] -fixed changelog entry --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80ca0732e9..33dea16410 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased] +### BREAKING CHANGES +- Add `box-sizing: border-box` to all elements, as well as before and after pseudo elements in Teams theme @mnajdova ([#1057](https://github.com/stardust-ui/react/pull/1057)) + ### Fixes - Fix overflowing focus outline for `Grid` items for Teams theme @Bugaa92 ([#1195](https://github.com/stardust-ui/react/pull/1195)) @@ -105,9 +108,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ### Documentation - Fix example permalinks @miroslavstastny ([#1122](https://github.com/stardust-ui/react/pull/1122)) -### BREAKING CHANGES -- Add `box-sizing: border-box` to all elements, as well as before and after pseudo elements in Teams theme @mnajdova ([#1057](https://github.com/stardust-ui/react/pull/1057)) - ## [v0.25.0](https://github.com/stardust-ui/react/tree/v0.25.0) (2019-03-26) [Compare changes](https://github.com/stardust-ui/react/compare/v0.24.0...v0.25.0) From f376e754624d32eca6ddb3dfeb943a6838f37674 Mon Sep 17 00:00:00 2001 From: manajdov Date: Mon, 15 Apr 2019 09:31:05 +0200 Subject: [PATCH 14/15] -removed boxSizing: 'border-box' to video and embed styles in Teams theme --- packages/react/src/themes/teams/components/Embed/embedStyles.ts | 1 - packages/react/src/themes/teams/components/Video/videoStyles.ts | 1 - 2 files changed, 2 deletions(-) diff --git a/packages/react/src/themes/teams/components/Embed/embedStyles.ts b/packages/react/src/themes/teams/components/Embed/embedStyles.ts index 7da5165e7f..cb6668fb52 100644 --- a/packages/react/src/themes/teams/components/Embed/embedStyles.ts +++ b/packages/react/src/themes/teams/components/Embed/embedStyles.ts @@ -6,7 +6,6 @@ import { EmbedVariables } from './embedVariables' export default { root: ({ props: p, variables: v }): ICSSInJSStyle => { return { - boxSizing: 'border-box', display: 'inline-block', verticalAlign: 'middle', position: 'relative', diff --git a/packages/react/src/themes/teams/components/Video/videoStyles.ts b/packages/react/src/themes/teams/components/Video/videoStyles.ts index 5ee2abbdba..e5e0075e59 100644 --- a/packages/react/src/themes/teams/components/Video/videoStyles.ts +++ b/packages/react/src/themes/teams/components/Video/videoStyles.ts @@ -4,7 +4,6 @@ import { VideoVariables } from './videoVariables' export default { root: ({ variables: v }): ICSSInJSStyle => ({ - boxSizing: 'border-box', display: 'inline-block', verticalAlign: 'middle', width: v.width, From 463cc6652ae76e42ff5bb76a0073f62727805603 Mon Sep 17 00:00:00 2001 From: manajdov Date: Mon, 15 Apr 2019 09:36:42 +0200 Subject: [PATCH 15/15] -reverted boxSizing: 'border-box' on imageStyles, as it was moved in base theme --- packages/react/src/themes/base/components/Image/imageStyles.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/react/src/themes/base/components/Image/imageStyles.ts b/packages/react/src/themes/base/components/Image/imageStyles.ts index 1e18ebe16e..03acf3d678 100644 --- a/packages/react/src/themes/base/components/Image/imageStyles.ts +++ b/packages/react/src/themes/base/components/Image/imageStyles.ts @@ -3,6 +3,7 @@ import { ImageProps } from '../../../../components/Image/Image' export default { root: ({ props, variables }): ICSSInJSStyle => ({ + boxSizing: 'border-box', display: 'inline-block', verticalAlign: 'middle', width: (props.fluid && '100%') || variables.width,