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
d637db1a23
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-29 14:23:06 -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
Chad Moran
2696c6a4bd
Fixed @warningText and @warningBackground colors in docs
2012-01-29 13:20:39 -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
8c763589a2
update text on icons note
2012-01-29 13:09:10 -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
059ff6bcbd
update hero example and examples overview
2012-01-29 02:27:45 -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
5f314dcb85
remove benefits from homepage html
2012-01-28 20:27:18 -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
99ac6ca08e
update components page to include docs for the new navbar collapse feature, re-add responsive.less to downloader
2012-01-28 18:39:36 -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
ab20c921df
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-28 13:30:34 -08:00
Mark Otto
fe6d2f2e1d
fix tabs-below typo
2012-01-28 13:30:15 -08:00
Jacob Thornton
b38a13ef98
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-28 13:17:07 -08:00
Jacob Thornton
6935f693b3
typahead does case insensitive matching with simple sorter + accepts highlighter option
2012-01-28 13:16:05 -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
Mark Otto
d65ce1b64c
updated upgrading page
2012-01-28 01:34:07 -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
18d95a163b
remove fixed width from labels table
2012-01-28 00:34:54 -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
873be0e4f2
drop span2-4 on form examples to 1-3
2012-01-28 00:25:54 -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
08fea7587c
call attention to notices in js docs more
2012-01-27 23:27:33 -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
7cbb586825
move the matcher and sorter into the options - encourage people to override them...
2012-01-27 22:27:06 -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
a624ac1edf
Merge branch '2.0/docs/base/icons' of https://github.com/buraktuyan/bootstrap into buraktuyan-2.0/docs/base/icons
2012-01-27 19:12:09 -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
Burak Tuyan
a2a10ae421
Adding new examples to the icons' docs.
...
- Button with dropdown menu.
- Small info button.
- Text alignment for navigation with no icon.
- Text input form with prepended icon
- Select input form with prepended icon
2012-01-28 02:13:53 +02: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
Jacob Thornton
8a2124faff
only build mustache files
2012-01-27 14:43:41 -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
Pete Hopkins
7b31f4a334
Brings back uneditable input
2012-01-27 16:09:58 -05: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
Mark Otto
97546adc90
Merge branch 'ie_7_base' of https://github.com/phopkins/bootstrap into phopkins-ie_7_base
2012-01-27 09:40:04 -08:00
Mark Otto
e44a7dd4ff
buttons for toggle links in js docs, code example for offsetting in grid
2012-01-27 09:36:49 -08: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
576ae2f561
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-26 19:10:32 -08:00
Mark Otto
a4a8ea2328
flip order of content on home page
2012-01-26 19:09:59 -08:00
Marco Wise
6886022fe6
fix typo in docs/scaffolding.html
2012-01-26 18:10:36 -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
c31ac846d7
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-26 16:12:51 -08:00
Jacob Thornton
d531f72645
some js for javascript for builder (stil incomplete)
2012-01-26 16:12:34 -08:00
Mark Otto
b260544de0
fix links to apple touch icons
2012-01-26 15:54:04 -08:00
Mark Otto
f398926e46
move down background iamge
2012-01-26 15:22:52 -08:00
Mark Otto
945870d778
small text change on downloads page
2012-01-26 14:54:24 -08:00
Mark Otto
8a6be6601d
make accordion links block level
2012-01-26 14:40:19 -08:00
Mark Otto
43c8f41895
add values to inputs for grid variables on download page
2012-01-26 14:40:09 -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
358e3a53f7
Merge branch 'phopkins-ie_buttons' into 2.0-wip
2012-01-26 11:10:16 -08:00
Mark Otto
edef89f30e
move around some comments in buttons.less, update labels to use correct variables, add snippet to docs about IE9
2012-01-26 11:10:07 -08:00
Mark Otto
b8c1950cbf
change label fo first subnav link on js docs
2012-01-26 10:43:08 -08:00
Mark Otto
34488a4500
fix tabs example on js docs page
2012-01-26 10:39:07 -08:00
Mark Otto
5d465fab4c
Merge branch 'ie_buttons' of https://github.com/phopkins/bootstrap into phopkins-ie_buttons
2012-01-26 10:12:50 -08:00
Mark Otto
ef4d0dd7db
space out masthead a git more
2012-01-26 10:12:25 -08:00
Pete Hopkins
29f0e4c28b
Removes filters as a way to provide gradients for IE<=9
...
- Lets us use rounded corners in IE9
- Makes hover / active states work correctly in IE<=9
Only change for non-IE is that moving from hover -> not hovering
no longer animates (was a subtle blend) due to mismatch between the
bottom of the gradient and the background color.
Refactor: moves the primary button background to match the others.
2012-01-26 13:07:52 -05: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
106625a2ec
fix small icons on homepage
2012-01-26 00:36:40 -08:00
Mark Otto
94ea3b62f0
fix forms examples and allow for inputs in labels
2012-01-25 21:28:24 -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
b6b7d1343b
finish the rest of the less page mixins docs
2012-01-25 15:03:44 -08:00
Mark Otto
7d83f45ebb
start filling out mixins tables
2012-01-25 14:08:51 -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
9c4a70c597
swap fieldsets for divs
2012-01-25 12:43:38 -08:00
Mark Otto
58d08a2db3
enable support for form states on select elements
2012-01-25 11:35:08 -08:00
Mark Otto
a4b8cc2a9c
darken active state on subnav with scrollspy added
2012-01-25 11:30:30 -08:00
Mark Otto
e24bd40b4a
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
2012-01-25 11:27:29 -08:00
Mark Otto
b851156863
change form fields back to inline-block to allow for inline-help text in default form markup
2012-01-25 11:26:45 -08:00
Jacob Thornton
25519bacd5
rebuild + add spy to template
2012-01-25 11:25:35 -08:00
Mark Otto
fd3c6733a2
missing icon class in code example
2012-01-25 11:11:22 -08:00
Mark Otto
e49e49ff95
fix mention of old vertical forms class'
2012-01-25 10:51:26 -08:00
Mark Otto
97bad784b5
update remaining icons in docs
2012-01-25 10:50:08 -08:00
Mark Otto
324ebb5990
spec'ed out an examples overview page with links to current examples; examples still need work themselves though
2012-01-25 10:47:08 -08:00
Mark Otto
1fa3eab20c
fix location of favicon
2012-01-25 10:19:29 -08:00
Mark Otto
9553b1e3e9
update docs to include separate responsive css, update docs to highlight proper file name, updated makefile to build responsive separately
2012-01-25 10:02:52 -08:00
Mark Otto
c381199968
fix media queries in scaffolding
2012-01-25 09:57:40 -08:00
Mark Otto
29b4ba0fc5
fix modal examples on js page, update modal close button positioning
2012-01-25 09:53:53 -08:00
Mark Otto
b01de5fc56
updated icons to require a base class .icon
2012-01-25 09:51:03 -08:00
Mark Otto
de4ada3b88
spec out all mixins on less page
2012-01-25 01:45:15 -08:00
Mark Otto
bd36e2a163
remove checkboxes from js docs page overview, they'll be on the download page instead
2012-01-25 01:25:15 -08:00
Mark Otto
f4f7296fa8
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/less.html
docs/templates/pages/less.mustache
2012-01-25 01:23:50 -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
c5103d0ad1
Merge pull request #1181 from jwieland/updatelessdoc
...
Minor doc changes about less.js version
2012-01-25 00:41:05 -08:00
Jason Wieland
64f85e0371
caught another old reference to 1.1.3
2012-01-25 00:02:37 -08:00
Mark Otto
b0fb31be5e
fix js link on chop shop
2012-01-24 23:45:48 -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
Jason Wieland
6be91368c0
minor doc updates to inform user they need the current less.js 1.2.1 or they will be hit by this bug #952
2012-01-24 23:24:46 -08:00
Jacob Thornton
5d3175e84b
fix sub navs fer the otherrzz
2012-01-24 22:48:30 -08:00
Jacob Thornton
5a54a98925
subnav spy scrolls blaawerh
2012-01-24 22:37:35 -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
aa59f123c0
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-24 20:30:39 -08:00
Mark Otto
731821b78f
updated docs css to fix subnav on iOS
2012-01-24 20:26:54 -08:00
Mark Otto
8ce9b3a676
Merge pull request #1175 from Xaro/2.0-wip
...
Typo in pre type section
2012-01-24 20:16:33 -08:00
Roberto Poo
74b5dc8d3b
Fixed typo
2012-01-25 02:06:50 -02:00
Mark Otto
c6d5dcd872
remove link from transitions on js page
2012-01-24 19:50:18 -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
f70895a605
remove rogue html elements
2012-01-24 19:01:38 -08:00
Mark Otto
8804860898
fix typo on js docs
2012-01-24 18:45:23 -08:00
Mark Otto
d362223535
refine fixed docs bar
2012-01-24 18:29:17 -08:00
Mark Otto
9ef4171d03
lighten alert on less page
2012-01-24 18:26:45 -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
40e92221a6
revamp alert message and error state color/text/bg to be variables
2012-01-24 16:54:35 -08:00
Mark Otto
b9bd5c65e7
fix mailto link
2012-01-24 16:18:12 -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
Jacob Thornton
655a96869c
typo with i18n
2012-01-24 15:51:28 -08:00
Jacob Thornton
3a840075dd
rebuild
2012-01-24 15:42:16 -08:00
Jacob Thornton
4c5497bfcc
Merge pull request #1158 from pokonski/wrap-stuff
...
Wrap stuff in components.mustache
2012-01-24 15:03:30 -08:00
Piotrek Okoński
ef869776e5
Wrap stuff in components.mustache
2012-01-25 00:00:35 +01:00
Jacob Thornton
5f209ed810
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/templates/pages/index.mustache
2012-01-24 14:33:52 -08:00
Jacob Thornton
fbc1ab14cc
Merge branch '2.0-wip' of https://github.com/MGaetan89/bootstrap into 2.0-wip
...
Conflicts:
docs/templates/pages/index.mustache
2012-01-24 14:31:10 -08:00
Mark Otto
58f7fd308a
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/templates/pages/index.mustache
2012-01-24 14:28:14 -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
Gaëtan Muller
fea1dc906e
i18n for index page
2012-01-24 23:23:43 +01:00
Jacob Thornton
a800d6ceac
i18n index
2012-01-24 14:22:02 -08:00
Jacob Thornton
f4543ecb19
add i18n to upgrading
2012-01-24 14:14:01 -08:00
Jacob Thornton
f03e170054
scaffolding i18n
2012-01-24 14:08:03 -08:00
Jacob Thornton
72117c3f97
add i18n for less.mustache
2012-01-24 13:57:44 -08:00
Jacob Thornton
3aea86370d
rebuild base-css
2012-01-24 13:48:05 -08:00
Jacob Thornton
9e7f4ebd77
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-24 13:47:41 -08:00
Jacob Thornton
7d52e1dcd4
remake
2012-01-24 13:47:24 -08:00
Jacob Thornton
b0a351d8f7
Merge pull request #1153 from MGaetan89/2.0-wip
...
#1122 - i18n in Base CSS documentation
2012-01-24 13:43:13 -08:00
Gaëtan Muller
425e5bfb71
Final translation tags in Base CSS
2012-01-24 22:17:32 +01:00
François Robichet
5fb31670af
Added jquery.tablesorter js file
2012-01-24 22:12:37 +01:00
François Robichet
925fef4110
Typo on tablesorter
2012-01-24 22:11:09 +01:00
François Robichet
540d229eba
Fixed a mailto typo
2012-01-24 21:57:30 +01:00
Gaëtan Muller
a9c6dca094
More translation tags in Base CSS
2012-01-24 21:45:42 +01:00
Gaëtan Muller
bc9c89f157
Start adding tag for Base CSS translation
2012-01-24 21:29:55 +01:00
Jacob Thornton
b5503c4c28
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-24 12:11:26 -08:00
Jacob Thornton
222067b360
javascript pages markedup with {{_i}}
2012-01-24 12:11:05 -08:00
Mark Otto
72861dfbf2
Merge branch 'apostrophe-grammar' of https://github.com/phopkins/bootstrap into phopkins-apostrophe-grammar
2012-01-24 10:45:51 -08:00
Pete Hopkins
04efc8d0a8
Fixes apostrophe in less.html
2012-01-24 12:52:06 -05:00
Pete Hopkins
37b38fe2a0
Spelling and typos in components.html and javascript.html
2012-01-24 12:49:30 -05:00
Pete Hopkins
91b32f4783
Fixes apostrophe usage in base-css.html
2012-01-24 12:12:35 -05:00
Christian Nennemann
774d8d8d17
Fix typo in docs/index.html
2012-01-24 14:46:44 +01:00
Jacob Thornton
16440eea92
move translation tag for bootstrap
2012-01-23 19:59:05 -08:00
Jacob Thornton
82de03b67c
start wrapping text in {{_i}} for translation
2012-01-23 19:55:00 -08: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
Mark Otto
a7bf0295fb
remove dropdowns, add in sub nav instead
2012-01-23 11:55:04 -08:00
Jacob Thornton
dc5bedda14
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-22 20:03:17 -08:00
Jacob Thornton
155b72e873
share -> share-alt
2012-01-22 20:02:56 -08:00
Jacob Thornton
87c676335c
Merge pull request #1053 from scottwater/patch-1
...
Added missing 'data-dismiss="modal"' on the first example model source.
2012-01-22 19:38:48 -08:00
Olivier Laviale
0523c053a7
Fixed typo
2012-01-22 21:45:20 +01:00
Chris Gunther
c3625ebb23
Move placement of ID in docs example for dropdowns
...
The ID specified by an href or data-target attribute should match the
li.dropdown, not the ul.dropdown-menu
2012-01-22 11:46:44 -05:00
Jacob Thornton
373a54187e
add ability to cycle carousel to a particular frame
2012-01-21 23:02:29 -08:00
Jacob Thornton
d3817cf466
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-21 21:35:53 -08:00
Jacob Thornton
2187e0838f
change scrollspy offset to be option + fix typo in scrollspy
2012-01-21 21:35:20 -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
Scott Watermasysk
9c94078415
Added missing 'data-dismiss="modal"' on the first example model source.
2012-01-18 14:53:59 -05:00
Mark Otto
8c1a908754
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-17 23:39:28 -08:00
Mark Otto
47b8184bbb
scope table styles to a class, .table, instead of on the generic element as a smarter default
2012-01-17 23:39:18 -08:00
Mark Otto
51f5b7b8af
cleanup accordion css and add comments
2012-01-17 23:24:59 -08:00
Mark Otto
4f12627604
Merge pull request #1042 from boberkfell/2.0-wip
...
2.0 wip Small typo fix in docs
2012-01-17 23:21:52 -08:00
Mark Otto
41a410b8e6
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
bootstrap.min.css
docs/javascript.html
lib/accordion.less
2012-01-17 23:19:21 -08:00
Ben Oberkfell
4d098a7f8e
typo fix in component docs
2012-01-18 00:37:24 -06:00
Mark Otto
f1a88eede3
fix js link in docs nav, restyle accordion with new css
2012-01-16 17:27:30 -08:00
Jacob Thornton
810bba97a4
make accordions little bit smoother
2012-01-15 21:48:58 -08:00
Jon Stevens
b4dd2b9a10
fix typo
2012-01-15 19:38:30 -08:00
Mark Otto
f48278dac6
updated accordion and carousel; accordion still needs work
2012-01-15 18:40:17 -08:00
Mark Otto
c02501e1b7
move carousel to separate stylesheet, update popovers to fix ie7 bug, fix pagination, fix alerts
2012-01-15 16:27:36 -08:00
Mark Otto
3d9298b04b
fix the js alerts examples
2012-01-15 15:06:30 -08:00
Mark Otto
127c0d0b52
make dl and child elements less specific
2012-01-15 13:12:29 -08:00
Mark Otto
fe160261e4
normalize the alert classes to match last night's flip for form and table classes
2012-01-15 11:30:24 -08:00
Mark Otto
1385540d0a
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-15 11:26:21 -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
Paul Kauders
ed9903f797
Fix typo in Responsive design content
2012-01-15 07:46:25 -06: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
6d916763f8
adding the pager component after rewriting the pagination docs and css
2012-01-14 20:54:37 -08:00
Mark Otto
1c6048bac2
restore top bar on home page
2012-01-14 19:17:48 -08:00
Mark Otto
2c3365f99e
allow btn-groups to work in navbars
2012-01-14 17:16:46 -08:00
Mark Otto
74c0fc17c8
fix duplicate icons
2012-01-14 16:56:47 -08:00
Mark Otto
7455dd6b45
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-14 16:18:39 -08:00
Mark Otto
f587e81b7d
rewrite alert messages to use less code, combine the look of default and block messages, simplify docs
2012-01-14 16:18:15 -08:00
Chris Gunther
ec7f8917b1
add Progress Bars to Components narbar dropdown
2012-01-14 15:24:35 -05:00
Chris Gunther
1f54ff91b2
fix section ID for thumbnails
2012-01-14 15:21:57 -05:00
Chris Gunther
b723db1e42
fix section ID for pagination
2012-01-14 15:21:09 -05:00
Chris Gunther
f82fb2a197
fix navbar links to base CSS > typography
2012-01-14 15:18:59 -05:00
Chris Gunther
a4b107bf87
fix navbar links to scaffolding > grid system
2012-01-14 15:15:24 -05:00
Mark Otto
fc053ac8b2
update dropdowns spacing and docs section spacing
2012-01-13 10:07:56 -08:00