Andreas Cederström
60826077e7
Clean up inverse button using variables, adding button group examples. Also adding inverse inline label
2012-02-13 09:41:28 +01:00
Mark Otto
da94850844
fix filename mention in js docs per #1938
2012-02-12 22:50:21 -08:00
Mark Otto
ce5976fb29
ensure help-block is block per #1937
2012-02-12 22:49:06 -08:00
Mark Otto
cbe10bd591
clean up nav-header in responsive
2012-02-12 21:11:56 -08:00
Mark Otto
944c7298d3
adding makeRow and makeColumn mixins for generating more semantic layouts
2012-02-12 20:46:39 -08:00
Mark Otto
3e00c1261f
allow .input-prepend/.input-append to work in .navbar per #1681
2012-02-12 20:28:22 -08:00
Mark Otto
be6fdd9a62
add docs for alt form control sizing per #1700
2012-02-12 20:10:48 -08:00
Mark Otto
4d1f1f0fc7
add typography pattern .page-header to components per #1701
2012-02-12 20:07:25 -08:00
Mark Otto
81d101a6a7
update docs on fixed nav per #1726
2012-02-12 19:50:36 -08:00
Mark Otto
5fc62c5fcc
clear up scaffolding page to separate fixed from fluid grid systems
2012-02-12 16:59:29 -08:00
Mark Otto
ac9ac4ddae
add note to button dropdowns about js plugin dependency per #1746
2012-02-12 15:49:04 -08:00
Mark Otto
163c98ea7e
clean up modals.less comments, add new class for optional use on modal forms to remove bottom margin
2012-02-12 15:43:04 -08:00
Mark Otto
a57dbada0f
change classname from .btn-dark to .btn-inverse, change use text
2012-02-12 15:18:20 -08:00
Mark Otto
1b32e982ad
add hero-unit docs per #1880
2012-02-12 14:47:09 -08:00
Mark Otto
0ff88f2db3
enable the use of .nav-header in dropdowns per #1827
2012-02-12 14:10:07 -08:00
Mark Otto
a9e469e75a
add navbar background hover variable and fix uneditable-input with append/prepend controls
2012-02-12 14:01:58 -08:00
Mark Otto
86b6ea4b5f
lower z-index of fixed subnav to prevent overlap of dropdown items in .navbar-fixed
2012-02-12 13:33:23 -08:00
Mark Otto
de6f3d4a6f
Merge branch '2.0.1-wip' of github.com:twitter/bootstrap into 2.0.1-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-12 13:27:29 -08:00
Mark Otto
ebe547b6a0
Merge branch 'patch-2' of https://github.com/cwiederspan/bootstrap into cwiederspan-patch-2
2012-02-12 13:20:17 -08:00
Mark Otto
24df7f1e1d
update ff comment in buttons
2012-02-12 13:20:08 -08:00
Mark Otto
b9d5ceb14b
edit comment on IE7-8 support of :focus in navbar-search
2012-02-12 11:17:46 -08:00
Jacob Thornton
5b4a29d84e
honor data attributes set on modal as well
2012-02-12 11:15:12 -08:00
Mark Otto
a2bc22bad5
standardize default button gradient styles to match other buttons, reset it's IE filter to improve IE7 hover
2012-02-12 11:14:13 -08:00
Mark Otto
c02df93903
move shim after css
2012-02-12 11:08:58 -08:00
Mark Otto
a72ef967ba
re-add protocol to the shim
2012-02-12 11:08:33 -08:00
Jacob Thornton
d7953a8f1e
Merge branch '2.0.1-wip' of https://github.com/twitter/bootstrap into 2.0.1-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-12 11:07:34 -08:00
Jacob Thornton
ed07a4d0ce
add note about popover placement
2012-02-12 11:06:50 -08:00
Mark Otto
2eedf60d62
write out icon classes explicitly to enable find via browser
2012-02-11 22:34:41 -08:00
Mark Otto
b327420e52
update comment to reflect ie support
2012-02-11 20:58:10 -08:00
Mark Otto
158419c045
reset line-height for file input in ie9
2012-02-11 20:00:44 -08:00
Mark Otto
5bb55e4615
change fixed height on responsive textareas to min-height
2012-02-11 19:21:23 -08:00
Mark Otto
5b22cf5cc3
fix tabs content wrapping per #1620
2012-02-11 17:27:08 -08:00
Mark Otto
a84092d225
update buttons docs for .disabled class per #1774
2012-02-11 17:25:47 -08:00
Mark Otto
a497e9010a
make button examples button element and add upgrade note on tooltip positions per #1532
2012-02-11 17:12:32 -08:00
Mark Otto
5a3dfb72bf
support small for legend per #1544
2012-02-11 16:50:57 -08:00
Mark Otto
4ddc8fd0e4
remove color on :active of buttons
2012-02-11 16:43:53 -08:00
Mark Otto
102bb8e684
clear up some messaging in docs on fluid grid system and nesting overall
2012-02-11 10:38:41 -08:00
Mark Otto
2679c3ebe3
remove the reset type from cancel buttons in forms examples per #1844
2012-02-11 10:13:53 -08:00
Mark Otto
8f1db4321a
fix inline form checkbox/radios
2012-02-11 00:24:06 -08:00
Mark Otto
60ee768537
fix type on responsive grid per #1852
2012-02-11 00:16:13 -08:00
Mark Otto
efac5441d8
move legend fix out of horizontal and to all forms
2012-02-11 00:11:34 -08:00
Mark Otto
cbccbed8c8
fix javascript text on tooltips per #1862
2012-02-11 00:10:26 -08:00
Mark Otto
722c75d1b1
update selectors for icons to include matcher for icon class in middle of class attr, remove docs mention of requiring icon-* first
2012-02-11 00:07:05 -08:00
Mark Otto
a63663a3b6
fix type in less docs per #1902
2012-02-11 00:02:28 -08:00
Mark Otto
02cb4df469
fix some single vs double quotes, fix typo in js docs per #1900
2012-02-11 00:01:35 -08:00
Mark Otto
89205d9db4
manually address #1895
2012-02-10 23:59:00 -08:00
Mark Otto
b4b3343a61
clarify structure of responsive css file
2012-02-10 23:57:31 -08:00
Mark Otto
c720d951be
add best practices and re-org the button groups
2012-02-10 23:50:45 -08:00
Mark Otto
8a91f927f5
clarify npm install command in less docs
2012-02-10 23:37:54 -08:00
Mark Otto
d7aefe67e3
scope th bottom vertical-align to only thead, update code styles to include more comments in less file and scrollable option for pre tag
2012-02-10 23:07:32 -08:00
Mark Otto
c10661cf5d
Merge branch 'barsoom-ol-unstyled' into 2.0.1-wip
2012-02-09 23:20:05 -08:00
Chris Wiederspan
4c7b9b8fce
Added an overriding filter: progid:DXImageTransform.Microsoft.gradient(enabled=false) to the .subnav-fixed class that fixes the bug caused on nav dropdown menus when "docked" in the fixed position.
2012-02-09 14:28:12 -07:00
Jacob Thornton
b36a744fa7
remove small class
2012-02-07 22:32:32 -08:00
Jacob Thornton
04fd01d4b6
fix docs for carousel markup
2012-02-07 22:04:52 -08:00
Jacob Thornton
139a077543
don't use e.target incase button has icon or other content inside it
2012-02-07 21:55:27 -08:00
Henrik N
25bf0af249
Add ol.unstyled
2012-02-07 19:29:45 +01:00
Mark Otto
11f72f6aa2
merge in #1782 , remake to compile html, add some i18n tags
2012-02-07 00:31:01 -08:00
Mark Otto
adff17ac03
fix for #1779 , use line-height var
2012-02-07 00:16:05 -08:00
Mark Otto
2d9b3c45d3
move formfieldstate mixin to mixins.less for #1785
2012-02-07 00:13:52 -08:00
Mark Otto
3b57fba754
merge in #1757 and make the chance to the mustache template, then remake
2012-02-07 00:07:08 -08:00
Mark Otto
7dffeb471f
fix #1786 to manually fix typo in js docs links
2012-02-06 23:55:18 -08:00
Mark Otto
b5f1d2f3a4
rearrange order of 3d and skew mixins:
2012-02-06 23:48:48 -08:00
Mark Otto
7ce62ffc98
make after merging in breadcrumbs wrap fix
2012-02-06 23:42:57 -08:00
Mark Otto
1a97cce19b
manual patch of #1449 to make thumbnails use grid vars
2012-02-06 23:39:22 -08:00
Mark Otto
4ed1b13719
Merge branch 'raphaelz-patch-1' into 2.0.1-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-06 23:36:31 -08:00
Mark Otto
575b82473f
rearrange some of the docs on buttons to show examples of all possible renderings along with code snippets and note about usage; also fix the portrait tablet media query
2012-02-06 23:34:03 -08:00
Jacob Thornton
c8c4d5b392
fix alert tests + add show option back to modals
2012-02-06 00:17:31 -08:00
Mark Otto
85e401a656
add label hover style for ability to make it a link
2012-02-05 02:36:21 -08:00
Mark Otto
546332d85d
resolve #1602 and add table hover style
2012-02-05 02:28:42 -08:00
Mark Otto
f8c2d9b53d
remove 940px from default grid heading
2012-02-05 02:24:14 -08:00
Mark Otto
59b32586af
close #1628 to add padding to all inline checkboxes/radios
2012-02-05 02:16:46 -08:00
Mark Otto
91475c865d
fix #1631 by adding focus to radio buttons
2012-02-05 02:14:25 -08:00
Mark Otto
4a09cf04d8
clean up labels per #1656
2012-02-05 02:01:28 -08:00
Mark Otto
2a192468d3
address #1722 by finishing incomplete sentence on responsive
2012-02-05 01:59:16 -08:00
Mark Otto
d92523f329
fix for #1658 to give .label-success proper text
2012-02-05 01:57:09 -08:00
Mark Otto
ff91b233eb
fix #1665 by correcting tabs example markup
2012-02-05 01:50:55 -08:00
Mark Otto
53da88e561
add mixin for text-overflow
2012-02-05 01:49:36 -08:00
Mark Otto
f59b7ce8ea
add mention of required classes to horizontal forms
2012-02-05 01:43:22 -08:00
Mark Otto
abf4ecac4d
add another code example for horizontal forms
2012-02-05 01:41:45 -08:00
Mark Otto
83cb105317
adding code snippets to form examples
2012-02-05 01:36:11 -08:00
Mark Otto
9b5b8460b4
Merge branch 'noahblon-master' into 2.0.1-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-05 01:26:44 -08:00
Mark Otto
2f42f35c69
manually resolve #1684
2012-02-05 00:35:13 -08:00
Mark Otto
6661639b37
#1693 : manual fix of the pull request to add class name changes to pills/tabs to upgrade guide
2012-02-05 00:29:19 -08:00
Mark Otto
0336f1e644
#1695 : manually fix broken primary button instances
2012-02-05 00:27:08 -08:00
Mark Otto
dfcb2d1ed8
#1697 : update upgrading docs to include mention of no more secondary class in modals
2012-02-05 00:25:40 -08:00
Mark Otto
f29e3263b0
follow up to #1702 , add callout on component alignment in tabs/pills
2012-02-05 00:16:25 -08:00
Mark Otto
cdb1ad1a52
#1702 : add callout to navbar for component alignment
2012-02-05 00:11:21 -08:00
Mark Otto
31abeec0f2
manually handle #1703 for note on horizontal forms
2012-02-05 00:05:01 -08:00
Mark Otto
125368d4db
update docs with call on meta tag for responsive
2012-02-04 23:57:15 -08:00
Mark Otto
35fdddbc4f
correct css selector for .control-label, required in the docs but not in the CSS files
2012-02-04 22:55:47 -08:00
Mark Otto
418bf5221a
#1712 : fix typo in js docs
2012-02-04 22:50:26 -08:00
Mark Otto
87a8c9b677
#1707 : remove rgba() background override on navbar active items for customization
2012-02-04 22:40:50 -08:00
Mark Otto
679cd5ea02
#1706 : protocol independent html5shim added, and moved after the CSS for loading time's sake
2012-02-04 22:38:49 -08:00
Mark Otto
6d8ac203e5
fix broken alert example with data-dismiss
2012-02-04 22:32:04 -08:00
Mark Otto
b297a61f82
#1732 : make examples of alerts in docs components page dismissable
2012-02-04 22:31:09 -08:00
Mark Otto
468688638d
#1715 : strip code of styles when in a pre
2012-02-04 22:23:20 -08:00
Mark Otto
7e81f84b29
buttons and icons updated for improved placement and variable support for icon paths
2012-02-04 22:22:19 -08:00
Mark Otto
81d1f3b96e
remove max-width on dropdown menus
2012-02-04 18:52:25 -08:00
Mark Otto
9259e24f73
fix cutoff follow button
2012-02-04 18:27:05 -08:00
Mark Otto
ac98cee609
allow alternate form layouts to hide inputs with .hide on them
2012-02-04 18:26:04 -08:00
Jacob Thornton
7f0a64106d
its core (typo)
2012-02-02 23:31:03 -08:00
Mark Otto
9ab843b936
add mention of classes to use for button sizes
2012-02-02 09:57:22 -08:00
Mark Otto
e92e9f1138
add count to follow button, tweak links to fit on one line for 940px
2012-02-02 09:46:14 -08:00
Mark Otto
bd0e952003
fix inverted warning text and bg colors in less docs page
2012-02-02 09:36:33 -08:00
Mark Otto
cf488c2800
fix incorrect uses of it's in the docs
2012-02-02 09:33:18 -08:00
Mark Otto
dfdc63e872
fix incorrect use of 'caret'
2012-02-02 09:31:07 -08:00
Mark Otto
8dd2b3d3f8
follow up to #1501 to update notes in sprites.less
2012-02-01 23:10:37 -08:00
Mark Otto
1ec6628e80
add note for icon class usage per #1501
2012-02-01 23:10:00 -08:00
Mark Otto
25ffe14c1b
add line item to docs on upgrading per #1488
2012-02-01 23:02:31 -08:00
Mark Otto
aa8a7668cb
Merge branch 'master' into 2.0.1-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-01 22:52:07 -08:00
Mark Otto
58fd0dea36
fixing some docs pages for i18n
2012-02-01 22:51:01 -08:00
Jacob Thornton
e26da36b9a
remove 2.0-wip ref
2012-02-01 22:30:51 -08:00
Mark Otto
43d797dfff
#1566 : add note about removal of secondary-nav in 2.0
2012-02-01 22:29:15 -08:00
Jacob Thornton
e1deb4e767
fix makefile to reset zips
2012-02-01 22:27:46 -08:00
Mark Otto
4211f21e39
#1571 : remove fixed width on file inputs
2012-02-01 22:27:11 -08:00
Jacob Thornton
6738042c61
rebuild with correct zip
2012-02-01 22:21:29 -08:00
Mark Otto
f34ddb5c3f
nuke all curly ticks
2012-02-01 18:27:38 -08:00
Mark Otto
94c2c70e6e
fix spelling in examples page
2012-02-01 18:25:34 -08:00
Mark Otto
54bfdf1183
fix the makefile
2012-02-01 18:24:41 -08:00
Mark Otto
8a1769c9e2
fix missing ; in buttons.less
2012-02-01 18:18:39 -08:00
Mark Otto
f2d3026de8
update scaffolding responsive section to reflect proper media query ranges
2012-02-01 18:12:14 -08:00
Mark Otto
1ebe51c834
fix mis-labeled label
2012-02-01 18:11:19 -08:00
Mark Otto
4d918beb26
fix js links in components
2012-02-01 18:06:52 -08:00
Mark Otto
2fd6a2e9f6
remove excess td in less docs
2012-02-01 17:55:32 -08:00
Mark Otto
3a2f0765bf
fix hover state on .nav-list for active links
2012-02-01 17:54:21 -08:00
Mark Otto
5c1527abc5
remove unused css files and add scaffolding and hero-unit to the builder
2012-02-01 17:06:40 -08:00
Mark Otto
f166c5a35b
Merge branch 'master' of github.com:twitter/bootstrap
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-01 16:45:25 -08:00
Mark Otto
9b9e1d309b
fix that jank hack
2012-02-01 16:44:07 -08:00
Jacob Thornton
87df230408
rebuild
2012-02-01 16:39:15 -08:00
Jacob Thornton
59016d2198
only add the anyalytics to production
2012-02-01 16:38:58 -08:00
Mark Otto
7f32d15fbb
fix links and rebuild
2012-01-31 19:32:42 -08:00
Jacob Thornton
fd49d4a44f
move examples into docs...
2012-01-31 17:35:23 -08:00
Jacob Thornton
bdfb05dbac
Merge branch '2.0-wip'
...
Conflicts:
docs/assets/bootstrap.zip
2012-01-31 17:27:01 -08:00
Mark Otto
c8fad25902
update upgrade page
2012-01-31 17:24:20 -08:00
Jacob Thornton
cabba91c7c
Merge branch '2.0-wip'
...
Conflicts:
docs/assets/bootstrap.zip
2012-01-31 14:38:06 -08:00
Mark Otto
c84b5cf5f5
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-01-31 14:30:07 -08:00
Mark Otto
6cf79a5b8e
remove unused examples, update examples docs page, add starter template to examples, remove warning alert banner, add screenshots
2012-01-31 14:29:44 -08:00
Mark Otto
013de18e6b
remove warning alert on less docs
2012-01-31 14:00:26 -08:00
Jacob Thornton
fd700e358d
Merge branch '2.0-wip'
...
Conflicts:
docs/assets/bootstrap.zip
2012-01-31 13:59:40 -08:00
Jacob Thornton
e75bc5eb5f
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-01-31 13:59:08 -08:00
Jacob Thornton
390a9af936
move js stuff into assets
2012-01-31 13:58:28 -08:00
Mark Otto
aec0cb3303
fix broken nav on less page
2012-01-31 13:57:43 -08:00
Jacob Thornton
b9de88890e
Merge branch '2.0-wip'
...
Conflicts:
docs/assets/bootstrap.zip
2012-01-31 13:23:29 -08:00
Jacob Thornton
0bfbe5058d
Merge branch '2.0-wip'
...
Conflicts:
.gitignore
LICENSE
Makefile
bootstrap.css
bootstrap.min.css
docs/assets/js/application.js
docs/assets/js/google-code-prettify/prettify.css
docs/index.html
docs/javascript.html
examples/container-app.html
examples/fluid.html
examples/hero.html
js/bootstrap-alerts.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tabs.js
js/bootstrap-twipsy.js
js/tests/index.html
js/tests/unit/bootstrap-modal.js
js/tests/unit/bootstrap-popover.js
js/tests/unit/bootstrap-tabs.js
lib/forms.less
lib/mixins.less
lib/patterns.less
lib/scaffolding.less
lib/tables.less
2012-01-31 13:18:34 -08:00
Mark Otto
cfc1c8a8cd
clean up responsive media queries and docs css
2012-01-31 13:16:11 -08:00
Mark Otto
9cfae03fd4
fix typo in base css docs
2012-01-31 09:37:44 -08:00
Mark Otto
cc5415b889
fix js docs typo
2012-01-31 09:37:14 -08:00
Mark Otto
a6253f0937
fix disabled button docs
2012-01-31 00:15:43 -08:00
Mark Otto
b7713b83fa
chance icon class
2012-01-31 00:11:19 -08:00
Mark Otto
4d93b63916
disable cursor on disabled and active pagination links
2012-01-30 23:27:58 -08:00
Mark Otto
d533310bd2
once more, overhaul the icons and use the css regex selector on our icons
2012-01-30 23:24:35 -08:00
Mark Otto
de994efac7
fix the other disabled button style
2012-01-30 23:17:05 -08:00
Mark Otto
5c9a687665
fix button styles on active and disabled
2012-01-30 23:16:27 -08:00
Mark Otto
61b47e91b8
update layout docs
2012-01-30 23:10:29 -08:00
Mark Otto
1cff29c33f
restore a few commented out responsive items
2012-01-30 23:02:24 -08:00
Mark Otto
47a68ae3aa
update icons everywhere to be scoped per other components, fix broken elements on js docs page
2012-01-30 22:57:00 -08:00
Mark Otto
31911659a2
refactor the navs to use prefixed classes, because you know, consistency is beast mode
2012-01-30 21:29:50 -08:00
Mark Otto
0f3a073b8d
*really* refactor the buttons and update them all over the docs
2012-01-30 21:15:57 -08:00
Mark Otto
21bebe77fe
refactor buttons.less
2012-01-30 20:50:51 -08:00
Jacob Thornton
155047c3e6
speed up topbar animation for responsive
2012-01-30 13:59:05 -08:00
Mark Otto
74f2a89611
fix wrong value in grid column width in download page
2012-01-30 10:01:02 -08:00
Mark Otto
e94e0f1cf9
implement @textColor for body text
2012-01-30 09:41:31 -08:00
Mark Otto
ac581eebac
large carousel images and margin bottom added
2012-01-30 09:19:25 -08:00
Mark Otto
774904464d
fix docs: move .pull-left from search input to search form in navbar
2012-01-30 08:58:40 -08:00
Mark Otto
3722c34b50
account for floated inputs in the .navbar-form
2012-01-30 08:20:37 -08:00
Mark Otto
2d40b07afc
adding warning (orange) button, fix responsive navbar problem
2012-01-30 08:15:28 -08:00
Mark Otto
a29dee44ac
remove all new dropdown button stuff
2012-01-30 08:04:48 -08:00
Mark Otto
2c8ca4f5e2
add skew mixin
2012-01-30 07:54:47 -08:00
Mark Otto
9f5b619094
add in regular button dropdowns, rejigger the button dropdowns section to reflect change
2012-01-30 07:49:28 -08:00
Mark Otto
9ba70796e2
remove top 5px padding from first inline radio/checkbox
2012-01-30 07:40:24 -08:00
Mark Otto
33a969dd0c
update vars in less and download pages
2012-01-30 01:34:59 -08:00
Mark Otto
175fd98a7c
fix forms typo on error state
2012-01-30 01:25:02 -08:00
Mark Otto
144789788f
updated upgrade page to reflect popover changes
2012-01-30 01:24:02 -08:00
Mark Otto
f4e5bc1c53
namespace popover values
2012-01-30 01:20:51 -08:00
Mark Otto
8f448610a9
rename vertical-divider to divider-vertical, add more space around the divider
2012-01-30 01:09:34 -08:00
Mark Otto
dc3d2b1044
update js docs page to clarify usage of images on carousel
2012-01-30 00:44:27 -08:00
Mark Otto
0f088af855
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/bootstrap.zip
less/responsive.less
2012-01-30 00:43:57 -08:00
Mark Otto
ae7f94eeff
overhaul grid mixins and variables, standardize fluid grid system and enable it across responsive layouts
2012-01-30 00:39:44 -08:00
Jacob Thornton
0de951f4f4
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-01-29 19:07:14 -08:00
Jacob Thornton
fae04c8ac1
add license for responsive and rebuild
2012-01-29 19:04:26 -08:00
Mark Otto
2ba1b01f8d
subnav adjustments
2012-01-29 17:03:05 -08:00
Mark Otto
fda77e69eb
move vars and mixins for default grid back to appropriate files
2012-01-29 16:58:51 -08:00
Mark Otto
b078050702
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-01-29 16:55:56 -08:00
Mark Otto
0301d469e8
remove .collapse from navbar responsive docs
2012-01-29 16:54:51 -08:00
Jacob Thornton
90f2e8e196
rebuild zip
2012-01-29 16:46:40 -08:00
Mark Otto
882bb9dbd3
reran make
2012-01-29 16:43:03 -08:00
Mark Otto
b0976bb379
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-01-29 16:42:37 -08:00
Mark Otto
702d3b6dfe
fix broken navbar collapse
2012-01-29 16:35:55 -08:00
Jacob Thornton
298e637d00
remove dist dir
2012-01-29 16:33:29 -08:00
Jacob Thornton
f622822459
check in dist dir for hb5 + update images to point to correct spot for builder
2012-01-29 16:19:41 -08:00
Burak Tuyan
97b3057824
Extending the dropup support to tabs and pills
...
This was needed to match the color of the carets that are used for tabs and pills
2012-01-30 01:13:21 +02:00
Burak Tuyan
918a17a30b
Adding dropup support to split buttons and navbar
...
* Documents the hidden .dropdown-menu.bottom-up option (to be used for dropups)
* Extends the .bottom-up class to carets and all relevant caret styles
* Adds .dropdown-menu.pull-right class for right-aligned dropdowns and dropups
* Adds examples and some information to the "split dropdown" and "navbar" sections of the Docs
2012-01-30 00:50:47 +02:00
Mark Otto
e493f7fc19
update navbar collapse everywhere and remake
2012-01-29 14:22:51 -08:00
Mark Otto
9e7f5025b4
update collapsible nav in navbar
2012-01-29 14:07:58 -08:00
Mark Otto
391661f14b
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-29 13:25:36 -08:00
Mark Otto
278858e706
fix form styles on prepend/append for consistency, update code docs with examples of the code snippets
2012-01-29 13:25:13 -08:00
Jacob Thornton
910e78d26a
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-29 13:16:02 -08:00
Mark Otto
9fa8bde44d
fix animated/striped gradients in progress bars
2012-01-29 13:15:38 -08:00
Jacob Thornton
49d565a6da
move building zip file into docs/makefile
2012-01-29 13:15:37 -08:00
Mark Otto
4e5b0e185e
refined pager styles to give a border on the links and improved hover state
2012-01-29 13:12:13 -08:00
Mark Otto
48529ad01f
last minute addition of a simple fluid grid for our fluid examples; it needs work, so we're not documenting it now
2012-01-29 13:06:57 -08:00
Mark Otto
7bf2767452
remove form docs from the styles and markup, it's no longer needed
2012-01-29 00:07:01 -08:00
Mark Otto
15a1c0ce79
add swatches to the color variables in less docs page
2012-01-28 23:58:39 -08:00
Mark Otto
bca269299b
removing required .navbar-static class, rewrote docs to reflect the change, and updated the upgrade docs page to include the navbar section
2012-01-28 23:40:52 -08:00
Mark Otto
62f4a1571a
revamped the thumbnails examples to make them work and look better at higher resolution
2012-01-28 22:48:25 -08:00
Mark Otto
487dbfdda4
namespace progress bars and labels classes
2012-01-28 22:14:51 -08:00
Mark Otto
59d9983ebc
updates to responsive and docs for responsive navbar
2012-01-28 22:03:14 -08:00
Mark Otto
f1e520badd
clarify and tweak media queries
2012-01-28 20:34:07 -08:00
Mark Otto
3e462f1fb2
update docs to simplify some css
2012-01-28 20:26:27 -08:00
Mark Otto
cf1b46bda4
fix alert close position
2012-01-28 18:46:41 -08:00
Mark Otto
e17c9249d2
fix dropdowns in subnav
2012-01-28 18:27:09 -08:00
Mark Otto
e532228721
more responsive tweaks for tablet
2012-01-28 18:25:05 -08:00
Mark Otto
4fa931e403
fix the navbar click and a few jank responsive problems
2012-01-28 18:11:31 -08:00
Mark Otto
06df91ac55
remove background from accordion, and use border instead
2012-01-28 16:48:03 -08:00
Mark Otto
475b985a0e
remove padding from first-child of inline radios/checkboxes
2012-01-28 16:37:43 -08:00
Jacob Thornton
22d52fca46
fix goign between small view large view with responsive collapse
2012-01-28 16:21:55 -08:00
Jacob Thornton
b8a683d7f2
turn off brand hover for now + get nav toggling in mobile
2012-01-28 15:42:07 -08:00
Jacob Thornton
ea1c21d62d
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-28 15:15:38 -08:00
Jacob Thornton
6493cd22c0
blah
2012-01-28 15:14:57 -08:00
Mark Otto
23e076c1bb
add in a navbar button for toggling the nav items
2012-01-28 15:09:23 -08:00
Mark Otto
7843a665fd
vertical align inline checkboxes/radios to improve rendering in topbar
2012-01-28 14:50:56 -08:00
Mark Otto
9db4f2a344
change .span* inputs to use content-sizing: border-box; to make them behave as block level elements
2012-01-28 14:30:45 -08:00
Mark Otto
1a22c3b30a
restore IE filters, but reset them on buttons
2012-01-28 13:13:01 -08:00
Mark Otto
296d06a285
add checkbox/radio border for ios in responsive
2012-01-28 13:07:01 -08:00
Mark Otto
70c6a6cd85
fix border and border radius on radios/checkboxes for iOS, fix forms docs alignment on small devices
2012-01-28 12:58:26 -08:00
Mark Otto
b77161f864
reset border-radius only for ie9?
2012-01-28 12:49:26 -08:00
Mark Otto
698d4b414c
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-28 12:43:45 -08:00
Mark Otto
2bfda031ce
darken buttons, uncomment out firefox keyframes from progress bars
2012-01-28 12:43:19 -08:00
Jacob Thornton
e1a1fdd35d
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-28 12:09:16 -08:00
Jacob Thornton
12d3c2fe74
fix z-index issue with modals for popovers,tooltips,and dropdowns
2012-01-28 12:08:41 -08:00
Mark Otto
f1dc214977
increase padding on modal-header after decreasing h3 line-height
2012-01-28 11:24:34 -08:00
Mark Otto
2452768259
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-28 11:22:07 -08:00
Mark Otto
28ba9d69c8
nav, buttons, and docs updates to account for outline: 0; on :active
2012-01-28 11:21:39 -08:00
Jacob Thornton
d465952138
clean up js api for dropdowns
2012-01-28 11:03:39 -08:00
Jacob Thornton
ab8f4a394c
remove js for table sorts
2012-01-28 01:48:45 -08:00
Jacob Thornton
81c128fd0b
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-28 00:46:21 -08:00
Jacob Thornton
09df780b75
clean up application js a bit
2012-01-28 00:46:04 -08:00
Mark Otto
f1851ab133
change text on js docs page to improve rendering on iphone, update responsive for carousel considerations
2012-01-28 00:43:25 -08:00
Mark Otto
edee985b96
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-28 00:39:34 -08:00
Mark Otto
967030cb53
modal refinements in docs and general responsiveness
2012-01-28 00:39:22 -08:00
Jacob Thornton
7ffec335ca
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-28 00:37:12 -08:00
Jacob Thornton
4737d693e0
remove quick start section to simplify landing page + start rewriting application js to work ie7
2012-01-28 00:36:37 -08:00
Mark Otto
cc01d3c367
extend block level smalls to h2s in docs
2012-01-28 00:31:55 -08:00
Mark Otto
342a99f1d0
block level page-header h1 small for readability on 480px and under
2012-01-28 00:29:38 -08:00
Mark Otto
963e5e0eda
scope subnav link styles to first child, and no dropdowns
2012-01-28 00:27:49 -08:00
Mark Otto
d448e6921e
rewrite the code section of the type docs
2012-01-28 00:23:30 -08:00
Mark Otto
ce69b70719
give append/prepend inputs higher z-index on focus
2012-01-27 23:53:56 -08:00
Mark Otto
7a756168b5
fix regression in textarea shadows
2012-01-27 22:56:48 -08:00
Mark Otto
1d44f37fc9
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-27 22:52:56 -08:00
Mark Otto
cb8606f2c8
adding wells and close icon to the docs under misc in components, with a new subnav style
2012-01-27 22:52:45 -08:00
Jacob Thornton
e726b231ba
add toggle to docs for popover/tooltip
2012-01-27 21:59:06 -08:00
Jacob Thornton
1e07c066a5
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-27 21:37:59 -08:00
Jacob Thornton
0255f47eb3
add zindex option for tooltips/popovers and fix modal zindex doc example
2012-01-27 21:36:58 -08:00
Mark Otto
ad78caa726
fix right aligned dropdowns in navbar by adding left: auto; to nix default alignment
2012-01-27 21:25:35 -08:00
Mark Otto
78120edf72
add clearfix to control-group for longer labels and any other unforeseen circumstances
2012-01-27 21:20:58 -08:00
Mark Otto
d0447e9aa5
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
2012-01-27 21:09:24 -08:00
Mark Otto
3934d1b6c4
rgba text color on active buttons for a bit more contrast from their non-active siblings
2012-01-27 21:08:04 -08:00
Jacob Thornton
15d3a4797f
simplify build process more - remove really annoying date.
2012-01-27 21:06:09 -08:00
Mark Otto
4e191c423d
update progress bars to have a solid edge until 100% filled
2012-01-27 20:17:03 -08:00
Mark Otto
9800196bf7
use quotes on attr selectors more consistently
2012-01-27 20:05:03 -08:00
Mark Otto
0fa6422918
icon spacing in small buttons and nav lists
2012-01-27 19:57:53 -08:00
Mark Otto
d02c6957d4
fixing up buttons and examples of implementing icons
2012-01-27 19:49:56 -08:00
Mark Otto
7fc6e12b79
comment icons that are 1px off
2012-01-27 18:49:00 -08:00
Mark Otto
aaa530c27e
combined .disabled and [disabled] and confirmed in ie7/8
2012-01-27 18:44:17 -08:00
Mark Otto
7e72eb5063
new tab focus style and mixin
2012-01-27 18:33:25 -08:00
Mark Otto
997fc33af9
clean up use of mixins to highlight them appropriately in your fav editor
2012-01-27 16:40:14 -08:00
Mark Otto
d9759abeeb
Merge branch 'ie_7_components' of https://github.com/phopkins/bootstrap into phopkins-ie_7_components
...
Conflicts:
docs/assets/css/bootstrap.css
2012-01-27 16:35:32 -08:00
Mark Otto
f6dc566963
overhaul navbar behavior in responsive css
2012-01-27 16:26:55 -08:00
Mark Otto
800d0b24e0
remove page-header from docs and add to type.less
2012-01-27 15:28:09 -08:00
Mark Otto
91e9f6fa91
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
2012-01-27 14:49:02 -08:00
Mark Otto
22359f9dfd
update examples and restore icons
2012-01-27 14:48:35 -08:00
Jacob Thornton
065ed01b1f
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
2012-01-27 14:44:58 -08:00
Jacob Thornton
748696a553
add missing paren
2012-01-27 14:44:05 -08:00
Mark Otto
003da1e089
fix inputs in navbar
2012-01-27 14:21:17 -08:00
Mark Otto
6353e5070a
remove unused images from docs assets
2012-01-27 14:03:36 -08:00
Mark Otto
3807a88ee9
update the docs for icons
2012-01-27 13:56:50 -08:00
Mark Otto
8da1c176ec
Merge branch '2.0-wip' of https://github.com/buraktuyan/bootstrap into buraktuyan-2.0-wip
2012-01-27 13:43:51 -08:00
Mark Otto
335a8686da
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
2012-01-27 13:43:28 -08:00
Pete Hopkins
84b9a1bfb6
Rebuild css and html
2012-01-27 16:39:38 -05:00
Mark Otto
b1f38bbea8
update icon examples to show icons in differently sized buttons
2012-01-27 13:39:19 -08:00
Jacob Thornton
3c7e3eb7d3
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
2012-01-27 13:37:14 -08:00
Jacob Thornton
6fd1e9f4c0
rebuil update layout
2012-01-27 13:36:31 -08:00
Mark Otto
d7b8a9c930
align text in buttons so folks can easily make them different widths
2012-01-27 13:36:08 -08:00
Mark Otto
a0b40b361a
i18n download page
2012-01-27 13:35:25 -08:00
Mark Otto
ccd963e622
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
docs/download.html
2012-01-27 13:21:01 -08:00
Mark Otto
e8647c1b11
huuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuge update to doces and stuff
2012-01-27 13:20:02 -08:00
Jacob Thornton
3b3dbd7229
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
2012-01-27 11:07:17 -08:00
Burak Tuyan
16a28d881c
Merge branch '2.0-wip' of git://github.com/twitter/bootstrap into 2.0-wip
2012-01-27 20:48:37 +02:00
Pete Hopkins
f51e703ba6
Rebuild bootstrap.css
2012-01-27 12:16:36 -05:00
Mark Otto
9d0328ff00
adding outline callout as a fallback for IE--needs testing though, thought I already added this
2012-01-27 08:21:39 -08:00
Burak Tuyan
acaa3b5977
Changing the color of the default icons from black ( #000 ) to grayDark ( #333 )
2012-01-27 18:02:57 +02:00
Burak Tuyan
942d1b4595
Updating to latest version of Glyphicons Halflings set (v.1.5) along with some icon enhancements like:
...
- Updated the Gylphicons Halflings set to version 1.5 (30 new icons)
- Optimized the sprite PNG files for minimum filesize without any quality loss
- Made some fixes for horizontal alignment at the LESS/CSS level (tags, bold, arrow-up, minus, chevron-down)
- Made some fixes for vertical alignment at the LESS/CSS level (chevron-down, resize-vertical, resize-horizontal)
- Renamed the old "calendar" class as "list-alt" class (because now we've a real calendar icon)
- Changed the "background-position" of the icon class to "14px 14px", so that a wrong class name will not be showing the glass icon and instead will show a blank icon (which is useful for just positioning the text after the icons in some cases)
- Added new icons (classes) to the base-css Docs (to both HTML file and Mustache template)
- Changed one of the button examples to danger style and used a white icon
- Renamed the sprite image files to save a few bytes here and there (from glyphicons-halflings-sprite.png to lyphicons-halflings.png and from glyphicons-halflings-sprite-white.png to glyphicons-halflings-white.png)
2012-01-27 16:33:18 +02:00
Jacob Thornton
aa594501bd
change typeahead to data-source instead of data-data and add to docs
2012-01-26 23:16:02 -08:00
Jacob Thornton
c63175dc1d
change endpoint to point to actual server...
2012-01-26 22:52:44 -08:00
Jacob Thornton
815a2ae9f2
rebuild + copy images to docs when making
2012-01-26 22:39:17 -08:00
Jacob Thornton
ed64276e5b
move doc building into base make method + build bootstrap to doc assets
2012-01-26 22:05:45 -08:00
Jacob Thornton
dc2deb9a1b
moving structure around + more work on builder...
2012-01-26 21:48:46 -08:00
Jacob Thornton
e0e54d9c6c
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-26 20:23:28 -08:00
Jacob Thornton
1e9c2fb9d4
getting closer....
2012-01-26 20:23:15 -08:00
Mark Otto
c8d2c4e442
fix height of download button
2012-01-26 16:45:01 -08:00
Jacob Thornton
12484a7471
more builder crap
2012-01-26 16:41:28 -08:00
Mark Otto
af96da6e89
adding white sprites
2012-01-26 16:27:37 -08:00
Jacob Thornton
d531f72645
some js for javascript for builder (stil incomplete)
2012-01-26 16:12:34 -08:00
Mark Otto
f398926e46
move down background iamge
2012-01-26 15:22:52 -08:00
Mark Otto
b7f22e27ec
more docs homepage adjustments
2012-01-26 11:47:40 -08:00
Mark Otto
9c1ec6fb98
updated homepage docs to distill strapline
2012-01-26 11:40:29 -08:00
Mark Otto
ef4d0dd7db
space out masthead a git more
2012-01-26 10:12:25 -08:00
Mark Otto
0ef4b6419f
overhaul frontpage jumbotron, add js for twitter buttons back in, fix up some form ids and classes, straighten out the use of primary button variable
2012-01-26 10:00:09 -08:00
Mark Otto
ce467f7091
consistency in download page heading
2012-01-25 20:11:13 -08:00
Mark Otto
f62c9379fb
remove all tablesorter assets and css
2012-01-25 20:07:27 -08:00
Mark Otto
e877d125d7
fix button group shadows, update js docs to fix alert js file link
2012-01-25 20:02:32 -08:00
Mark Otto
7ca3b98d88
docs fixes
2012-01-25 13:56:44 -08:00
Mark Otto
4ea63e5261
finish off the static stuff for build and download page
2012-01-25 13:33:55 -08:00
Mark Otto
a4b8cc2a9c
darken active state on subnav with scrollspy added
2012-01-25 11:30:30 -08:00
Mark Otto
b01de5fc56
updated icons to require a base class .icon
2012-01-25 09:51:03 -08:00
Mark Otto
b8fa6cfacf
move css builder and downloader to dedicated page, start to update remaining sections on LESS docs page
2012-01-25 01:22:29 -08:00
Mark Otto
ae70d2a8b6
refine spacing on fixed subnav
2012-01-24 23:44:59 -08:00
Mark Otto
e555f38ae4
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/less.html
2012-01-24 23:36:39 -08:00
Mark Otto
6ab56051fd
fix up docs css for responsive and subnav, fix forms error states
2012-01-24 23:35:34 -08:00
Jacob Thornton
5e5e87fbd0
scrollspy working for sub navs
2012-01-24 22:33:33 -08:00
Mark Otto
a5c1d1f182
adding actual images to carousel to ensure you can see things are animating; updated styles of carousel controls to work on light and dark backgrounds and use opacity for effects
2012-01-24 20:45:38 -08:00
Mark Otto
731821b78f
updated docs css to fix subnav on iOS
2012-01-24 20:26:54 -08:00
Mark Otto
bacb05608f
redo the form examples to enable better responsive layout
2012-01-24 19:43:52 -08:00
Mark Otto
4a6d9106b8
fix the thumbnails more examples section
2012-01-24 19:36:42 -08:00
Mark Otto
672ba4c2fd
update the subnav on all pages
2012-01-24 19:19:50 -08:00
Mark Otto
d362223535
refine fixed docs bar
2012-01-24 18:29:17 -08:00
Mark Otto
26ed8202ee
modify the scaffolding page to fix the language around preboot/grid variables
2012-01-24 18:24:38 -08:00
Mark Otto
4793a6f8fa
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-24 17:14:34 -08:00
Mark Otto
805a965f2e
finish updating form state and alert variables in less docs page
2012-01-24 17:14:19 -08:00
Jacob Thornton
a40d4993ed
make subnav fix
2012-01-24 17:13:02 -08:00
Mark Otto
7e6797880a
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/index.html
docs/templates/pages/index.mustache
2012-01-24 16:09:32 -08:00
Mark Otto
03d2128f50
Merge pull request #1149 from Calvein/2.0-wip
...
[base-css] Fixed a nasty "mailto" typo and added jquery.tablesorter
2012-01-24 16:08:09 -08:00
Mark Otto
8ff621aa26
fix broken index page heading, update variables and less pages
2012-01-24 16:07:30 -08:00
Mark Otto
fecd4ddd13
docs updates to make the getting started section more responsive, updated the benefits to be clearer and swap x for checkmark
2012-01-24 14:25:30 -08:00
François Robichet
925fef4110
Typo on tablesorter
2012-01-24 22:11:09 +01:00
Jacob Thornton
b4b1ef6839
rebuild with new templates
2012-01-23 15:17:32 -08:00
Jacob Thornton
74521e8354
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
docs/base-css.html
docs/components.html
docs/index.html
docs/javascript.html
docs/less.html
docs/scaffolding.html
2012-01-23 15:06:56 -08:00
Jacob Thornton
f764aee4b9
add templates for doc generation
2012-01-23 14:14:16 -08:00
Mark Otto
1954cf0019
comment in forms'
2012-01-23 13:46:26 -08:00
Mark Otto
ea8f5883fd
clean up subnav aesthetics
2012-01-23 12:04:48 -08:00
Burak Tuyan
4a5867b18b
Optimizing all PNG files, saving 60.02 KB in total without any quality lost. (Using PNGOUTWin 1.5.0.100, Xtreme strategy in compability mode)
2012-01-21 23:52:39 +02:00
Jacob Thornton
7444310c4d
only prevent default of links in sections
2012-01-20 20:05:16 -08:00
Mark Otto
8ceea1f559
fix some ie7 bugs, improve dropdowns for ie due to lack of a shadow, fix pager example code
2012-01-15 11:26:06 -08:00
Mark Otto
dab6d2b17c
change up classes on tables and forms, fix nav list styles in example
2012-01-14 21:28:47 -08:00
Mark Otto
fc053ac8b2
update dropdowns spacing and docs section spacing
2012-01-13 10:07:56 -08:00
Jacob Thornton
6f2f947a43
add build tool for js + rename twipsy to tooltip + lots of little doc cleanup
2012-01-11 21:42:55 -08:00
Mark Otto
cb9be7bd0c
clean up dup css in responsive, fix navbar dropdown caret
2012-01-08 13:21:44 -08:00
Mark Otto
2948d1c3b2
overhaul the entire tabs component structure and docs; remove side nav and make it a nav list to build on new .nav base class
2012-01-07 20:40:28 -08:00
Mark Otto
a339f0051b
fixing tablesorter styles by adding the jquery plugin back to the lib, fixing the docs examples
2012-01-07 12:22:51 -08:00
Mark Otto
8ccc3bcf03
overhauled dropdowns now require use of .caret for dropdown arrow, redid the button group docs section, added the split button dropdown docs section
2012-01-07 03:45:24 -08:00
Mark Otto
45d671d97f
tweak spacing once more on prettify; add support for uneditable inputs to input-append and prepend
2012-01-07 01:22:52 -08:00
Mark Otto
d6a1402f2a
update form shadows and tweak prettyprint styles
2012-01-07 01:03:26 -08:00
Mark Otto
bcf1136f2c
fix form field sizing for selects, document form field grid sizing
2012-01-07 00:47:53 -08:00
Mark Otto
cfc2353059
front page docs updated to include old getting started section, update code styles to look like github gists, and lots more docs updates
2012-01-06 23:59:22 -08:00
Mark Otto
5cb76037ae
fixing conflict in dividers in navbar, fix navbar docs, fix search form in navbar
2012-01-05 23:24:19 -08:00
Mark Otto
9bedfa447c
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-05 21:43:54 -08:00
Mark Otto
c56e9d2d35
massive docs update, mostly to all our new forms, and to the buttons
2012-01-05 21:43:28 -08:00
Jacob Thornton
314feb702f
listen to window for dropdown clear
2012-01-05 18:32:08 -08:00
Mark Otto
90e3a706ba
add jank js back to docs application.js for responsive dropdown in topbar
2012-01-05 16:03:05 -08:00
Mark Otto
621dd13d87
move mega link footer to scaffolding to try it out, fix broken button text shadow, change UL/OL margins back, make li color same as body
2012-01-05 15:43:07 -08:00
Mark Otto
23e5fc2133
Tweak the docs and address the new forms list of controls: radios and checkboxes are now hanging controls to wrap text properly
2012-01-05 14:11:41 -08:00
Mark Otto
20add59de3
breaking out patterns.less even more, removing unnecessary div from checkbox and radio lists--now just labels and inputs
2012-01-05 10:01:42 -08:00
Mark Otto
fb9401b355
tweaks abound, updated prettify styles, new sidenav component started, sprite icons started
2012-01-05 01:34:14 -08:00
Mark Otto
324246e4f9
remove negative margin from .brand in docs, update navbar to support buttons up thurr
2011-12-27 12:39:39 -06:00
Jacob Thornton
3396fc0542
check for prettyprint on window
2011-12-22 19:17:41 -08:00
Jacob Thornton
35fdbad24b
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
docs/assets/js/application.js
docs/base-css.html
docs/components.html
docs/index.html
docs/javascript.html
docs/less.html
docs/scaffolding.html
docs/upgrading.html
2011-12-22 19:15:09 -08:00
Jacob Thornton
efacac0d6c
clean up all the js across all the doc pages
2011-12-21 18:42:43 -08:00
Mark Otto
9fb380151d
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
docs/javascript.html
2011-12-21 18:39:02 -06:00
Mark Otto
af5793e1cd
fix mobile example sites, remove unused JS from docs index
2011-12-21 16:41:46 -06:00
Mark Otto
c854ed167c
rename media grid to thumbnails, recompile bootstrap, fix examples for mobile phones
2011-12-21 16:26:21 -06:00
Mark Otto
20aecb9838
updated all docs to jQuery 1.7, move all docs JS to application.js, and move dropdowns css to dedicated file
2011-12-21 16:22:20 -06:00
Jacob Thornton
a5a98a8a98
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
2011-12-21 14:03:18 -08:00
Jacob Thornton
0980a33b47
update all to new on api + add animation support to tabs
2011-12-20 19:37:41 -08:00
Mark Otto
069ef6a020
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2011-12-19 22:59:20 -08:00
Mark Otto
72a536393c
mostly docs updates, but also some bug fixes per github issues
2011-12-19 22:58:56 -08:00
Jacob Thornton
7df0d1c7d1
rename transitions to transition and fix scrollspy example
2011-12-14 18:45:33 -08:00
Mark Otto
d681ae9f51
updated docs to include other less apps
2011-12-12 09:51:41 -08:00
Mark Otto
4e8c26d409
updated buttons docs
2011-12-11 02:38:58 -08:00
Mark Otto
401f84a7ec
center example sites in docs on mobile
2011-12-11 01:58:06 -08:00
Mark Otto
5c8df1d285
updated index page to add featured sites, more docs tweaks
2011-12-09 14:34:38 -08:00
Mark Otto
b12b71bf7c
updated to include sub nav and pip nav, new docs updates, topbar nav refinements for media queried settings
2011-12-09 11:32:07 -08:00
Mark Otto
f2c40ee24d
adding step nav to components
2011-11-30 00:39:38 -08:00
Mark Otto
cbb291b8ab
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
bootstrap.min.css
2011-11-29 22:35:58 -08:00
Mark Otto
b36df46310
misc docs updates, revamped tables CSS save for grid columns and tablesorter options
2011-11-29 22:35:03 -08:00
Jacob Thornton
98fddaa355
new plugin "collapse" for collapsible lists and "accordion" like support
2011-11-25 17:23:14 -08:00
Jacob Thornton
bc65b58551
merge in js from 1.4... start working through js docs
2011-11-20 20:58:04 -08:00
Mark Otto
1fb98bed91
updated docs pages (still wip), adding misc css classes, added form styles from 1.4, added github buttons to homepage
2011-11-12 00:46:02 -08:00
Mark Otto
2534fee753
adding unofficial github buttons
2011-11-01 13:56:00 -07:00
Mark Otto
3f512adf95
updated docs and type styles for blockquotes and a few fixes for type
2011-10-30 20:14:27 -07:00
Mark Otto
0218d079ad
fix some of the docs styles at 480 to 768
2011-10-29 18:11:17 -07:00
Mark Otto
9fd4e459fe
adding more icons for the homepage for open source, twitter, and html5/css3
2011-10-27 23:34:48 -07:00
Mark Otto
f3128d0fa1
overhauled the front page to feel a bit more marketing-like, added the awesome glyphicons to bring some life to the docs
2011-10-27 23:00:09 -07:00
Mark Otto
20b9390a9e
update docs for responsive
2011-10-27 09:35:58 -07:00
Mark Otto
b4c894961c
address issue #414 and fix up a number of docs loose ends
2011-10-26 23:24:22 -07:00
Mark Otto
648c468927
breaking down the main page into subpages for easier, more comprehensive documentation
2011-10-26 23:11:56 -07:00
Mark Otto
5736ba549c
fix prettyify and update the table styles to include a condensed flavor
2011-10-26 21:22:05 -07:00
Mark Otto
e616026d67
update to docs to cleanup pagination for smartphones, fix some pagination inconsistencies
2011-10-26 21:04:14 -07:00
Mark Otto
b4c0d2a6b2
tweaks to the responsive layout to improve type
2011-10-22 22:49:37 -07:00
Mark Otto
d4675bf4ef
updating the docs to include more responsive fixes, adding rows to the responsive changes as well to undo negative margin
2011-10-22 15:49:42 -07:00
Mark Otto
41ada302ec
tweaking prettify styles to introduce dark theme
2011-10-21 00:37:01 -07:00
Mark Otto
80332e8340
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2011-10-20 09:14:02 -07:00
Jacob Thornton
5ab84f942d
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2011-10-19 22:42:49 -07:00
Jacob Thornton
8545fe9787
greatly simply js plugins - remove js api where reasonable
2011-10-19 21:56:06 -07:00
Mark Otto
a5d2450e88
refinement to the responsive section
2011-10-18 08:11:18 -07:00
Mark Otto
369b9720c6
adding responsive stuff to docs to stub that out, updated type to make ul and ol margins match p tags
2011-10-17 23:45:35 -07:00
Mark Otto
27cbe7f63a
add abbr styles, overhaul type docs section to remove lots of verbose text and put emphasis on tables and more scannable content
2011-10-17 14:17:29 -07:00
Mark Otto
6d2e39950d
updated js docs page to new 12 column layout, fix subhead jumbotron styles to match new front page
2011-10-17 00:03:52 -07:00
Mark Otto
e7d2218b20
few tweaks to responsive stuff, updated docs for grid system (still needs copy editing)
2011-10-16 23:04:31 -07:00
Mark Otto
c62a0239bd
update to responsive to fix new masthead
2011-10-16 19:12:33 -07:00
Mark Otto
1888511d67
updated docs to include quick links and twitter buttons, added updated blueprint pattern to background
2011-10-16 18:45:11 -07:00
Mark Otto
2a82b38cff
tweak the h2s again for better spacing, adjust docs, remove white bg if possible on file input, few other tweaks
2011-10-16 18:01:05 -07:00
Mark Otto
6f44a90edb
tweak line-height of h2 and h3 to not be gihugeous, updated responsive to improve tablet grid and phone styles
2011-10-16 11:35:24 -07:00
Mark Otto
9e9109469e
biiiiiig update coming for responsiveness
2011-10-16 03:00:58 -07:00
Mark Otto
f919f6f94f
huge update to forms, docs for the new forms, added a new link for js example to tabs/pills, add some new mixins
2011-09-29 01:40:27 -07:00
Jacob Thornton
7b614cfa01
allow backdrop option to accept "static" option
2011-09-17 14:20:51 -07:00
Mark Otto
e8d9eb264c
update alert message for ie7 to adjust dismiss icon, update example pages to clean up a few things from testing
2011-09-16 10:51:44 -07:00
Mark Otto
c579e4d550
expanding comment in application.js
2011-09-16 09:55:12 -07:00
Mark Otto
8ff18a9ffc
fixing conflict and recompiling
2011-09-16 09:47:36 -07:00
Mark Otto
b188c0da8b
updated table styles a bit and floated the fluid columns to clear the row dropping problem we were having
2011-09-16 09:41:58 -07:00
Jacob Thornton
68f89d109f
little fixes for ie 7
2011-09-15 22:27:41 -07:00
Jacob Thornton
8896497ea8
update attributes for js and make tooltips reposition on resize
2011-09-15 21:19:39 -07:00
Mark Otto
01d9cd88e8
updated browsers image
2011-09-13 20:24:30 -07:00
Mark Otto
121b62d54e
updates to docs to include more example html, include links to javascript docs where necessary
2011-09-13 10:08:24 -07:00
Mark Otto
1d50fa77e4
adding quick and dirty favicons and touch icons for iOS
2011-09-13 09:35:43 -07:00
Mark Otto
bc2ae90e3a
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
2011-09-12 22:19:44 -07:00
Mark Otto
5249483850
comment out box-shadow on masthead and footer in docs.css because Opera sucks at inset box-shadow :"
2011-09-12 22:19:28 -07:00
Jacob Thornton
5ee11ec8bd
fix docs for opera
2011-09-12 21:06:29 -07:00
Jacob Thornton
fcf816a236
index to use data attr for scrollspy initilizing
2011-09-11 23:36:59 -07:00
Jacob Thornton
200f5817ba
method invocation jqueryui style
2011-09-11 21:03:17 -07:00
Jacob Thornton
e255b4f51d
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
2011-09-11 20:09:20 -07:00
Jacob Thornton
173be3f1e8
change hella js... broke all the tests. i <3 wip
2011-09-11 20:08:43 -07:00
Mark Otto
6bc867ed5c
change template diagrams to be .media-grid
2011-09-11 19:53:48 -07:00
Jacob Thornton
d9cbcfc20d
wait for window load event before positioning images, doi
2011-09-10 22:54:47 -07:00
Jacob Thornton
a5964b07b1
add static sizes for images so tooltips get right size on load
2011-09-10 22:48:39 -07:00
Jacob Thornton
c40e0de3c1
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
...
Conflicts:
docs/index.html
2011-09-10 22:17:37 -07:00
Jacob Thornton
64176caa97
add bootstrap-scrollspy
2011-09-10 22:14:57 -07:00
Mark Otto
6a74a313a8
tweak css for topbar to bring back z-index fix; update javascript markup and some heading text
2011-09-10 21:10:18 -07:00
Mark Otto
00b7dff359
overhaul docs CSS since it was scalable, converted docs mastheads and footers to classes and HTML5 elements, add masthead to js docs page but make it slate so it looks cool and stands out
2011-09-10 21:05:23 -07:00
Jacob Thornton
a8d4475827
adds twipsy js to regular index for positioning
2011-09-10 14:52:45 -07:00
Jacob Thornton
79d5f90713
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
...
Conflicts:
bootstrap-1.3.0.css
2011-09-09 22:48:57 -07:00
Jacob Thornton
5f4e30ed1d
move js plugins to root dir, begin writing tests, and change modal plugin to be more boss like
2011-09-09 22:47:49 -07:00
Mark Otto
dad058326e
add version # to docs
2011-09-09 16:00:59 -07:00
Mark Otto
53135839f5
adding nested columns to the grid section
2011-09-09 10:04:07 -07:00
Jacob Thornton
b086d94253
remove aria-control stuff
2011-09-09 00:00:03 -07:00
Jacob Thornton
5960711d0f
some more js love - update the docs with tabs/pills plugin
2011-09-08 20:21:03 -07:00
Jacob Thornton
346122a0c7
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
2011-09-08 19:13:26 -07:00
Jacob Thornton
8d2f14d8d0
tabssss
2011-09-08 19:13:08 -07:00
Mark Otto
1c03a07591
bump css to 1.3.0, update makefile to reflect that, update form css to prepend form to the .clearfix to prevent some bullshit, small tweaks elsewhere
2011-09-08 10:36:56 -07:00
Mark Otto
daf903f847
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
2011-09-06 23:30:45 -07:00
Mark Otto
d640c3b14b
update diagrams to use smaller border radius, add new container-app example
2011-09-06 23:30:21 -07:00
Jacob Thornton
fb8987148a
move javascript from examples into docs
2011-09-06 23:20:56 -07:00
Mark Otto
d0882c580d
first pass at enabling active states in dropdowns in topbar and fixing the bug of having an active class on parent dropdown
2011-09-06 21:54:00 -07:00
Mark Otto
dfbb591953
addng docs for the themes stuff and examples
2011-09-04 14:02:56 -07:00
Jacob Thornton
0e13f8dca1
Merge branch 'master' of github.com:twitter/bootstrap into js-examples
...
Conflicts:
bootstrap-1.2.0.css
bootstrap-1.2.0.min.css
lib/patterns.less
lib/scaffolding.less
2011-09-02 21:04:25 -07:00
Mark Otto
cb244d5d51
fix docs.css spacing, add gradient support for ie9 back
2011-09-02 12:31:14 -07:00
Mark Otto
e0722fcb1b
cleanup docs and fix gradient in masthead
2011-09-02 12:24:28 -07:00
Mark Otto
251882892f
resolve conflicts
2011-09-02 00:52:22 -07:00
Mark Otto
fa94b264fa
add temp second topbar to nav section, fix it's compatibility issues
2011-09-02 00:50:05 -07:00
Jacob Thornton
2a5d829c4a
add doc styles back to topbar-inner
2011-09-02 00:47:06 -07:00
Jacob Thornton
ed96f181c8
add topbar dropdown js
2011-08-27 21:46:50 -07:00
Mark Otto
4f67e135dc
adding dropdowns to tabs by refactoring the shizzzz out of them
2011-08-26 20:38:23 -07:00
Jacob Thornton
a63fb4d234
Merge branch '1.1.1-wip'
2011-08-26 15:21:20 -07:00
Jacob Thornton
5193619ab0
clean up redundant google prettify code
2011-08-26 10:53:21 -07:00
Karthik Viswanathan
0a34a6d4b2
Made JavaScript unobtrusive by factoring out prettyPrint() to application.js. Also removed unused class from hero demo.
2011-08-26 00:00:05 -07:00
Mark Otto
ce615d016a
merged in my pending changes from 1.2-wip branch, resolve diffs as best as i could, update docs and alerts to use original classes, updated docs to include smaller section for layouts
2011-08-25 22:41:45 -07:00
Mark Otto
50f484eed6
big update to change the alerts, normal and block level, to have simpler css and new colors independent of the base color scheme
2011-08-25 02:00:07 -07:00
Jacob Thornton
8368cfd523
add opera to browser support
2011-08-24 19:55:11 -07:00
Jacob Thornton
fef3672ad3
update copy for browser support
2011-08-21 22:48:01 -07:00
Jacob Thornton
e11c49cc48
Merge branch 'master' of github.com:twitter/bootstrap
...
Conflicts:
bootstrap-1.0.0.css
bootstrap-1.0.0.min.css
docs/index.html
2011-08-21 21:42:56 -07:00
Jacob Thornton
dd92f4e6e2
hide overflow for ie 7
2011-08-21 21:26:15 -07:00
Mark Otto
a98d2cccb8
merge in master, resolve conflicts
2011-08-21 20:47:24 -07:00
Jacob Thornton
48c3c6f1b6
make topbar .fill wrap
2011-08-21 18:14:53 -07:00
Mark Otto
254e70550e
remove 60px top margin on body and tweak a few other things
2011-08-21 17:06:37 -07:00
Jacob Thornton
b18e76f990
introduce .fill class to top-nav for overflow bug
2011-08-21 12:19:01 -07:00
Jacob Thornton
1fc4491cd6
simplify drop down logic - fix color of search hover for ie
2011-08-21 11:22:33 -07:00
Mark Otto
aaf9f752c4
docs spacing, spare divs in a few places, updating css spacing
2011-08-20 23:25:22 -07:00
Mark Otto
72899a4ee8
updated docs to fix inconsistent display of code elements, update scaffolding to fix padding issue on fluid containers, add placeholder hero unit in patterns for future use, continue to refactor some rgba to hex values
2011-08-20 18:58:12 -07:00
Mark Otto
261a473a72
adding more details on browser support, adding snippet of about text, changed p tags to have half the bottom margin
2011-08-20 01:51:06 -07:00
Mark Otto
4a567fcb10
updated docs and docs css to not use rgba colors on the layout modules so IE can see that shiz
2011-08-20 01:11:48 -07:00
Jacob Thornton
f1a6972281
fix drag knob in firefox #7
2011-08-19 20:37:12 -07:00
Mark Otto
5c687ee393
remove ds stores
2011-08-17 22:26:22 -07:00
Jacob Thornton
7f99892b86
change popover stufff
2011-07-28 17:50:38 -07:00
Mark Otto
3117fc979d
getting popovers in
2011-07-01 23:10:39 -07:00
Mark Otto
163e68ade6
resolve merge conflict
2011-07-01 22:16:29 -07:00
Mark Otto
7962b36dae
misc updates to docs and form bug fix
2011-07-01 22:15:16 -07:00
Jacob Thornton
5a7f3f72cb
clean up js a tiny bit
2011-07-01 21:37:12 -07:00
Jacob Thornton
8245a7087e
add twipsies...
2011-07-01 21:30:12 -07:00
Mark Otto
460a84a926
Updated offset columns, fix app.js bug, misc tweaks to copy
2011-06-30 15:56:25 -07:00
Jacob Thornton
6687acc8ec
read application.js
2011-06-30 13:57:29 -07:00
Mark Otto
c53e394f71
changing stacked forms to be lined up left side w/ 20px
2011-06-30 13:51:13 -07:00
Mark Otto
f725d60a76
remove unused images
2011-06-30 13:37:24 -07:00
Mark Otto
bec9449136
Merge branch 'master' of http://git.local.twitter.com/bootstrap
2011-06-30 13:36:51 -07:00
Mark Otto
cde63b98bc
remove unnecessary js lang files from prettify, update styles for prettify
2011-06-30 13:36:47 -07:00
Jacob Thornton
89a05622ab
remove chilllli
2011-06-30 13:22:43 -07:00
Mark Otto
87f9ea00e4
updated docs
2011-06-30 13:17:58 -07:00
Mark Otto
588b2da937
updated docs, fixed language, added copy-code js for selecting text on focus
2011-06-30 10:40:28 -07:00
Mark Otto
6aae3930c9
updated docs styles, notes in header of master file, etc
2011-06-30 10:21:27 -07:00
Mark Otto
ced32d5ceb
adding note in the masthead about less.js and browser support
2011-06-30 00:31:56 -07:00
Mark Otto
9e33ab20ab
clean up commented out css, slightly updated docs again
2011-06-30 00:15:37 -07:00
Mark Otto
1905a992d9
updated docs call to actions for using bootstrap, tweaks to aesthetic
2011-06-29 23:47:54 -07:00
Mark Otto
f47b576574
yo dawg i heard you liked mastheads
2011-06-29 17:10:53 -07:00
Mark Otto
936d7acb31
trying out new doc style stuff
2011-06-29 15:51:27 -07:00
Mark Otto
25d9a2f2b8
update grid bg to 18px baseline, updated docs for disabled buttons
2011-06-28 15:54:25 -07:00
Mark Otto
b11784fec0
adding attribution in footer, link up names, clean up button styles
2011-06-28 15:31:05 -07:00
Mark Otto
4e95e558db
reseting baseline to 18px, fixing wells, moving pre styles for chili to docs
2011-06-28 15:11:41 -07:00
Mark Otto
9660f6f18d
new buttons, new modal updates around spacing and placeholder content
2011-06-28 11:56:49 -07:00
Mark Otto
243fc873d9
mucho updato around buttons to fix some stuff that was introduced with the bootstrap update
2011-06-27 17:15:26 -07:00
Mark Otto
dd769f9a6e
update to use latest version of bootstrap, docs cleanup, etc
2011-06-27 16:47:12 -07:00
Jacob Thornton
15a679e2d1
fancy scroll stuff and tiny js roundup/cleanup
2011-05-05 00:59:16 -07:00
Jacob Thornton
037bf9fec5
clean up org more
2011-05-04 23:49:31 -07:00
Jacob Thornton
96c3e70996
cleanup old stuff
2011-05-03 18:12:43 -07:00