Skip to content

Commit

Permalink
fix(shared-choice): show full label width when error is active on ie 11
Browse files Browse the repository at this point in the history
  • Loading branch information
marcod1419 authored and theetrain committed Aug 2, 2019
1 parent 029ded2 commit 395ee0c
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 2 deletions.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,15 @@
"tds"
]
},
{
"login": "saydex",
"name": "Sayde Deng",
"avatar_url": "https://avatars0.githubusercontent.com/u/49663423?v=4",
"profile": "https://github.com/saydex",
"contributions": [
"tds"
]
},
{
"login": "cuginoAle",
"name": "Alessio Carnevale",
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ The following group are the active maintainers of this project, and have merge r
| [<img src="https://avatars2.githubusercontent.com/u/2739819?v=4" width="100px;" alt="Ani"/><br /><sub><b>Ani</b></sub>](https://github.com/simpleimpulse)<br />[](#tds-simpleimpulse "") | [<img src="https://avatars1.githubusercontent.com/u/3495961?v=4" width="100px;" alt="Varun Jain"/><br /><sub><b>Varun Jain</b></sub>](https://github.com/varunj90)<br />[](#tds-varunj90 "") | [<img src="https://avatars2.githubusercontent.com/u/4450690?v=4" width="100px;" alt="Ally Hui"/><br /><sub><b>Ally Hui</b></sub>](https://github.com/ah-arch)<br />[](#tds-ah-arch "") | [<img src="https://avatars0.githubusercontent.com/u/1036187?v=4" width="100px;" alt="Jordan Raffoul"/><br /><sub><b>Jordan Raffoul</b></sub>](http://jordanraffoul.com)<br />[](#tds-jraff "") | [<img src="https://avatars2.githubusercontent.com/u/25651179?v=4" width="100px;" alt="Derek Kramer"/><br /><sub><b>Derek Kramer</b></sub>](http://derekkramer.co)<br />[](#tds-derekkramer "") | [<img src="https://avatars2.githubusercontent.com/u/11504992?v=4" width="100px;" alt="Bradley Rastrullo"/><br /><sub><b>Bradley Rastrullo</b></sub>](https://github.com/brastrullo)<br />[](#tds-brastrullo "") | [<img src="https://avatars0.githubusercontent.com/u/931411?v=4" width="100px;" alt="Andrew Lam"/><br /><sub><b>Andrew Lam</b></sub>](https://github.com/Andrew-K-Lam)<br />[](#tds-Andrew-K-Lam "") |
| [<img src="https://avatars2.githubusercontent.com/u/968192?v=4" width="100px;" alt="Rob Brander"/><br /><sub><b>Rob Brander</b></sub>](http://rbrander.ca)<br />[](#tds-rbrander "") | [<img src="https://avatars3.githubusercontent.com/u/12414771?v=4" width="100px;" alt="Jonathan Palma"/><br /><sub><b>Jonathan Palma</b></sub>](https://github.com/jonathanpalma)<br />[](#tds-jonathanpalma "") | [<img src="https://avatars2.githubusercontent.com/u/22725151?v=4" width="100px;" alt="Nicholas Mak"/><br /><sub><b>Nicholas Mak</b></sub>](https://github.com/nicmak)<br />[](#tds-nicmak "") | [<img src="https://avatars3.githubusercontent.com/u/42220619?v=4" width="100px;" alt="Christina L."/><br /><sub><b>Christina L.</b></sub>](https://github.com/Christina-Lo)<br />[](#tds-Christina-Lo "") | [<img src="https://avatars0.githubusercontent.com/u/14052?v=4" width="100px;" alt="Kyle Spaans"/><br /><sub><b>Kyle Spaans</b></sub>](http://spaans.ca)<br />[](#tds-kspaans "") | [<img src="https://avatars3.githubusercontent.com/u/3418750?v=4" width="100px;" alt="Affan Sajid"/><br /><sub><b>Affan Sajid</b></sub>](https://github.com/affansajid)<br />[](#tds-affansajid "") | [<img src="https://avatars3.githubusercontent.com/u/33848122?v=4" width="100px;" alt="Colton Buchanan"/><br /><sub><b>Colton Buchanan</b></sub>](https://github.com/coltonpowershifter)<br />[](#tds-coltonpowershifter "") |
| [<img src="https://avatars3.githubusercontent.com/u/1139851?v=4" width="100px;" alt="Elliott Ro"/><br /><sub><b>Elliott Ro</b></sub>](http://www.techsamurais.com)<br />[](#tds-ElliottJRo "") | [<img src="https://avatars0.githubusercontent.com/u/31409656?v=4" width="100px;" alt="Sean McCullough"/><br /><sub><b>Sean McCullough</b></sub>](http://architech.ca)<br />[](#tds-smm-telus "") | [<img src="https://avatars3.githubusercontent.com/u/26413531?v=4" width="100px;" alt="Anatolii Gorovyi"/><br /><sub><b>Anatolii Gorovyi</b></sub>](https://github.com/agorovyi)<br />[](#tds-agorovyi "") | [<img src="https://avatars0.githubusercontent.com/u/49663423?v=4" width="100px;" alt="Sayde Deng"/><br /><sub><b>Sayde Deng</b></sub>](https://github.com/saydex)<br />[](#tds-saydex "") | [<img src="https://avatars2.githubusercontent.com/u/5086190?v=4" width="100px;" alt="Alfred Choi"/><br /><sub><b>Alfred Choi</b></sub>](https://github.com/alfredctchoi)<br />[](#tds-alfredctchoi "") | [<img src="https://avatars1.githubusercontent.com/u/25777936?v=4" width="100px;" alt="Brendan Betts"/><br /><sub><b>Brendan Betts</b></sub>](https://github.com/brendanpowershifter)<br />[](#tds-brendanpowershifter "") | [<img src="https://avatars1.githubusercontent.com/u/1751772?v=4" width="100px;" alt="Prashant Kandathil"/><br /><sub><b>Prashant Kandathil</b></sub>](https://github.com/pkandathil)<br />[](#tds-pkandathil "") |
| [<img src="https://avatars3.githubusercontent.com/u/1298616?v=4" width="100px;" alt="Alessio Carnevale"/><br /><sub><b>Alessio Carnevale</b></sub>](https://github.com/cuginoAle)<br />[](#tds-cuginoAle "") |
| [<img src="https://avatars0.githubusercontent.com/u/49663423?v=4" width="100px;" alt="Sayde Deng"/><br /><sub><b>Sayde Deng</b></sub>](https://github.com/saydex)<br />[](#tds-saydex "") | [<img src="https://avatars3.githubusercontent.com/u/1298616?v=4" width="100px;" alt="Alessio Carnevale"/><br /><sub><b>Alessio Carnevale</b></sub>](https://github.com/cuginoAle)<br />[](#tds-cuginoAle "") |
<!-- ALL-CONTRIBUTORS-LIST:END -->

[circle-url]: https://circleci.com/gh/telus/tds-core
Expand Down
2 changes: 1 addition & 1 deletion shared/components/Choice/Choice.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const getClassNames = (inputTypeStyles, checked, focus, feedback, disabled) => {
}

const renderColoredLabel = (color, content) => (
<ColoredTextProvider colorClassName={color}>
<ColoredTextProvider colorClassName={joinClassNames(color, styles.ieFullWidth)}>
<Flexbox direction="row" dangerouslyAddClassName={styles.alignFlexStart}>
{content}
</Flexbox>
Expand Down
5 changes: 5 additions & 0 deletions shared/components/Choice/Choice.modules.scss
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,8 @@
position: absolute;
top: auto;
}

.ieFullWidth {
// Fixes an issue in IE 11 where the label will not have the correct width while an error is activated
width: 100%;
}

0 comments on commit 395ee0c

Please sign in to comment.