aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-09-01Merge branch 'master' into tagliala-patch-1Mark Otto11-60/+68
2013-09-01Merge pull request #10249 from coliff/patch-1Mark Otto1-1/+1
Update index.html (update text from hero unit to jumbotron)
2013-09-01restore "only" wording in docs regarding Recess/less.jsChris Rebert1-1/+1
It was there for good reason. We're not gonna deal with lessphp or dotless bugs.
2013-09-01fixes #10246: Use correct variable for link hover color in CustomizerMark Otto2-3/+3
2013-09-01Merge branch 'master' of github.com:twbs/bootstrapMark Otto3-34/+35
2013-09-01better layoutMark Otto1-6/+2
2013-09-01finishes #10245 by adding it the new var to the customizerMark Otto2-1/+6
2013-09-01Merge branch 'master' into dancek-breadcrumb-separatorMark Otto9-20/+25
2013-09-01Merge pull request #10232 from twbs/table-nestingMark Otto3-34/+35
use direct-child selector more in table styles to better support nested tables
2013-09-01Merge branch 'master' into table-nestingMark Otto16-120/+43
Conflicts: dist/css/bootstrap.min.css
2013-09-01fixes #10223: adds color to input addonMark Otto4-2/+4
2013-09-01fixes #10153: restore headings-color variableMark Otto6-6/+10
2013-09-01fixes #10136Mark Otto1-3/+3
2013-09-01Merge branch 'master' into deprecate_screen_containersMark Otto39-236/+345
2013-09-01Merge branch 'master' of github.com:twbs/bootstrapMark Otto1-11/+10
2013-08-31Merge pull request #10299 from StevenBlack/GettingStartedEdits1Mark Otto1-9/+7
'Getting started' section: refactoring for succinctness, active voice, and consistency with button and link captions.
2013-08-31Merge pull request #10323 from StevenBlack/GSEdits3Mark Otto1-2/+3
Getting started docs: tweaks to the _Basic template_ section
2013-09-01Merge branch 'patch-1' of https://github.com/tagliala/bootstrap into ↵Mark Otto1-1/+1
tagliala-patch-1
2013-09-01Merge branch 'breadcrumb-separator' of https://github.com/dancek/bootstrap ↵Mark Otto2-1/+2
into dancek-breadcrumb-separator
2013-08-31Fix #10324: Add opt-in note to tooltip docsJulian Thilo1-3/+11
* Re-added a note (now callout) about need to opt in to tooltip docs * Converted same note in popover section to callout
2013-08-31Replace invalid US-ASCII character "\xE2")Kevin Granger1-4/+4
Replace invalid US-ASCII character "\xE2") '—' => '-'
2013-08-31Merge branch 'master' of github.com:twbs/bootstrapMark Otto10-103/+20
2013-08-30Merge pull request #10265 from twbs/fix-10252Mark Otto5-19/+5
fix #10252 by restricting Android Firefox reset to only .form-control & .btn
2013-08-31carousel: correctly reset when the slide event is preventedRoland Warmerdam2-9/+30
2013-08-31Getting started docs: tweaks to the _Basic template_ sectionSteven Black1-2/+3
2013-08-30Merge pull request #10315 from mokkabonna/phantom-cleanupChris Rebert2-77/+0
deleted files not used anymore after transition to grunt-contrib-qunit
2013-08-30deleted files not used anymore after transition to grunt-contrib-qunitMartin Hansen2-77/+0
2013-08-30Merge pull request #10312 from jleight/masterChris Rebert1-1/+1
Fix broken link to alerts section of JS page.
2013-08-30Fix broken link to alerts section of JS page.Jonathon Leight1-1/+1
Link was pointing to #js-alerts, but that section of the page does not exist. Changed to #alerts instead.
2013-08-30Moved "Major class changes" section; Added progress-bar-*jhr0071-5/+5
2013-08-30more refactoring of the 'Getting started' section towards more succinct and ↵Steven Black1-9/+7
active wording.
2013-08-30More concise 'fastest way' statement, and consistency with the text of the ↵Steven Black1-1/+1
Download button
2013-08-29Add a change to the progress bar. jhr0071-0/+5
In v3 the inner progress bar should have .progress-bar not .bar
2013-08-29fix #10292Chris Rebert1-0/+8
2013-08-29Merge pull request #10276 from javiereguiluz/patch-3Julian Thilo1-1/+1
Correct comment in grid mixin example
2013-08-29[doc] minor fix in the LESS mixins exampleJavier Eguiluz1-1/+1
2013-08-28fix #10252 by restricting Android Firefox reset to only .form-control & .btnChris Rebert5-19/+5
2013-08-28Revert "fix styling of alert-dismissable example"Chris Rebert1-2/+2
This reverts commit b3a23fa33a261295ed69adc9fbc75b70bf354962.
2013-08-28Prevent X-scroll on small screensUTCWebDev1-0/+3
html overflow-x must be hidden to prevent accidental x-scroll on small screens. This is more apparent with touch screens, where the user often gestures diagonally instead of a true vertical gesture.
2013-08-28Base the navbar default brand hover color on default brand colorGeremia Taglialatela1-1/+1
IMHO this default is better
2013-08-28Update index.htmlChristian1-1/+1
Updated text in the jumbotron container to reflect the Bootstrap 3 change from hero unit to jumbotron. (Wasn't sure if it should be 'a Jumbotron' or just 'Jumbotron' though...
2013-08-28Parameterize @breadcrumb-separatorHannu Hartikainen2-1/+2
2013-08-27use direct-child selector more in table styles to better support nested ↵Chris Rebert3-34/+35
tables; fixes #10231
2013-08-27Make custom max-width on row conform to Boostrap conventionUTCWebDev1-1/+1
Bootstrap break point for tablet portrait 768 keeps the row intact, so it's not appropriate to have off-canvas elements at that width. Custom off-canvas.css should be breakpoint 767px
2013-08-27components.html: fix grammarChris Rebert1-1/+1
2013-08-27fix styling of alert-dismissable exampleChris Rebert1-2/+2
2013-08-27Fixes #10154: add .smallMark Otto1-1/+2
2013-08-27Merge pull request #10222 from jodytate/upstreamMark Otto1-4/+4
a few wording tweaks
2013-08-27a few wording tweaksjody tate1-4/+4
- Changed some existential constructions (yes, they're really called existential http://en.wikipedia.org/wiki/Existential_clause). These aren't innately evil, but rewordings of existential clauses often sound more direct. - Changed a "which" to a "that."
2013-08-27Fixes #9928 and #9932: carousel example in IE10Mark Otto1-4/+24
* Use absolute positioning instead to remove navbar from flow of document * No more negative margin fu * Flip around padding between container and navbar for proper display in xs and sm viewports