Update Card, Nav and Navbar for V5 #648
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ootstrap-components into react-bootstrap � Conflicts: � docs/components_page/components/__tests__/conftest.py � src/components/card/__tests__/Card.test.js
Also updated julia and R snippets
tcbegley
requested changes
Aug 19, 2021
There was a problem hiding this comment.
Looks great, thanks @AnnMarieW!
Left a couple of inline comments, could you rebase on top of react-bootstrap once you've addressed then let's get this merged!
tcbegley
approved these changes
Aug 20, 2021
tcbegley
added a commit
that referenced
this pull request
Aug 24, 2021
* Alert * Badge * Button * ButtonGroup * Carousel * Collapse * Fade * Add shim for html components that don't have class_name defined yet * Update block button docs * Update docs for Bootstrap 5 * RIP Jumbotron * Add react-bootstrap beta * Layout * Docs fix * Label * Clean up example * Monkeypatch doc tests * New components - Offcanvas and pagination (#643) * Added offcanvas components * Offcanvas doc snippets * Added offcanvas documentation * Fixed long text issue * Added react-bootstrap * Added offcanvas * Added offcanvas tests * Added js tests for offcanvas * Addition of new pagination component * Combined offcanvas into single component * Formatting * ABetter handling of pagination component * Updated pagination docs * Removed invalid code * Updated npm demo to Bootstrap 5 * Updated pagination docs to include R and jl * Updated pagination tests * Fixed callbacks * Reverted to 5.0.2 to avoid issues with offcanvas backdrop until resolved * Fixed offcanvas tests * Tidy up * Progress * Format tests * Spinner * Table * Toast * New component Accordion (#645) * Accordion component and js test * Added documentation for accordion * R and Julia examples * Fixed h2 formatting issues * Added accordion folder for flake8 * Update demo/Demo.js Co-authored-by: glsdown <52132406+glsdown@users.noreply.github.com> Co-authored-by: Tom Begley <tomcbegley@gmail.com> * flake8 config * List group updated to Bootstrap 5 (#647) * Updated list-group component * Updated list-group docs * Bug fixes * Tabs * Form * Form updates + examples * Checklist / RadioItems * Select * themes * BS5 updates for docs * Fix doc tests * InputGroup * Fix JS tests * Checkbox/Radio * format js * Modal * Modal docs * Fix format command * Card, Nav and Navbar (#648) * Monkeypatch doc tests * Card * Nav and NavBar Update to Collapse to remove navbar prop * fixed Card.test.js for Card body test * updated docs for Navbar example. Also updated julia and R snippets * updates to Navbar and Collapse after review * updated index for deleted NavbarCollapse * lint and black Co-authored-by: tcbegley <tomcbegley@gmail.com> * DropdownMenu * NavbarToggler * Tooltip+Popover * Consistent imports * Fix accordion tests * Initial breadcrumb component * Set accordion to first component * Format code * Update Breadcrumb * Snippet test fixes for breadcrumb * Popover - minor prop updates (#652) * Use size prop consistently Co-authored-by: glsdown <52132406+glsdown@users.noreply.github.com> Co-authored-by: AnnMarieW <72614349+AnnMarieW@users.noreply.github.com>
tcbegley
added a commit
that referenced
this pull request
Aug 24, 2021
* Alert * Badge * Button * ButtonGroup * Carousel * Collapse * Fade * Add shim for html components that don't have class_name defined yet * Update block button docs * Update docs for Bootstrap 5 * RIP Jumbotron * Add react-bootstrap beta * Layout * Docs fix * Label * Clean up example * Monkeypatch doc tests * New components - Offcanvas and pagination (#643) * Added offcanvas components * Offcanvas doc snippets * Added offcanvas documentation * Fixed long text issue * Added react-bootstrap * Added offcanvas * Added offcanvas tests * Added js tests for offcanvas * Addition of new pagination component * Combined offcanvas into single component * Formatting * ABetter handling of pagination component * Updated pagination docs * Removed invalid code * Updated npm demo to Bootstrap 5 * Updated pagination docs to include R and jl * Updated pagination tests * Fixed callbacks * Reverted to 5.0.2 to avoid issues with offcanvas backdrop until resolved * Fixed offcanvas tests * Tidy up * Progress * Format tests * Spinner * Table * Toast * New component Accordion (#645) * Accordion component and js test * Added documentation for accordion * R and Julia examples * Fixed h2 formatting issues * Added accordion folder for flake8 * Update demo/Demo.js Co-authored-by: glsdown <52132406+glsdown@users.noreply.github.com> Co-authored-by: Tom Begley <tomcbegley@gmail.com> * flake8 config * List group updated to Bootstrap 5 (#647) * Updated list-group component * Updated list-group docs * Bug fixes * Tabs * Form * Form updates + examples * Checklist / RadioItems * Select * themes * BS5 updates for docs * Fix doc tests * InputGroup * Fix JS tests * Checkbox/Radio * format js * Modal * Modal docs * Fix format command * Card, Nav and Navbar (#648) * Monkeypatch doc tests * Card * Nav and NavBar Update to Collapse to remove navbar prop * fixed Card.test.js for Card body test * updated docs for Navbar example. Also updated julia and R snippets * updates to Navbar and Collapse after review * updated index for deleted NavbarCollapse * lint and black Co-authored-by: tcbegley <tomcbegley@gmail.com> * DropdownMenu * NavbarToggler * Tooltip+Popover * Consistent imports * Fix accordion tests * Initial breadcrumb component * Set accordion to first component * Format code * Update Breadcrumb * Snippet test fixes for breadcrumb * Moved js components into individual folders * Fixes for layout and callback tests * Formatting of R and julia snippets * Updated js testing libraries * Added recommended hack for react testing * Removed dup test and updated * Carousel improvements * Reverted to older testing packages * Added component landing page * Removed callback from accordion & pagination simple * Removed accordion from collapse * Added listgroup flush example * Fixed accordion and pagination examples * Added coloured table * Added dark variant carousel * Added Table from multi-level dataframe * Added multi input_group addons * Fixed issues with badge examples * Docs first section to Examples * Clean-up Tooltip code + tests * Revert version numbers * Format * Update setup.cfg * Tidy up following merge Co-authored-by: glsdown <gemmalsdown@icloud.com> Co-authored-by: tcbegley <tomcbegley@gmail.com> Co-authored-by: AnnMarieW <72614349+AnnMarieW@users.noreply.github.com>
tcbegley
added a commit
that referenced
this pull request
Sep 5, 2021
* Alert * Badge * Button * ButtonGroup * Carousel * Collapse * Fade * Add shim for html components that don't have class_name defined yet * Update block button docs * Update docs for Bootstrap 5 * RIP Jumbotron * Add react-bootstrap beta * Layout * Docs fix * Label * Clean up example * Monkeypatch doc tests * New components - Offcanvas and pagination (#643) * Added offcanvas components * Offcanvas doc snippets * Added offcanvas documentation * Fixed long text issue * Added react-bootstrap * Added offcanvas * Added offcanvas tests * Added js tests for offcanvas * Addition of new pagination component * Combined offcanvas into single component * Formatting * ABetter handling of pagination component * Updated pagination docs * Removed invalid code * Updated npm demo to Bootstrap 5 * Updated pagination docs to include R and jl * Updated pagination tests * Fixed callbacks * Reverted to 5.0.2 to avoid issues with offcanvas backdrop until resolved * Fixed offcanvas tests * Tidy up * Progress * Format tests * Spinner * Table * Toast * New component Accordion (#645) * Accordion component and js test * Added documentation for accordion * R and Julia examples * Fixed h2 formatting issues * Added accordion folder for flake8 * Update demo/Demo.js Co-authored-by: glsdown <52132406+glsdown@users.noreply.github.com> Co-authored-by: Tom Begley <tomcbegley@gmail.com> * flake8 config * List group updated to Bootstrap 5 (#647) * Updated list-group component * Updated list-group docs * Bug fixes * Tabs * Form * Form updates + examples * Checklist / RadioItems * Select * themes * BS5 updates for docs * Fix doc tests * InputGroup * Fix JS tests * Checkbox/Radio * format js * Modal * Modal docs * Fix format command * Card, Nav and Navbar (#648) * Monkeypatch doc tests * Card * Nav and NavBar Update to Collapse to remove navbar prop * fixed Card.test.js for Card body test * updated docs for Navbar example. Also updated julia and R snippets * updates to Navbar and Collapse after review * updated index for deleted NavbarCollapse * lint and black Co-authored-by: tcbegley <tomcbegley@gmail.com> * DropdownMenu * NavbarToggler * Tooltip+Popover * Consistent imports * Fix accordion tests * Initial breadcrumb component * Set accordion to first component * Format code * Update Breadcrumb * Snippet test fixes for breadcrumb * Popover - minor prop updates (#652) * Use size prop consistently Co-authored-by: glsdown <52132406+glsdown@users.noreply.github.com> Co-authored-by: AnnMarieW <72614349+AnnMarieW@users.noreply.github.com>
tcbegley
added a commit
that referenced
this pull request
Sep 5, 2021
* Alert * Badge * Button * ButtonGroup * Carousel * Collapse * Fade * Add shim for html components that don't have class_name defined yet * Update block button docs * Update docs for Bootstrap 5 * RIP Jumbotron * Add react-bootstrap beta * Layout * Docs fix * Label * Clean up example * Monkeypatch doc tests * New components - Offcanvas and pagination (#643) * Added offcanvas components * Offcanvas doc snippets * Added offcanvas documentation * Fixed long text issue * Added react-bootstrap * Added offcanvas * Added offcanvas tests * Added js tests for offcanvas * Addition of new pagination component * Combined offcanvas into single component * Formatting * ABetter handling of pagination component * Updated pagination docs * Removed invalid code * Updated npm demo to Bootstrap 5 * Updated pagination docs to include R and jl * Updated pagination tests * Fixed callbacks * Reverted to 5.0.2 to avoid issues with offcanvas backdrop until resolved * Fixed offcanvas tests * Tidy up * Progress * Format tests * Spinner * Table * Toast * New component Accordion (#645) * Accordion component and js test * Added documentation for accordion * R and Julia examples * Fixed h2 formatting issues * Added accordion folder for flake8 * Update demo/Demo.js Co-authored-by: glsdown <52132406+glsdown@users.noreply.github.com> Co-authored-by: Tom Begley <tomcbegley@gmail.com> * flake8 config * List group updated to Bootstrap 5 (#647) * Updated list-group component * Updated list-group docs * Bug fixes * Tabs * Form * Form updates + examples * Checklist / RadioItems * Select * themes * BS5 updates for docs * Fix doc tests * InputGroup * Fix JS tests * Checkbox/Radio * format js * Modal * Modal docs * Fix format command * Card, Nav and Navbar (#648) * Monkeypatch doc tests * Card * Nav and NavBar Update to Collapse to remove navbar prop * fixed Card.test.js for Card body test * updated docs for Navbar example. Also updated julia and R snippets * updates to Navbar and Collapse after review * updated index for deleted NavbarCollapse * lint and black Co-authored-by: tcbegley <tomcbegley@gmail.com> * DropdownMenu * NavbarToggler * Tooltip+Popover * Consistent imports * Fix accordion tests * Initial breadcrumb component * Set accordion to first component * Format code * Update Breadcrumb * Snippet test fixes for breadcrumb * Moved js components into individual folders * Fixes for layout and callback tests * Formatting of R and julia snippets * Updated js testing libraries * Added recommended hack for react testing * Removed dup test and updated * Carousel improvements * Reverted to older testing packages * Added component landing page * Removed callback from accordion & pagination simple * Removed accordion from collapse * Added listgroup flush example * Fixed accordion and pagination examples * Added coloured table * Added dark variant carousel * Added Table from multi-level dataframe * Added multi input_group addons * Fixed issues with badge examples * Docs first section to Examples * Clean-up Tooltip code + tests * Revert version numbers * Format * Update setup.cfg * Tidy up following merge Co-authored-by: glsdown <gemmalsdown@icloud.com> Co-authored-by: tcbegley <tomcbegley@gmail.com> Co-authored-by: AnnMarieW <72614349+AnnMarieW@users.noreply.github.com>
tcbegley
added a commit
that referenced
this pull request
Oct 19, 2021
* Alert * Badge * Button * ButtonGroup * Carousel * Collapse * Fade * Add shim for html components that don't have class_name defined yet * Update block button docs * Update docs for Bootstrap 5 * RIP Jumbotron * Add react-bootstrap beta * Layout * Docs fix * Label * Clean up example * Monkeypatch doc tests * New components - Offcanvas and pagination (#643) * Added offcanvas components * Offcanvas doc snippets * Added offcanvas documentation * Fixed long text issue * Added react-bootstrap * Added offcanvas * Added offcanvas tests * Added js tests for offcanvas * Addition of new pagination component * Combined offcanvas into single component * Formatting * ABetter handling of pagination component * Updated pagination docs * Removed invalid code * Updated npm demo to Bootstrap 5 * Updated pagination docs to include R and jl * Updated pagination tests * Fixed callbacks * Reverted to 5.0.2 to avoid issues with offcanvas backdrop until resolved * Fixed offcanvas tests * Tidy up * Progress * Format tests * Spinner * Table * Toast * New component Accordion (#645) * Accordion component and js test * Added documentation for accordion * R and Julia examples * Fixed h2 formatting issues * Added accordion folder for flake8 * Update demo/Demo.js Co-authored-by: glsdown <52132406+glsdown@users.noreply.github.com> Co-authored-by: Tom Begley <tomcbegley@gmail.com> * flake8 config * List group updated to Bootstrap 5 (#647) * Updated list-group component * Updated list-group docs * Bug fixes * Tabs * Form * Form updates + examples * Checklist / RadioItems * Select * themes * BS5 updates for docs * Fix doc tests * InputGroup * Fix JS tests * Checkbox/Radio * format js * Modal * Modal docs * Fix format command * Card, Nav and Navbar (#648) * Monkeypatch doc tests * Card * Nav and NavBar Update to Collapse to remove navbar prop * fixed Card.test.js for Card body test * updated docs for Navbar example. Also updated julia and R snippets * updates to Navbar and Collapse after review * updated index for deleted NavbarCollapse * lint and black Co-authored-by: tcbegley <tomcbegley@gmail.com> * DropdownMenu * NavbarToggler * Tooltip+Popover * Consistent imports * Fix accordion tests * Initial breadcrumb component * Set accordion to first component * Format code * Update Breadcrumb * Snippet test fixes for breadcrumb * Popover - minor prop updates (#652) * Use size prop consistently Co-authored-by: glsdown <52132406+glsdown@users.noreply.github.com> Co-authored-by: AnnMarieW <72614349+AnnMarieW@users.noreply.github.com>
tcbegley
added a commit
that referenced
this pull request
Oct 19, 2021
* Alert * Badge * Button * ButtonGroup * Carousel * Collapse * Fade * Add shim for html components that don't have class_name defined yet * Update block button docs * Update docs for Bootstrap 5 * RIP Jumbotron * Add react-bootstrap beta * Layout * Docs fix * Label * Clean up example * Monkeypatch doc tests * New components - Offcanvas and pagination (#643) * Added offcanvas components * Offcanvas doc snippets * Added offcanvas documentation * Fixed long text issue * Added react-bootstrap * Added offcanvas * Added offcanvas tests * Added js tests for offcanvas * Addition of new pagination component * Combined offcanvas into single component * Formatting * ABetter handling of pagination component * Updated pagination docs * Removed invalid code * Updated npm demo to Bootstrap 5 * Updated pagination docs to include R and jl * Updated pagination tests * Fixed callbacks * Reverted to 5.0.2 to avoid issues with offcanvas backdrop until resolved * Fixed offcanvas tests * Tidy up * Progress * Format tests * Spinner * Table * Toast * New component Accordion (#645) * Accordion component and js test * Added documentation for accordion * R and Julia examples * Fixed h2 formatting issues * Added accordion folder for flake8 * Update demo/Demo.js Co-authored-by: glsdown <52132406+glsdown@users.noreply.github.com> Co-authored-by: Tom Begley <tomcbegley@gmail.com> * flake8 config * List group updated to Bootstrap 5 (#647) * Updated list-group component * Updated list-group docs * Bug fixes * Tabs * Form * Form updates + examples * Checklist / RadioItems * Select * themes * BS5 updates for docs * Fix doc tests * InputGroup * Fix JS tests * Checkbox/Radio * format js * Modal * Modal docs * Fix format command * Card, Nav and Navbar (#648) * Monkeypatch doc tests * Card * Nav and NavBar Update to Collapse to remove navbar prop * fixed Card.test.js for Card body test * updated docs for Navbar example. Also updated julia and R snippets * updates to Navbar and Collapse after review * updated index for deleted NavbarCollapse * lint and black Co-authored-by: tcbegley <tomcbegley@gmail.com> * DropdownMenu * NavbarToggler * Tooltip+Popover * Consistent imports * Fix accordion tests * Initial breadcrumb component * Set accordion to first component * Format code * Update Breadcrumb * Snippet test fixes for breadcrumb * Moved js components into individual folders * Fixes for layout and callback tests * Formatting of R and julia snippets * Updated js testing libraries * Added recommended hack for react testing * Removed dup test and updated * Carousel improvements * Reverted to older testing packages * Added component landing page * Removed callback from accordion & pagination simple * Removed accordion from collapse * Added listgroup flush example * Fixed accordion and pagination examples * Added coloured table * Added dark variant carousel * Added Table from multi-level dataframe * Added multi input_group addons * Fixed issues with badge examples * Docs first section to Examples * Clean-up Tooltip code + tests * Revert version numbers * Format * Update setup.cfg * Tidy up following merge Co-authored-by: glsdown <gemmalsdown@icloud.com> Co-authored-by: tcbegley <tomcbegley@gmail.com> Co-authored-by: AnnMarieW <72614349+AnnMarieW@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Removed CardDeck
Removed CardColumns per react-bootstrap issue#5944
Updates for Nav and Navbar.
Adds new NavbarCollapse component. The react-bootstrap Collapse doesn't has a
navbarprop