Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ChoiceGroup: Flex layout for image and icon options #4137

Merged
merged 9 commits into from
Mar 2, 2018

Conversation

lynamemi
Copy link
Collaborator

Pull request checklist

  • Addresses an existing issue: Fixes #0000
  • Include a change request file using $ npm run change

Description of changes

  • Giving icon and image ChoiceGroups a flex layout with a new flex container - partners were adding this feature on their own for property pain and dialogs.
  • Fixed an edge case bug for image where it was rendering correctly locally but no on the website. Switching to box-sizing: content-box seemed to fix this. See bug:
    image

Focus areas to test

(optional)

@micahgodbolt
Copy link
Member

it's really hard to see what changed. is it possible to create a PR for only the lines you've changed?

@lynamemi
Copy link
Collaborator Author

Not sure why the diff went crazy. Where it's showing a large chunk of addition and subtraction, I just added a wrapper so changed the indentation. I'll see if I can fix that.

@micahgodbolt
Copy link
Member

you can always do git add -p instead of git add .

that'll let you pick which things to add to staging.

@lynamemi
Copy link
Collaborator Author

@micahgodbolt I pushed the new lines and ignored the indentation.

@dzearing
Copy link
Member

dzearing commented Mar 2, 2018

@micahgodbolt @lynamemi HINT: add ?w=1 to the PR url to avoid whitespace in diffs:

https://github.com/OfficeDev/office-ui-fabric-react/pull/4137/files?w=1

@dzearing dzearing merged commit 41e8054 into microsoft:master Mar 2, 2018
@lynamemi lynamemi deleted the choicegroup-flex branch March 2, 2018 15:44
Markionium added a commit to Markionium/office-ui-fabric-react that referenced this pull request Mar 4, 2018
* master: (30 commits)
  Addressing Issue microsoft#4147 - Nav Buttons have invalid `aria-describedby` value (microsoft#4159)
  Fix issue 3608: DetailsList horizontal scroll (microsoft#4164)
  Update package.json
  Image SCSS to MergeStyles Part 2: Style Conversion (microsoft#4151)
  Applying package updates.
  [SpinButton] Consistent styles to Button and TextField (microsoft#4098)
  ChoiceGroup: Flex layout for image and icon options (microsoft#4137)
  Initial set of Keytips work in experiments (microsoft#4062)
  Updating tsconfig in button bundle.
  BaseExtendedPicker: Create contextmenu for renderedItem, fix auto focus (microsoft#3954)
  Dropdown: Custom render options for multiselect - Bug fix microsoft#3571  (microsoft#3589)
  Fix documentcard theming (microsoft#4155)
  BasePicker: Fix not used onBlur callback of inputProps (microsoft#4000) (microsoft#4131)
  Allow Elements as Callout targets (microsoft#4134)
  CommandBar: Fixed null commandItemWidths (microsoft#4136)
  add check for when this.suggestionElement may be undefined (microsoft#4157)
  Addressing Issue microsoft#4143 - is-selected missing on ms-Nav-link (microsoft#4158)
  Aria selected (microsoft#4161)
  Move fabric to TypeScript 2.7.2 (microsoft#4153)
  Updating SearchBox examples to have the removed string in placeholder prop.
  ...
Markionium added a commit to Markionium/office-ui-fabric-react that referenced this pull request Mar 5, 2018
* master: (51 commits)
  Applying package updates.
  No unused variable (microsoft#4173)
  Use correct _list ref string (microsoft#4168)
  Nav: wire a link to expand/collapse behavior if it has no URL but has children (microsoft#4171)
  Addressing Issue microsoft#4147 - Nav Buttons have invalid `aria-describedby` value (microsoft#4159)
  Fix issue 3608: DetailsList horizontal scroll (microsoft#4164)
  Update package.json
  Image SCSS to MergeStyles Part 2: Style Conversion (microsoft#4151)
  Applying package updates.
  [SpinButton] Consistent styles to Button and TextField (microsoft#4098)
  ChoiceGroup: Flex layout for image and icon options (microsoft#4137)
  Initial set of Keytips work in experiments (microsoft#4062)
  Updating tsconfig in button bundle.
  BaseExtendedPicker: Create contextmenu for renderedItem, fix auto focus (microsoft#3954)
  Dropdown: Custom render options for multiselect - Bug fix microsoft#3571  (microsoft#3589)
  Fix documentcard theming (microsoft#4155)
  BasePicker: Fix not used onBlur callback of inputProps (microsoft#4000) (microsoft#4131)
  Allow Elements as Callout targets (microsoft#4134)
  CommandBar: Fixed null commandItemWidths (microsoft#4136)
  add check for when this.suggestionElement may be undefined (microsoft#4157)
  ...
chrismohr pushed a commit to chrismohr/office-ui-fabric-react that referenced this pull request Apr 17, 2018
* Flex container for options with images or icons

* Edge case layout bugs

* Added change file

* Updated snapshot

* Attempt to fix diff

* Attempt to fix diff 2

* Reverted tsx changes for flex to improve diff

* Committing wrapper without indentation
@microsoft microsoft locked as resolved and limited conversation to collaborators Aug 31, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants