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

Fix issue #15597 — Mention dropup variation in dropdown docs #15659

Closed
wants to merge 17 commits into from

Conversation

kkirsche
Copy link
Contributor

Mention dropup variation in dropdown docs
Fixes #15597.

fat and others added 7 commits May 17, 2013 10:13
Conflicts:
	CHANGELOG.md
	Makefile
	README.md
	component.json
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap-affix.js
	docs/assets/js/bootstrap-alert.js
	docs/assets/js/bootstrap-button.js
	docs/assets/js/bootstrap-carousel.js
	docs/assets/js/bootstrap-collapse.js
	docs/assets/js/bootstrap-dropdown.js
	docs/assets/js/bootstrap-modal.js
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap-scrollspy.js
	docs/assets/js/bootstrap-tab.js
	docs/assets/js/bootstrap-tooltip.js
	docs/assets/js/bootstrap-transition.js
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/base-css.html
	docs/components.html
	docs/customize.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/pages/index.mustache
	js/bootstrap-affix.js
	js/bootstrap-alert.js
	js/bootstrap-button.js
	js/bootstrap-carousel.js
	js/bootstrap-collapse.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tab.js
	js/bootstrap-tooltip.js
	js/bootstrap-transition.js
	js/bootstrap-typeahead.js
	less/bootstrap.less
	less/responsive.less
	package.json
Fix issue twbs#15597 — Mention dropup variation in dropdown docs
@cvrebert cvrebert added the docs label Jan 23, 2015
@cvrebert
Copy link
Collaborator

Should probably also be used in some example in that section.

Replace single line comment with subsection touching on the variation with an example
@kkirsche
Copy link
Contributor Author

Updated from a single line comment to a small "Dropup Variation" section with an example. Thanks for the feedback.

@cvrebert
Copy link
Collaborator

Please squash this into a single commit.

@kkirsche
Copy link
Contributor Author

Will do when I get home. Thanks for your feedback on this.

Please excuse brevity — Sent from my mobile device.

On Jan 23, 2015, at 7:00 PM, Chris Rebert notifications@github.com wrote:

Please squash this into a single commit.


Reply to this email directly or view it on GitHub.

kkirsche and others added 4 commits January 23, 2015 20:51
Fix issue twbs#15597 — Mention dropup variation in dropdown docs

Replace single line comment with subsection

Replace single line comment with subsection touching on the variation with an example

Fix duplicate ID's

Missed an aria label

There's already a dropdownMenu2

So many dropdown menus…
@kkirsche
Copy link
Contributor Author

OK, after attempting this apparently I messed it up with rebase, what's the command to make it a single commit? I tried git rebase -i origin/master

@cvrebert
Copy link
Collaborator

git rebase -i <sha of commit directly prior to the commits to you want to start squashing>
And you want to avoid anything involving merges.

@kkirsche
Copy link
Contributor Author

No clue how to save this stupid pull request so just made a new one...

@kkirsche kkirsche closed this Jan 24, 2015
@kkirsche kkirsche deleted the patch-4 branch June 16, 2015 00:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

.dropup should be mentioned in main Dropdown docs
5 participants