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.

Sign up for GitHub

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

Jump to bottom

v4: Add an actual data-touch="false" example in the carousel docs #32639

Merged
merged 8 commits into from
Jan 5, 2021
Merged

v4: Add an actual data-touch="false" example in the carousel docs #32639

merged 8 commits into from
Jan 5, 2021

Conversation

patrickhlauke
Copy link
Member

Backport of #32638

@patrickhlauke patrickhlauke mentioned this pull request Dec 28, 2020
Closed
@patrickhlauke patrickhlauke force-pushed the patrickhlauke-carousel-touch-v4-backport branch from b26fbdf to 694f9ca Compare December 28, 2020 15:04
@patrickhlauke
Correct attribute table explanation and remove slide class from example
4cd5e47 
i believe the correct option is `slide` here, not `ride`.
the `if "carousel"` bit was rather unclear/confusing
@patrickhlauke patrickhlauke mentioned this pull request Dec 28, 2020
Closed
@patrickhlauke patrickhlauke marked this pull request as draft December 28, 2020 15:39
@patrickhlauke
Edits...
49eafe1 
sorry, trying to make sense of our quirky carousel stuff, it seems some illogical things have been there ever since
@patrickhlauke patrickhlauke mentioned this pull request Dec 28, 2020
Merged
@patrickhlauke patrickhlauke marked this pull request as ready for review December 28, 2020 23:29
@patrickhlauke patrickhlauke force-pushed the patrickhlauke-carousel-touch-v4-backport branch from 618ae70 to ae54c9b Compare December 28, 2020 23:32
@XhmikosR XhmikosR marked this pull request as draft December 29, 2020 10:43
@XhmikosR XhmikosR marked this pull request as ready for review December 29, 2020 13:41
@twbs twbs deleted a comment from hashem213 Dec 29, 2020
mdo
mdo reviewed Jan 5, 2021
View reviewed changes
site/content/docs/4.5/components/carousel.md Outdated Show resolved Hide resolved
site/content/docs/4.5/components/carousel.md Outdated Show resolved Hide resolved
patrickhlauke and others added 2 commits January 5, 2021 20:35
@patrickhlauke @mdo
Update site/content/docs/4.5/components/carousel.md
725ba2c 
Co-authored-by: Mark Otto <[email protected]>
@patrickhlauke
Tweak language
9b63d69 
mostly based on @mdo's suggestion, but also adds the word "attribute" after `data-ride` for better flow/legibility
@patrickhlauke patrickhlauke requested a review from mdo January 5, 2021 20:43
@patrickhlauke
Copy link
Member Author

once this is approved/merged, i'll revisit v5 (since the original #32638 has already been merged) and make matching changes there @mdo

@patrickhlauke patrickhlauke merged commit f1b2ed9 into v4-dev Jan 5, 2021
@patrickhlauke patrickhlauke deleted the patrickhlauke-carousel-touch-v4-backport branch January 5, 2021 23:42
patrickhlauke added a commit that referenced this pull request Jan 5, 2021
@patrickhlauke
Tweak wording for no-touch carousel
b9b2052 
based on changes made in the backport #32639
@patrickhlauke patrickhlauke mentioned this pull request Jan 5, 2021
Merged
patrickhlauke added a commit that referenced this pull request Jan 6, 2021
@patrickhlauke
Tweak wording for no-touch carousel (#32688)
d1a62b4 
based on changes made in the backport #32639
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mdo mdo mdo approved these changes

Assignees
No one assigned
Labels
docs v4
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@patrickhlauke @mdo