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
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