aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-08-05more docs changesMark Otto1-5/+1
2013-08-05update modals demo codeMark Otto1-2/+2
2013-08-05Clean up mixins, fix #9100 (no ms-keyframes)Mark Otto4-25/+10
- Spacing tweaks in the general mixins - Add comments to transform mixins about IE support - Remove `-ms-keyframes` because only IE10+ supports it, and without prefix
2013-08-05typoMark Otto1-1/+1
2013-08-05Merge pull request #9097 from trevorah/patch-1Chris Rebert1-1/+1
fixed small typo
2013-08-05fixed small typoAndy Trevorah1-1/+1
its => belonging to it it's => it is / it has
2013-08-05Merge pull request #9091 from liuyl/docsChris Rebert1-1/+1
remove image description from docs
2013-08-05remove image descriptionliuyl1-1/+1
2013-08-05fixes #8832 and #8823: remove max-width from .navbar-brand when not mobileMark Otto3-1/+3
2013-08-05fixes #9063: add var for navbar border radiusMark Otto3-2/+5
2013-08-05run grunt distMark Otto2-6/+7
2013-08-05update docs nav to use new stuffMark Otto1-1/+1
2013-08-05Merge branch 'patch-1' of https://github.com/jholl/bootstrap into jholl-patch-1Mark Otto1-5/+5
2013-08-05Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wipMark Otto4-7/+6
2013-08-04use quotes to allow dots in data-parentJason Diamond1-1/+1
2013-08-04failing test for dot in data-parentJason Diamond1-0/+35
2013-08-04Merge pull request #9087 from eratzlaff/3.0.0-wipChris Rebert1-2/+2
Update documentation on offset for small medium and large devices.
2013-08-04Fixes #9061: Panel titles should inherit color when linkedMark Otto3-1/+8
2013-08-04fixes #8805: ensure .active buttons in button groups behave like :active buttonsMark Otto3-3/+6
2013-08-04fixes #8793: remove padding-right from inputs with state changesMark Otto3-5/+1
2013-08-05Update documentation on offset for small medium and large devices. "Grid ↵Elvis Ratzlaff1-2/+2
options"
2013-08-04Merge pull request #9081 from vsn4ik/rem_type_attrMark Otto3-5/+4
Remove type attribute of tag "script".
2013-08-04Enable input focus state customizationMark Otto5-9/+29
- Add new mixin to generate and customize focus state as needed - Adds variable to set default color - Include clear disclaimer about customizing this—it's about users', so don't go making everything bright red and expect them not to be confused or alarmed. Relevant issues: #2742, #4185, #7942, #8171, #8610, #9044
2013-08-04Fixes #8723: allow modals to not need the .fade class /cc @fatMark Otto3-5/+5
2013-08-04Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wipMark Otto3-5/+5
2013-08-04Merge pull request #9079 from liuyl/buttongroupsMark Otto3-5/+5
Fix #7108: btn group styling
2013-08-04run grunt distMark Otto1-1/+1
2013-08-05Remove type attribute of tag "script".vsn4ik3-5/+4
In HTML5 in tag script, the type attribute is no longer required. The default value is "text/javascript". http://www.w3.org/TR/html5/scripting-1.html#attr-script-type
2013-08-04tooltip.js: add missing spaceChris Rebert1-1/+1
2013-08-05btngroupsliuyl3-5/+5
2013-08-04fixes #8880fat4-25/+57
2013-08-04Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wipfat20-393/+487
2013-08-04remove js anchor interferencefat2-9/+0
2013-08-04trivial docs grammar improvementsChris Rebert2-2/+2
2013-08-03Merge pull request #9059 from twbs/nested-btn-groups-docsChris Rebert1-4/+19
adjust description & give source for nested `.btn-group`s example
2013-08-03adjust description & give source for nested `.btn-group`s exampleChris Rebert1-4/+19
2013-08-03components.html: rm disconnected sentence fragmentChris Rebert1-1/+1
2013-08-03streamline $().dropdown('toggle') descriptionChris Rebert1-1/+1
2013-08-03JS docs: capitalize BootstrapChris Rebert1-3/+3
2013-08-03Merge pull request #9056 from twbs/large-to-lg-etcMark Otto16-121/+142
Greater standardization of sizing terminology
2013-08-03add missing ref to .btn-xs in button sizes docsChris Rebert1-1/+1
2013-08-03add .btn-xs to .btn-group exampleChris Rebert1-0/+21
2013-08-03rm stray space in components.htmlChris Rebert1-1/+1
2013-08-03Greater standardization of sizing terminologyChris Rebert16-121/+121
In class names: * large => lg * small => sm * mini => xs ("Extra small") In screen size categories: * Tiny => Extra small
2013-08-03Merge pull request #9052 from liuyl/inputgroupsMark Otto3-2/+6
fix #9051
2013-08-04add line-heightliuyl3-2/+6
2013-08-03Merge pull request #9036 from eratzlaff/3.0.0-wipMark Otto2-3/+3
Change value with variables for btn-large, btn-small and pagination
2013-08-03Merge pull request #9050 from jonschlinkert/3.0.0-wipMark Otto1-114/+131
organizes the Gruntfile a bit and makes better use of Grunt conventions
2013-08-03This pull request organizes the Gruntfile, makes better use of Grunt ↵Jon Schlinkert1-114/+131
conventions and placates my OCD. Changes in the Gruntfile: * Use two spaces for consistency with the rest of the codebase. * Tasks are now organize based on task type. since lodash templates are used across tasks/targets, this makes it easier to follow. * Use `src-dest` files format when only src-dest pairing is necessary. This saves a line over the files-object format, but more importantly it allows use the src or dest in lodash templates (e.g. `<%= concat.bootstrap.src %>`), which isn't possible in the files-object or files-array formats. * Make the explicit order of the javascript files more obvious in concat task , maybe just a tiny bit more usable and easier to customize - but really just OCD * Use `<%= pkg.name %>` variable for dest CSS, both for consistency with how javascript targets are defined, and to make it just little easier for devs to customize bootstrap. ran the build to test, everything seems good.
2013-08-03Merge pull request #9045 from naneau/3.0.0-wipMark Otto1-1/+1
using @line-height-computed in .navbar-nav link