Mark Otto
|
917b46a343
|
resolve conflicts and remake
|
2012-09-17 16:43:18 -07:00 |
|
Mark Otto
|
caa79ed594
|
fixes #5001: proper ids on form examples
|
2012-09-17 16:26:51 -07:00 |
|
Mark Otto
|
6881c193ca
|
fixes #5039: properly set .row-fluid margins for .controls-row
|
2012-09-17 16:09:36 -07:00 |
|
Mark Otto
|
03a406d920
|
fixes #5041: add new navbar css tests for each variation, remove width: 100%; from .navbar-static-top
|
2012-09-17 15:49:22 -07:00 |
|
Mark Otto
|
6f3bef195a
|
nuke new examples for now
|
2012-09-17 08:53:13 -07:00 |
|
Mark Otto
|
6e25aacc91
|
more carouself example work
|
2012-09-16 21:54:06 -07:00 |
|
Mark Otto
|
6c4b276cd4
|
way cooler carousel example, along with updated screenshots for examples
|
2012-09-14 15:55:46 -07:00 |
|
Mark Otto
|
7857089065
|
tweak copy on each template, add sign in template
|
2012-09-14 15:21:44 -07:00 |
|
Mark Otto
|
0bcbcf69ec
|
adding new examples
|
2012-09-14 15:17:46 -07:00 |
|
Mark Otto
|
e4e2e37c5c
|
add in some more examples (will work em in later), removed fleetio per their request, and added gather content to replace it
|
2012-09-14 14:48:03 -07:00 |
|
Mark Otto
|
5aa1018496
|
i18n homepage
|
2012-09-14 14:31:14 -07:00 |
|
Mark Otto
|
faa760f563
|
revert docs change
|
2012-09-14 10:30:55 -07:00 |
|
Martin Bean
|
2ead9a5bc3
|
Standardized spelling of 'JavaScript'; added icons to file trees
|
2012-09-14 14:06:15 +01:00 |
|
Mark Otto
|
595e1a189c
|
fixes #5119: javascript in navbar typo
|
2012-09-13 10:07:57 -07:00 |
|
Mark Otto
|
15bb78ce80
|
fixes #5107: make all .btn-group inline-block by default instead of just within a .btn-toolbar
|
2012-09-12 16:37:41 -07:00 |
|
Mark Otto
|
e1deba30aa
|
fixes #5097: js docs typos
|
2012-09-12 16:22:52 -07:00 |
|
Mark Otto
|
537c5cc33d
|
use local var for a few other .box-shadow mixins to fix CSS not compiling
|
2012-09-12 16:18:52 -07:00 |
|
Mark Otto
|
38303dd997
|
revert the js evaluation in .box-shadow mixin, fix last mixin usages to escape if using >1 shadows
|
2012-09-12 15:53:29 -07:00 |
|
Brian Campbell
|
2c8eff0eec
|
Updated pagination to support .pagination-large, .pagination-small, .pagination-mini matching button sizes. Updated related docs.
|
2012-09-12 14:10:03 -06:00 |
|
Mark Otto
|
0489c708c7
|
fixes #5040 manually: remove overflow: auto; from .modal to resolve sporadic modal right padding issues with scrollbars
|
2012-09-10 22:51:16 -07:00 |
|
Mark Otto
|
39791a8ea8
|
fixes #5059 manually: include media type in css getting started block
|
2012-09-10 22:44:08 -07:00 |
|
Geoff Young
|
76e42edb29
|
Updated sample markup to reflect live demo.
|
2012-09-09 18:58:23 -04:00 |
|
Mark Otto
|
f29f98501c
|
run make after merging #5028, which removes the left margin of responsive fluid grid offsets
|
2012-09-07 11:42:21 -07:00 |
|
Mark Otto
|
61332d727e
|
fixes #5020: submenu support in dropup
|
2012-09-07 11:34:05 -07:00 |
|
Mark Otto
|
f2bd7d9f27
|
fixes #5018: .btn-block in .modal-footer no longer has left margin
|
2012-09-07 11:10:00 -07:00 |
|
Mark Otto
|
6c5c3c81ec
|
Merge branch 'tiny-typos' of https://github.com/ramiro/bootstrap into ramiro-tiny-typos
|
2012-09-07 11:06:08 -07:00 |
|
Mark Otto
|
7a0f5c6c00
|
fixes #5010: .pager span selector should be scoped to immediate children only
|
2012-09-07 11:04:51 -07:00 |
|
Ramiro Morales
|
138b5a8c05
|
Fix small documentatio typos.
|
2012-09-05 23:07:52 -03:00 |
|
Mark Otto
|
d4a16d35eb
|
fixes #4996: incorrect border radius on a table
|
2012-09-05 10:05:54 -07:00 |
|
Mark Otto
|
3fa4ca2d87
|
Merge branch 'spantaleev-patch-1' into 2.1.2-wip
|
2012-09-05 10:04:38 -07:00 |
|
Mark Otto
|
dfb3175d4b
|
rebuild after merge
|
2012-09-05 10:04:28 -07:00 |
|
Mark Otto
|
08b8571cb8
|
version bump to get this started
|
2012-09-05 10:00:57 -07:00 |
|
Jacob Thornton
|
c52368d3c5
|
last rebuild before 2.1.1 release
|
2012-09-04 20:44:11 -07:00 |
|
Mark Otto
|
bc4ecd9984
|
regrettably remove the animated button for download on homepage to improve page performance in some browsers
|
2012-09-04 20:13:27 -07:00 |
|
Mark Otto
|
7e4629fbbe
|
fixes #4968 manually: typo in scaffolding docs about offset classes
|
2012-09-04 14:27:48 -07:00 |
|
Mark Otto
|
bf590d8c81
|
fixes #4958: add version to minified js
|
2012-09-04 11:13:08 -07:00 |
|
Mark Otto
|
de36456f5d
|
fixes #4957: use input border var for select element instead of #ddd
|
2012-09-04 11:00:25 -07:00 |
|
Mark Otto
|
1f0043a7f5
|
fixes #4959: docs example
|
2012-09-04 09:13:09 -07:00 |
|
Mark Otto
|
8cda830eaf
|
fixes #4146: IE7-8 responsive image helper
|
2012-09-03 01:13:42 -07:00 |
|
Mark Otto
|
9d5f9eca85
|
fixes #4909: add color utility classes .text-warning, etc and document them
|
2012-09-03 00:47:48 -07:00 |
|
Mark Otto
|
69d4c3f9a1
|
fixes #4925: ensure docs examples don't use fixed font-size and line-height for .lead
|
2012-09-02 20:54:41 -07:00 |
|
Mark Otto
|
3737904859
|
fixes #4922: use basefontsize for realz on .lead
|
2012-09-02 13:25:03 -07:00 |
|
Mark Otto
|
209852c805
|
fixes #4902: proper accordion html example
|
2012-09-01 12:03:55 -07:00 |
|
Mark Otto
|
02f6bd65f5
|
fixes #4910: use @baseLineHeight * 1.5 for .lead font-size
|
2012-09-01 12:00:13 -07:00 |
|
Mark Otto
|
e8c5b3c9a5
|
fixes #4869: typo in getting started
|
2012-08-31 23:51:48 -07:00 |
|
Mark Otto
|
b1bdca0fdb
|
fixes #4901: attribute typo and reran make
|
2012-08-31 23:25:58 -07:00 |
|
Mark Otto
|
00d6f26270
|
fixes #4896: reflect media query order in docs
|
2012-08-31 23:12:02 -07:00 |
|
Mark Otto
|
0f85e8b7f8
|
fixes #4824: scope table grid sizes to .table instead of table
|
2012-08-31 22:37:46 -07:00 |
|
Mark Otto
|
beb0b64096
|
fixes #4889: btn-link disabled styles
|
2012-08-31 14:02:18 -07:00 |
|
Mark Otto
|
afd931262c
|
Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip
|
2012-08-29 13:14:11 -07:00 |
|
Mark Otto
|
2da2169a56
|
fixes #4828: make fluid grid inputs size the same as fixed grid inputs
|
2012-08-29 13:06:47 -07:00 |
|
Mark Otto
|
2137cd65fb
|
fixes #4819: manual fix of missing .control-label in responsive767 file, coupled with a remake
|
2012-08-29 13:05:43 -07:00 |
|
Mark Otto
|
010a5dd84d
|
Merge pull request #4816 from desimone/master
Fixed a typo in docs/assets/css/docs.css
|
2012-08-29 10:48:04 -07:00 |
|
Bobby DeSimone
|
8878facc67
|
Fixed a typo in docs/assets/css/docs.css
|
2012-08-29 11:13:55 -03:00 |
|
Mark Otto
|
e27b1355b5
|
fixes #4771: widen .form-horizontal labels and .dl-horizontal terms given larger font-size of 2.1.0
|
2012-08-28 10:12:04 -07:00 |
|
Mark Otto
|
545edf5459
|
Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip
|
2012-08-27 22:43:05 -07:00 |
|
Mark Otto
|
609142eee2
|
fixes #4729: only use margin-top on .help-block when it follows an input, select, textarea
|
2012-08-27 22:42:12 -07:00 |
|
Jacob Thornton
|
3568146b28
|
only stop prop on form – as people seem to be relying on dropdown hiding when clicking internal elements
|
2012-08-27 21:44:09 -07:00 |
|
Mark Otto
|
7d412b1e14
|
fixes #4741: undo previous version's attempt at firefox gradient changes and add gradient tests
|
2012-08-27 21:18:55 -07:00 |
|
Mark Otto
|
55982664d0
|
Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip
|
2012-08-27 21:06:29 -07:00 |
|
Mark Otto
|
1eaf1cf418
|
fixes #4653: add hover states to stateful table rows
|
2012-08-27 21:06:21 -07:00 |
|
Jacob Thornton
|
601e252074
|
fix for #4761
|
2012-08-27 20:58:51 -07:00 |
|
Jacob Thornton
|
d797a5fbd7
|
fix for open elements under modal when .modal-open
|
2012-08-27 20:43:12 -07:00 |
|
Mark Otto
|
17d8c78e52
|
fix docs horizontal scroll on tablet viewports
|
2012-08-27 20:32:42 -07:00 |
|
Alexandre Magno
|
b5a8c0a45e
|
i18n tags missing in some strings at getting started download page
|
2012-08-27 23:54:07 -03:00 |
|
Mark Otto
|
303a33f15c
|
fixes #4664: spelling mistake in alerts docs
|
2012-08-27 15:48:54 -07:00 |
|
Mark Otto
|
3b67ece2d1
|
fixes #4666: overrides for input types with .btn-block
|
2012-08-27 15:39:55 -07:00 |
|
Mark Otto
|
4674945fa8
|
fixes #4556: add mention of disable state and required js to buttons docs
|
2012-08-27 15:27:58 -07:00 |
|
Mark Otto
|
b444582ccd
|
fixes #4671: mention collapsing parents in docs for affix plugin
|
2012-08-27 15:20:50 -07:00 |
|
Mark Otto
|
8610fd9b2b
|
remove min-height from .span3 in docs since we no longer need it
|
2012-08-27 15:12:55 -07:00 |
|
Mark Otto
|
85dcbd0b34
|
add min-height: 1px; to .span* classes to prevent grid columns from collapsing
|
2012-08-27 15:12:22 -07:00 |
|
Mark Otto
|
cf9334bd7d
|
fixes #4725: width of .uneditable-input should match standard text input width
|
2012-08-27 12:07:28 -07:00 |
|
Mark Otto
|
22c4f3d058
|
fixes #4718: add vertical-align: middle; to .btn-group to ensure proper alignment next to standard .btn
|
2012-08-27 12:05:15 -07:00 |
|
Mark Otto
|
15317419f4
|
fixes #4577: no margin on .control-row .span* in responsive
|
2012-08-27 11:46:47 -07:00 |
|
Mark Otto
|
8a5dde556b
|
fixes #4644: ensure new static navbar negative indents on responsive layouts like fixed navbars
|
2012-08-27 11:05:01 -07:00 |
|
Mark Otto
|
1c9d5c43b0
|
fixes #4640: pagination span issues resolved by scoping selectors to appropriate children, not all children; clarify docs on use of spans for disabled and active links
|
2012-08-27 10:56:46 -07:00 |
|
Mark Otto
|
a2b9a5e1fe
|
fixes #4680: proper margin on buttons in navbar forms
|
2012-08-27 10:52:11 -07:00 |
|
Mark Otto
|
fcd08fce8f
|
fixes #4578: add clearfix to .navbar-inner to clear floats
|
2012-08-27 10:32:07 -07:00 |
|
Mark Otto
|
54e3a26dda
|
fixes #4562: correct select and input widths at 220px (changed with 2.1.0 when we changed padding)
|
2012-08-27 10:08:16 -07:00 |
|
Mark Otto
|
96542f14ab
|
fixes #4540: adjust vertical alignment of .btn-group in .navbar
|
2012-08-27 10:04:58 -07:00 |
|
Mark Otto
|
bdc3ff99f3
|
fixes #4749: correct initialism example
|
2012-08-27 09:18:32 -07:00 |
|
Mark Otto
|
72f176d1f5
|
fixes #4748: document jquery dependency better
|
2012-08-27 09:17:20 -07:00 |
|
Mark Otto
|
1b8f4f5bc5
|
fixes #4512: improved borders on navbars
|
2012-08-26 23:23:47 -07:00 |
|
Mark Otto
|
f15eb7b499
|
fixes #4506: clearfix added to .dl-horizontal to account for empty dd elements
|
2012-08-26 23:06:56 -07:00 |
|
Mark Otto
|
eb8aad85b8
|
fixes #4734 manually: doctype in getting started in examples
|
2012-08-26 22:29:40 -07:00 |
|
Mark Otto
|
f744ad57fc
|
fixes #4676 manually: example html updated
|
2012-08-25 22:31:10 -07:00 |
|
Mark Otto
|
d9593e217d
|
avoid top margin on input-append/prepend in .navbar-form
|
2012-08-24 14:45:02 -07:00 |
|
Mark Otto
|
0682780cd8
|
fixes #4657: proper border radius property in tables
|
2012-08-23 15:04:41 -07:00 |
|
Mark Otto
|
5cbb826961
|
Merge pull request #4560 from andriijas/2.1.1-wip-table-row-warning
.warning for table tr and .info for .control-group
|
2012-08-23 09:47:44 -07:00 |
|
Mark Otto
|
be64955e25
|
nuke 10px right margin on .navbar .nav
|
2012-08-23 09:38:56 -07:00 |
|
Mark Otto
|
3424df22ee
|
delete components folder
|
2012-08-23 08:30:27 -07:00 |
|
Mark Otto
|
ac4420237c
|
fixes #4591 properly: remove -1px left margin on .input-append .add-on
|
2012-08-22 20:32:47 -07:00 |
|
Mark Otto
|
4775bc910c
|
fixes #4604: add span support to .pager component
|
2012-08-22 20:28:08 -07:00 |
|
Mark Otto
|
5da217b96e
|
fixed #4598, typo, manually
|
2012-08-22 20:23:58 -07:00 |
|
Mark Otto
|
535dfc2153
|
fixes #4561: typo
|
2012-08-22 09:51:41 -07:00 |
|
Mark Otto
|
6160667b19
|
fixes #4564 manually: typo in getting started jumbotron
|
2012-08-22 09:48:57 -07:00 |
|
Mark Otto
|
5f97e04aa3
|
fixes #4567: link in scaffolding page
|
2012-08-22 09:47:56 -07:00 |
|
Mark Otto
|
115c7b82c4
|
fixes #4586: typo in docs
|
2012-08-22 09:45:57 -07:00 |
|
Andreas Cederström
|
a9764c34a7
|
Add info state to form validation
|
2012-08-22 11:24:02 +02:00 |
|
Andreas Cederström
|
361889def9
|
Add .warning to table rows
|
2012-08-22 11:20:31 +02:00 |
|
Mark Otto
|
5d41742f17
|
fixes #4505: lighten navbar text and link color so hover looks darker
|
2012-08-21 14:53:34 -07:00 |
|
Mark Otto
|
8d00fe4c03
|
running make on previous merge
|
2012-08-21 14:43:13 -07:00 |
|
Mark Otto
|
46c10c8b58
|
alternate fix to #4522: increase line-height on btn-mini
|
2012-08-21 14:38:47 -07:00 |
|
Mark Otto
|
190d3c9c3e
|
fixes #4526: box-shadow on .radio and .checkbox if .control-group has a form field state
|
2012-08-21 14:22:26 -07:00 |
|
Mark Otto
|
e2ecd2df6c
|
Merge branch 'incbee-master' into 2.1.1-wip
|
2012-08-21 14:16:09 -07:00 |
|
Mark Otto
|
45978b6674
|
run make
|
2012-08-21 14:16:01 -07:00 |
|
Mark Otto
|
b1c93c2700
|
fixes #4523: more specific selectors on white icon inversion
|
2012-08-21 14:15:01 -07:00 |
|
Mark Otto
|
311c00a29b
|
fixes #4532: navbar responsive carets for dropdown-menus now hidden, also fixes borders on navbar form
|
2012-08-21 14:07:20 -07:00 |
|
Mark Otto
|
13199c0020
|
fixes #4530: fix docs nesting cols comments
|
2012-08-21 13:59:13 -07:00 |
|
Mark Otto
|
1c134d9a7f
|
update version numbers to 2.1.1
|
2012-08-21 13:11:25 -07:00 |
|
Mark Otto
|
b52d29095a
|
fixes #4520: manually fix example html for icon
|
2012-08-21 13:09:01 -07:00 |
|
Mark Otto
|
4f918ce52c
|
fixes #4517 manually in mustache file as well, typo in docs
|
2012-08-21 13:08:09 -07:00 |
|
Mark Otto
|
8a2b9f4a5f
|
remove entity in content property on dropup carets--not necessary at all
|
2012-08-21 13:02:02 -07:00 |
|
Mark Otto
|
099cec1ca7
|
fixes #4493: typo in dimiss alerts docs
|
2012-08-21 13:00:40 -07:00 |
|
Mark Otto
|
06c718b1d3
|
fixes #4480: typo in scaffolding page
|
2012-08-21 12:59:26 -07:00 |
|
Mark Otto
|
55facf1f2e
|
fixes #4473: docs example typo for js affix plugin
|
2012-08-21 12:58:48 -07:00 |
|
Mark Otto
|
6477ad1acf
|
fixes #4472: manually change mustache file as well for typo
|
2012-08-21 12:57:41 -07:00 |
|
Jacob Thornton
|
320b75de63
|
add affix to zip
|
2012-08-20 23:13:43 -07:00 |
|
Jacob Thornton
|
9e0d87a4dd
|
fix afffix
|
2012-08-20 16:43:49 -07:00 |
|
Jacob Thornton
|
2b5e09038a
|
small nits
|
2012-08-20 16:21:57 -07:00 |
|
Jacob Thornton
|
5d63e8e2a8
|
fMerge branch '2.1.0-wip'
Conflicts:
docs/index.html
|
2012-08-20 16:13:46 -07:00 |
|
Mark Otto
|
01572f00bb
|
ie7 button group and button toggle padding changes
|
2012-08-20 12:27:45 -07:00 |
|
Mark Otto
|
58dd1f20ae
|
fix vertical button-groups in ie7
|
2012-08-20 12:20:22 -07:00 |
|
Mark Otto
|
6cf3752b9b
|
fix ie7 dropdowns examples in docs
|
2012-08-20 12:16:15 -07:00 |
|
Mark Otto
|
78cb09b440
|
run make and add comment
|
2012-08-20 11:31:24 -07:00 |
|
Mark Otto
|
e59642838f
|
remove relative and top positioning from docs sidenav at narrow layout
|
2012-08-20 11:28:30 -07:00 |
|
Mark Otto
|
2fda6a45aa
|
bump up height of progress bars, give some extra depth with stacking bars, and then make the stacked bars actually work
|
2012-08-20 11:22:37 -07:00 |
|
Mark Otto
|
47697c5f35
|
Merge branch 'progress-multi-2.1.0-wip' of https://github.com/jpommerening/bootstrap into jpommerening-progress-multi-2.1.0-wip
|
2012-08-20 11:13:07 -07:00 |
|
Mark Otto
|
afaee0ca13
|
reorder jumbotron links
|
2012-08-20 11:09:16 -07:00 |
|
Mark Otto
|
73cf9c4db8
|
fixes #4469 manually: reset width on file inputs
|
2012-08-20 10:28:41 -07:00 |
|
Jonas Pommerening
|
a1951ed7c0
|
stack mutliple progress bars
|
2012-08-20 10:12:03 +02:00 |
|
Mark Otto
|
e510306196
|
bump versions to 2.1.0
|
2012-08-19 23:07:18 -07:00 |
|
Mark Otto
|
a667fd93ab
|
pre font-size increase; revert static top navbar, undo contents section for now
|
2012-08-19 23:01:24 -07:00 |
|
Mark Otto
|
4e979f084d
|
fix static navbar container issues, clean up docs presentation by unfixing the top navbar in favor of static one, start adding table of contents for longer sections of docs
|
2012-08-19 21:12:52 -07:00 |
|
Mark Otto
|
e4d4ef43b0
|
copy change for previous commit
|
2012-08-19 20:38:27 -07:00 |
|
Mark Otto
|
e71e2b4be2
|
fixes #4460 and #4461: copy change for opera animations support
|
2012-08-19 20:38:16 -07:00 |
|
Mark Otto
|
b745b7768a
|
fixes #4458: improve support for .btn + .btn in .btn-groups and .btn-toolbars
|
2012-08-19 17:07:41 -07:00 |
|
Mark Otto
|
887f11d47f
|
fixes #4455: improve small styles and add to docs
|
2012-08-19 13:12:43 -07:00 |
|
Mark Otto
|
47cf3cc62f
|
copy edits to base css page
|
2012-08-19 12:07:23 -07:00 |
|
Mark Otto
|
bb85bbc657
|
compy edits to docs
|
2012-08-19 12:04:41 -07:00 |
|
Mark Otto
|
7ed82c1223
|
font-size change on examples in getting started
|
2012-08-19 11:59:28 -07:00 |
|
Mark Otto
|
8e271d664b
|
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
|
2012-08-19 11:54:05 -07:00 |
|
Mark Otto
|
c531a75ff0
|
fixes #4451 manually: add .fade to modal example in both mustache and html
|
2012-08-19 11:53:55 -07:00 |
|
Jacob Thornton
|
c9cef741f6
|
listen to touchstart for dropdowns on mobile
|
2012-08-18 20:18:15 -07:00 |
|
Jacob Thornton
|
45dddc59a1
|
add click option for tooltip, popover - make click default for popover
|
2012-08-18 19:54:30 -07:00 |
|
Jacob Thornton
|
44e35e9dfa
|
fix component
|
2012-08-18 19:33:46 -07:00 |
|
Jacob Thornton
|
937cfa6a88
|
add note about .nav
|
2012-08-18 19:32:50 -07:00 |
|
Jacob Thornton
|
1166b39630
|
removed some old stuff from application.js
|
2012-08-18 19:24:29 -07:00 |
|
Mark Otto
|
e79eb75e09
|
fixes #4044: make z-index of tooltips same as fixed navbar so they overlay it if generated from within
|
2012-08-18 17:05:37 -07:00 |
|
Mark Otto
|
e6e0e2ac9b
|
fixes #4442: allow for .btn within a .btn-toolbar without .btn-group
|
2012-08-18 16:50:26 -07:00 |
|