Mark Otto
|
26ca131a95
|
Merge branch 'wpbrains-media-component' into 2.1.2-wip
|
2012-09-17 18:15:44 -07:00 |
|
Mark Otto
|
143fef9f95
|
overhaul the docs and css to merge into 2.1.2 since this was against master
|
2012-09-17 18:15:39 -07:00 |
|
Mark Otto
|
917b46a343
|
resolve conflicts and remake
|
2012-09-17 16:43:18 -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
|
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
|
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
|
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
|
7a0f5c6c00
|
fixes #5010: .pager span selector should be scoped to immediate children only
|
2012-09-07 11:04:51 -07: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 |
|
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
|
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
|
3737904859
|
fixes #4922: use basefontsize for realz on .lead
|
2012-09-02 13:25:03 -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
|
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
|
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
|
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 |
|
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
|
d797a5fbd7
|
fix for open elements under modal when .modal-open
|
2012-08-27 20:43:12 -07:00 |
|
Mark Otto
|
3b67ece2d1
|
fixes #4666: overrides for input types with .btn-block
|
2012-08-27 15:39: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
|
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
|
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
|
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
|
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 |
|
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
|
1c134d9a7f
|
update version numbers to 2.1.1
|
2012-08-21 13:11:25 -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
|
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
|
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
|
73cf9c4db8
|
fixes #4469 manually: reset width on file inputs
|
2012-08-20 10:28:41 -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
|
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
|
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 |
|
Mark Otto
|
50638530e6
|
fixes #4445: .btn-link shouldn't have a pressed button-like state at all, so nuking everything on :active as well
|
2012-08-18 16:30:47 -07:00 |
|
Mark Otto
|
256a25f25c
|
fixes #4260 and #4322: set vertical-align to top on input-prepend components to solve modal rounding issues
|
2012-08-17 16:28:45 -07:00 |
|
Mark Otto
|
5b947b8a2f
|
fix up padding on small buttons, add button examples
|
2012-08-17 16:11:52 -07:00 |
|
Mark Otto
|
2b22c0c56e
|
fixes #4438: button groups in inline forms now render inline
|
2012-08-17 16:00:36 -07:00 |
|
Mark Otto
|
9e6322dbab
|
fixes #4428: specifity on .search-query increased
|
2012-08-17 12:59:32 -07:00 |
|
Mark Otto
|
077577c7f3
|
fixes #4421: add static top navbar class
|
2012-08-17 11:46:23 -07:00 |
|
Mark Otto
|
b86e1fb62a
|
additional navbar contrast: add inset shadow since we nuked the border
|
2012-08-17 11:31:21 -07:00 |
|
Mark Otto
|
79e05d0c0e
|
change css version #
|
2012-08-17 11:24:48 -07:00 |
|
Mark Otto
|
51b43acf20
|
run make on previous commit's merge
|
2012-08-17 11:23:39 -07:00 |
|
Mark Otto
|
ded21ebc91
|
fixes #4416 in a different way: scope active state of navbar links to just the immediate navbar link, not dropdown elements
|
2012-08-17 11:22:45 -07:00 |
|
Mark Otto
|
54c645e33d
|
tweak transition
|
2012-08-15 14:49:55 -07:00 |
|
Mark Otto
|
ada5589184
|
add transition to thumbnails
|
2012-08-15 14:45:35 -07:00 |
|
Mark Otto
|
2ee035403d
|
running make on prev merge
|
2012-08-14 16:28:17 -07:00 |
|
Mark Otto
|
9c72246d49
|
navbar and dropdown fixes, for alignments and for ie7/8 dropdown hidden bugs from #3946
|
2012-08-14 16:24:58 -07:00 |
|
Mark Otto
|
f3479a3953
|
compensate for ie7 button padding with no borders, fix indentation
|
2012-08-14 15:44:25 -07:00 |
|
Mark Otto
|
f933a41c7b
|
remove bottom margin on radios and checkboxes
|
2012-08-14 15:34:10 -07:00 |
|
Mark Otto
|
780636d955
|
fixes #3674: checkbox vertical alignment in IE9
|
2012-08-14 15:29:47 -07:00 |
|
Mark Otto
|
a80dafbb18
|
fix width of star github btn in docs
|
2012-08-14 15:00:22 -07:00 |
|
Mark Otto
|
5144c77b27
|
fixes #4358: make select elements 30px tall to match inputs
|
2012-08-14 14:57:49 -07:00 |
|
Mark Otto
|
50df524ba1
|
remove borders entirely from fixed navbars
|
2012-08-14 14:53:45 -07:00 |
|
Mark Otto
|
dbcd87331d
|
fixes #4371: scope hovers on table rows to tbody
|
2012-08-14 14:51:33 -07:00 |
|
Mark Otto
|
0b0d7f104c
|
fixes #4396: pull right dropdown menus no longer overlaid by submenus
|
2012-08-14 14:32:03 -07:00 |
|
Mark Otto
|
2a6deb92b1
|
fixes #4395: scope dropdown menu caret in navbar to first level dropdown only
|
2012-08-14 14:29:31 -07:00 |
|
Andreas Cederström
|
2df0a0fdeb
|
now with 13 custom jquery plugins
|
2012-08-14 13:58:12 +02:00 |
|
Mark Otto
|
97a23ef2e6
|
fixes #4342: navbar vars not in use, render navbar dividers
|
2012-08-13 22:57:40 -07:00 |
|
Mark Otto
|
9f8ce77751
|
running make on previous changes
|
2012-08-13 10:05:19 -07:00 |
|
Mark Otto
|
f6c7ac51f2
|
add some simple styles for showing white icons on hover where appropriate
|
2012-08-08 11:26:22 -07:00 |
|
Mark Otto
|
3c89f7bb5f
|
fix chevron on js docs and run make after table changes
|
2012-08-07 23:07:53 -07:00 |
|
Mark Otto
|
4eee78e051
|
fixes #4304: more specific selectors on table border classes to override .table-striped
|
2012-08-07 22:50:49 -07:00 |
|
Mark Otto
|
8ed77c41f0
|
fixes #4295: add vars for pagination
|
2012-08-07 22:37:38 -07:00 |
|
Mark Otto
|
d27dcf3b07
|
cut down on selectors on .formFieldState() mixin to origin input catchall
|
2012-08-01 23:16:49 -07:00 |
|
Mark Otto
|
1482030679
|
fixes #4207: redeclare box-shadow on .formFieldState() mixin so transitions work in WebKit
|
2012-08-01 23:15:51 -07:00 |
|
Mark Otto
|
b979cd9e67
|
darken default button borders
|
2012-08-01 17:01:29 -07:00 |
|
Mark Otto
|
735001cb26
|
increase horizontal padding on inputs given new font-size
|
2012-08-01 11:53:00 -07:00 |
|
Mark Otto
|
fab1a80dcb
|
increase margin on checkboxes and radios to center properly
|
2012-08-01 11:35:31 -07:00 |
|
Mark Otto
|
196fb1d86a
|
fixes #3615: remove last-child hack for IE7 since IE7 doesn't support :last-child
|
2012-07-30 22:26:54 -07:00 |
|
Mark Otto
|
59eba9afbc
|
remove position from labels/badges in mini btns
|
2012-07-30 15:54:03 -07:00 |
|
Mark Otto
|
364dbb7931
|
fixes #3665: ensure inputs in a fluid row maintain grid sizing
|
2012-07-30 15:38:36 -07:00 |
|
Mark Otto
|
a9bf1e6e35
|
fixes #3900: nudge badges in buttons up 1px
|
2012-07-30 13:25:27 -07:00 |
|
Mark Otto
|
b2ebd5c46c
|
update button styles to use updated 14px base font size, align carets to others with no opacity changes
|
2012-07-30 12:52:44 -07:00 |
|
Mark Otto
|
7fa99fb1fe
|
fix navbar form alignment, and update examples to show these cases
|
2012-07-30 12:15:08 -07:00 |
|
Mark Otto
|
b63543181a
|
fix examples collapse classes, rename navbar-redux to navbar and delete the old one
|
2012-07-30 10:08:27 -07:00 |
|
Mark Otto
|
cfac4bb59d
|
fixes #4221: correct border-collapse property for IE7 hack
|
2012-07-29 23:51:40 -07:00 |
|
Mark Otto
|
22a9a83656
|
fixes #3694: provide override classes for .hide and .pull-right for grid columns
|
2012-07-29 16:51:24 -07:00 |
|
Mark Otto
|
d63ebe3f3c
|
more breadcrumb tweaks for contrast
|
2012-07-29 16:37:37 -07:00 |
|
Mark Otto
|
87ce3489d3
|
remove gradient, border, and box-shadow from .breadcrumb to differentiate from nav and buttons
|
2012-07-29 16:25:20 -07:00 |
|
Mark Otto
|
a30045daef
|
reverse navbar styles to save code
|
2012-07-29 00:30:15 -07:00 |
|
Mark Otto
|
fe6a4b0b54
|
add .btn-block for a full-width button option
|
2012-07-27 15:42:58 -07:00 |
|
Mark Otto
|
16b4ac0d8f
|
add docs for sub menu support on dropdowns, add caret via :after to submenu toggles
|
2012-07-27 10:35:15 -07:00 |
|
Mark Otto
|
9d5c431223
|
add basic support for sub menus in dropdown menus
|
2012-07-27 10:06:54 -07:00 |
|
Mark Otto
|
1e9b450619
|
add image styles, for now to scaffolding (soon to own file)
|
2012-07-27 00:06:43 -07:00 |
|
Mark Otto
|
6474190746
|
increase height of homepage jumbotron, update vars and styles of popovers
|
2012-07-26 23:42:36 -07:00 |
|
Mark Otto
|
7590e65f6f
|
fix search form, mostly in navbar
|
2012-07-24 01:44:12 -07:00 |
|
Mark Otto
|
c37aa99e28
|
modal heading line-height
|
2012-07-24 00:37:19 -07:00 |
|
Mark Otto
|
4912dd441d
|
fix h3 in modal and make modal unhidden by removing important from earlier issue
|
2012-07-24 00:35:54 -07:00 |
|
Mark Otto
|
cd441e082f
|
fixes #4156: don't override border radius if stacked nav has one child
|
2012-07-23 23:56:13 -07:00 |
|
Mark Otto
|
f085dbadd1
|
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
Conflicts:
docs/assets/css/docs.css
docs/base-css.html
docs/components.html
docs/customize.html
docs/getting-started.html
docs/javascript.html
docs/scaffolding.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/customize.mustache
docs/templates/pages/getting-started.mustache
docs/templates/pages/javascript.mustache
docs/templates/pages/scaffolding.mustache
|
2012-07-23 23:01:38 -07:00 |
|
Jacob Thornton
|
dcf75697ec
|
some progress on affix plugin
|
2012-07-22 18:28:39 -07:00 |
|
Mark Otto
|
1d4660beea
|
nuke commented out code from last fix
|
2012-07-19 21:25:42 -07:00 |
|
Mark Otto
|
3c1a0fbda4
|
fixes #4103: simpler fix for tfoot in .table-border
|
2012-07-19 21:25:24 -07:00 |
|
Mark Otto
|
89d7ec5290
|
fixes #4102: properly round top left corners of .table-border with caption/colgroup; also fix css tests page layout and footer
|
2012-07-19 21:06:42 -07:00 |
|
Mark Otto
|
aac3736eea
|
fixes #3845: add .btn-link for transparent buttons styled as links
|
2012-07-17 23:32:52 -07:00 |
|
Mark Otto
|
cb1a59caa0
|
Merge branch '2.1.0-wip' of https://github.com/gcoop/bootstrap into gcoop-2.1.0-wip
Conflicts:
docs/base-css.html
docs/templates/pages/base-css.mustache
|
2012-07-17 23:14:58 -07:00 |
|
Mark Otto
|
326b665065
|
de-scope nav-header from .nav
|
2012-07-17 22:40:38 -07:00 |
|
Mark Otto
|
39f8996d6a
|
fix dropdown vars and make hover state be link color again, add gradient to dropdown link hovers, fix caret positions and active states on nav tabs, tweak nav link padding
|
2012-07-17 22:26:53 -07:00 |
|
Mark Otto
|
478396fd4e
|
remove list-type declarations from ul and ol elements since those should just use browser defaults
|
2012-07-17 19:11:41 -07:00 |
|
Mark Otto
|
e20d2dfe9d
|
docs cleanup and blockquote cleanup for .pull-right option
|
2012-07-15 16:13:25 -07:00 |
|
Mark Otto
|
750badabf7
|
copy edits and tweaks to utility classes to ensure they always are specific enough
|
2012-07-13 14:43:51 -07:00 |
|
Mark Otto
|
5cb116beb8
|
cleanup subnav example
|
2012-07-13 10:58:20 -07:00 |
|
Mark Otto
|
c884d6eaa6
|
clean up docs for subnav
|
2012-07-12 13:50:27 -07:00 |
|
Mark Otto
|
713105774f
|
fixes #3706: add textColor and textShadow as options to .buttonBackground mixin
|
2012-07-10 00:45:44 -07:00 |
|
Mark Otto
|
5d8e78e0fa
|
fixes #3605: add support for input-prepend/-append to .form-search
|
2012-07-10 00:32:30 -07:00 |
|
Mark Otto
|
64e87a85f5
|
remove popoverarrows mixin, relegate code to tooltips and popvers since we only used them once each; this fixes the problem of broken tooltips in 2.1
|
2012-07-09 22:14:30 -07:00 |
|
Mark Otto
|
f4877c2369
|
fix up docs popover examples and copy
|
2012-07-09 21:13:33 -07:00 |
|
Mark Otto
|
f495a8d0cc
|
fixes #3210: add .btn to .navbar-form to remove bottom margin, improve vertical align of contents of .navbar-form
|
2012-07-09 21:01:29 -07:00 |
|
Mark Otto
|
93be608bf0
|
fixes #3384: add support for multiple inputs per line when using grid sizing
|
2012-07-09 20:49:17 -07:00 |
|
Mark Otto
|
7800fee7e0
|
fixes #3973: same border on disabled inputs as default inputs:
|
2012-07-09 00:51:38 -07:00 |
|
Mark Otto
|
07f80e6fd8
|
fixes #4027: same margins on .pager and .pagination
|
2012-07-09 00:42:38 -07:00 |
|
Mark Otto
|
25d0b341a9
|
wasn't feeling the new buttons, downsizing again until we get a better balance
|
2012-07-09 00:31:54 -07:00 |
|
Mark Otto
|
9887d3cf4a
|
updating docs examples to remove 13/18 resets, fix up buttons alignments and carets
|
2012-07-09 00:26:32 -07:00 |
|
Mark Otto
|
16cf6b30cd
|
docs changes for icons
|
2012-07-09 00:17:36 -07:00 |
|
Mark Otto
|
8b696ad0b5
|
fix text in docs about default font-size and line-height
|
2012-07-09 00:14:35 -07:00 |
|