Comparar commits

...

6905 Commits

Autor SHA1 Mensagem Data
Mark Otto a365d8689c grunt 2014-02-13 09:24:59 -08:00
Mark Otto 385fb68981 grunt 2014-02-13 08:59:03 -08:00
Mark Otto 461404f6be update homepage showcase with three new posts 2014-02-13 01:21:35 -08:00
Mark Otto 88fdd45427 v3.1.1 bump 2014-02-13 01:12:26 -08:00
XhmikosR d8cfcad7c7 Merge pull request #12710 from ZDroid/customize-multistr
Fix multistr errors in customizer.js
2014-02-13 08:53:47 +02:00
Chris Rebert e879127e31 Merge pull request #12711 from ZDroid/scrollspy-typo
Fix scrollspy typo in docs.css
2014-02-12 12:04:42 -08:00
Zlatan Vasović f3735d5b12 Fix scrollspy typo in docs.css 2014-02-12 21:01:37 +01:00
Zlatan Vasović fe2222e733 Fix multistr errors in customizer.js 2014-02-12 20:54:43 +01:00
Chris Rebert 32a8716d5c Merge pull request #12709 from twbs/bs-to-example-prefix
Use .bs-example-* instead of .bs-* in examples in docs
2014-02-12 11:29:42 -08:00
XhmikosR 55e6d4b9b5 Remove trailing space. 2014-02-12 21:27:31 +02:00
Chris Rebert f6d029f6ab Use .bs-example-* instead of .bs-* in examples in docs
Refs #12610
2014-02-12 11:13:54 -08:00
Chris Rebert dff122f7f0 avoid using .bs-* in example, & improve style 2014-02-12 11:07:04 -08:00
Chris Rebert 40142bdc51 fix #12708 by updating class names in the docs JS 2014-02-12 11:02:56 -08:00
XhmikosR 5796b56d96 Switch to the minified JSZip. 2014-02-12 20:50:47 +02:00
Mark Otto eb20d6f132 Fixes #11659, #12698, and #12349: Always apply position and z-index form controls in input groups for proper borders 2014-02-11 14:20:01 -08:00
Chris Rebert 24bf439880 Merge pull request #12696 from twbs/rm-browserstack
rm BrowserStack testing from build
2014-02-11 10:38:39 -08:00
Chris Rebert 1e1f510294 rm BrowserStack testing from build 2014-02-11 10:11:38 -08:00
Mark Otto e49c7758aa Merge pull request #12695 from martikaljuve/offcanvas-transition
Fixed transitions on offcanvas example by adding initial left and right properties
2014-02-11 09:57:15 -08:00
Mark Otto 8551f42ae2 Merge branch 'master' into pr/12412
Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	test-infra/npm-shrinkwrap.canonical.json
2014-02-11 09:50:40 -08:00
Marti Kaljuve 6d232c2b9b Add initial right and left properties to offcanvas example for transitions. 2014-02-11 18:18:21 +02:00
Mark Otto 2cef0af211 Merge branch 'master' of github.com:twbs/bootstrap 2014-02-11 00:05:34 -08:00
Chris Rebert 020ea27d28 Merge pull request #12689 from ZDroid/fonts-x
Remove execute permission on font files
2014-02-10 23:04:21 -08:00
Zlatan Vasović fe811b8906 Remove execute permission on font files 2014-02-11 07:57:31 +01:00
Mark Otto 6f0059c527 add version to getting started page 2014-02-10 22:12:28 -08:00
Mark Otto 38ebf57af5 grunt 2014-02-10 21:41:14 -08:00
Mark Otto 728067b586 Update Glyphicons 2014-02-10 21:28:05 -08:00
Mark Otto b4ba964801 Merge pull request #12673 from tlindig/tl_popover_arrow_size
use @popover-arrow-width for offset the popover
2014-02-10 20:52:43 -08:00
Mark Otto 3350c73666 http://www.youtube.com/watch?v=YQwYNca4iog 2014-02-10 20:52:20 -08:00
Mark Otto 9427310a09 Fixes #12674
* The problem with #12674 is that it reassigns the same variable, but the color values were purposely different.
* This uses Less's color functions to generate the proper darker colors.
* Why darker colors? Because those CSS carets render lighter than their solid border counterparts. Consider it a design hack.
2014-02-10 20:49:17 -08:00
Mark Otto 4973bfd5d7 Fixes #12685: Display current version under download button on homepage 2014-02-10 20:23:29 -08:00
Mark Otto 67c4deb584 Merge pull request #12665 from twbs/docs_teams
Update teams
2014-02-10 19:19:52 -08:00
Chris Rebert 4027594647 Merge pull request #12680 from twbs/googlechrome
chrome => googlechrome in Sauce
2014-02-10 12:40:51 -08:00
Chris Rebert 2bc29b4581 chrome => googlechrome in Sauce; fixes #12647 2014-02-10 12:11:10 -08:00
Zlatan Vasović ba4206b644 Use different coding style for Gruntfile
Fixes #12657
2014-02-10 11:15:08 -08:00
Chris Rebert 9afead3fb0 fix indentation in Gruntfile 2014-02-10 11:09:59 -08:00
Chris Rebert 77eaa808db tweak phrasing for hopefully greater clarity 2014-02-10 10:12:28 -08:00
Chris Rebert dc79fecacd add copyright header to shrinkwrap.js; fixes #12643 2014-02-10 10:06:33 -08:00
Tobias Lindig 221ac861e4 use @popover-arrow-width for offset the popover to account for the popover arrow 2014-02-10 10:57:11 +01:00
Julian Thilo 535cd57537 Merge pull request #12671 from Quy/master
Update docs prefixing
2014-02-09 22:04:01 +01:00
Quy Ton 477cf1396d Update docs prefixing 2014-02-09 12:41:47 -08:00
Julian Thilo d5f0ccba2b Merge pull request #12668 from Quy/master
Reorder links
2014-02-09 19:50:54 +01:00
Quy Ton 8dab75d408 Reorder links 2014-02-09 09:18:11 -08:00
Mark Otto 0d49920e0d Fixes #12610: Better and more consistent prefixing of docs CSS with .bs-docs- 2014-02-08 23:24:38 -08:00
Mark Otto 95308509b3 i'm an idiot 2014-02-08 22:46:25 -08:00
Mark Otto bcf5d88844 Update teams to remove two Sass folks and add new Core member 2014-02-08 22:13:29 -08:00
Mark Otto 769339ed18 grunt dist 2014-02-08 17:30:40 -08:00
Mark Otto 41841c99c4 Merge branch 'master' of github.com:twbs/bootstrap 2014-02-08 17:29:25 -08:00
Mark Otto 44bb7b20c7 Fixes #12625: Only remove first list group item's top and last list group item's bottom borders when the list group is first or last 2014-02-08 17:29:10 -08:00
Mark Otto 13b4e7a1a8 Mention limitation of form validation feedback icons with input groups 2014-02-08 17:19:45 -08:00
Mark Otto 2365717a3d Merge pull request #12433 from tagliala/list-inline-first-element-fix
Fix first element padding of list-inline
2014-02-08 16:59:59 -08:00
Mark Otto 65b10706b3 brace position 2014-02-08 16:56:59 -08:00
Mark Otto e9199718d6 Merge branch 'master' into fix-12154
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-02-08 16:52:22 -08:00
Mark Otto b36d19c3c6 grunt 2014-02-08 16:46:12 -08:00
Mark Otto 7f88009394 grunt 2014-02-08 16:43:58 -08:00
Mark Otto 3fc7a4cffa grunt with new mixins 2014-02-08 16:31:42 -08:00
Mark Otto 26e2d7cdc9 grunt 2014-02-08 16:13:30 -08:00
Mark Otto b6444c6472 Merge pull request #12552 from stoudenmire/carousel-icon-classname-fix
Fixes two typos in carousel.less
2014-02-08 16:03:25 -08:00
Mark Otto e3cfd5821d Merge branch 'master' into pr/12462
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-02-08 16:01:56 -08:00
Mark Otto 842af44fcc Merge branch 'pr/12579' 2014-02-08 15:53:18 -08:00
Mark Otto 866c52b928 grunt 2014-02-08 15:51:38 -08:00
XhmikosR 5d8491ac9f Merge pull request #12655 from twbs/holder.js
Update holder.js to v2.3.1.
2014-02-09 01:48:13 +02:00
Mark Otto 06e6affa4a Merge pull request #12645 from ZDroid/docs-js-semicolons
Omit semicolons consistently in docs
2014-02-08 15:46:51 -08:00
Mark Otto b683433f67 grunt 2014-02-08 15:44:13 -08:00
Mark Otto c8315edd73 Merge branch 'master' into pr/12639
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-02-08 15:37:35 -08:00
Mark Otto 91b76e5247 Merge pull request #12659 from ZDroid/blockquote-font-size
Fix #12656: add @blockquote-font-size
2014-02-08 15:24:43 -08:00
Chris Rebert 7ef1bebb55 Merge pull request #12632 from ZDroid/exclude-jade
Exclude jade files from docs
2014-02-08 13:34:36 -08:00
Zlatan Vasović 938779ca93 Move jade files to docs/jade/ 2014-02-08 22:29:06 +01:00
Zlatan Vasović 4c16360036 Fix #12656: add @blockquote-font-size 2014-02-08 22:12:18 +01:00
XhmikosR c3cb63b69f Update holder.js to v2.3.1.
Fix #12653.
2014-02-08 18:19:39 +02:00
Chris Rebert 8f7170abd0 disable BrowserStack tests due to flakiness
Running "browserstack_runner" task
Using config: /home/travis/build/twbs/bootstrap/browserstack.json
Launching server on port: 8888
Downloading tunnel jar to `/home/travis/build/twbs/bootstrap/node_modules/browserstack-runner/lib/BrowserStackTunnel.jar`
Launching tunnel
Error: Invalid or corrupt jarfile /home/travis/build/twbs/bootstrap/node_modules/browserstack-runner/lib/BrowserStackTunnel.jar
[Runner alert] Tunnel launch timeout
Exiting
Non existent tunnel
2014-02-07 18:51:32 -08:00
Mark Otto c3f8456414 Merge pull request #12633 from twbs/panels_and_tables
Properly reset borders on table cells in panels
2014-02-07 18:50:41 -08:00
Mark Otto 06f1293acf Merge branch 'master' into panels_and_tables
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-02-07 18:36:27 -08:00
Mark Otto a2f08158d0 Nuke shit I added in 4d7b2ddba9 that shouldn't come until v4 2014-02-07 15:44:50 -08:00
Julian Thilo b61d12ff17 Fix wrong id 2014-02-07 23:21:32 +01:00
Chris Rebert f07423511d Merge pull request #12648 from ZDroid/index.html-only
Replace wildcard with file name
2014-02-07 12:44:51 -08:00
Zlatan Vasović 54aece3458 Replace wildcard with file name 2014-02-07 20:48:12 +01:00
Zlatan Vasović bdf9ce4c45 Omit semicolons consistently in docs 2014-02-07 19:31:08 +01:00
Chris Rebert 532f1d9097 Merge pull request #12636 from ZDroid/grunt-jshintrc
Avoid setting `jshint node: true` in every Grunt JS file
2014-02-07 09:36:39 -08:00
Chris Rebert 442043e775 Merge pull request #12637 from ZDroid/text-truncate-typo
Fix .text-truncate() typo
2014-02-07 09:28:08 -08:00
Bas Bosman a0052b5a37 Drop -o-user-select 2014-02-07 14:14:32 +01:00
Zlatan Vasović 6db1a3f909 Fix .text-truncate() typo 2014-02-07 13:40:32 +01:00
Zlatan Vasović aead10fafa Avoid setting jshint node: true in every Grunt JS file 2014-02-07 13:34:17 +01:00
Mark Otto 4d7b2ddba9 Fixes #12486: Restore full width inputs for input groups in inline forms and navbars 2014-02-07 02:58:10 -08:00
Mark Otto cae76171d0 Follow up to 1bdd59b18c2d1b2409d0422a60e8c007053202df, to better position the sidebar so the potential scrollbar doesn't get hidden by the navbar 2014-02-07 02:44:04 -08:00
Mark Otto d91d9b0ade Fixes #12447: Properly reset borders on table cells in panels 2014-02-07 02:38:01 -08:00
Mark Otto 3ccc16cad0 grunt for days 2014-02-07 02:24:37 -08:00
Mark Otto 6814393c9a Merge pull request #12629 from twbs/search_inputs_ios
Override iOS search input's extra round corners
2014-02-07 02:13:39 -08:00
Mark Otto da43f97be1 Override iOS search input's extra round corners 2014-02-07 02:08:32 -08:00
Mark Otto c399bfb015 Fixes #12477: Clarify IE support in docs 2014-02-07 01:49:12 -08:00
Mark Otto a9b964b9c3 Merge branch 'master' of github.com:twbs/bootstrap 2014-02-07 01:41:46 -08:00
Mark Otto 2865fde67f Fixes #12590: Add Korean translation link 2014-02-07 01:41:04 -08:00
Mark Otto b4aaf04b3f Merge pull request #12319 from twbs/address-12007
Clarify target of dropdown events
2014-02-07 01:39:00 -08:00
Mark Otto 16bbcd7aff clarify comment 2014-02-07 01:33:27 -08:00
Mark Otto 4f9cdefab7 consistency 2014-02-07 01:31:42 -08:00
Mark Otto f83b201007 Fixes #12526: Add scrollbars when necessary to the Dashboard example's sidebar 2014-02-07 01:27:07 -08:00
Mark Otto 228d4e59fc Fixes #12555: Rearrange variables to place grids and containers closer 2014-02-07 01:22:30 -08:00
Mark Otto 3b4b9a7fe5 Fixes #12614: Add progress bar example with visible label 2014-02-07 01:16:34 -08:00
Mark Otto ebd132ce68 Fixes #12611: Mention limitation of one plugin's data attributes per element 2014-02-07 01:10:21 -08:00
Mark Otto 77d160151f Merge pull request #12497 from twbs/container-fluid-is-now-a-thing
rm DIY full-width callout now that there's .container-fluid
2014-02-07 00:48:25 -08:00
Mark Otto 91595d38f3 property order because @zdroid <3 2014-02-06 19:34:46 -08:00
Mark Otto b124c4a6a4 Merge pull request #12620 from twbs/thumbnail-extend
use :extend in thumbnail Less
2014-02-06 19:32:31 -08:00
Mark Otto 42d7479dbf Merge pull request #12502 from ZDroid/moz
Remove redundant :-moz-placeholder styles
2014-02-06 19:31:29 -08:00
Mark Otto ace0abfdb6 Merge branch 'master' into thumbnail-extend
Conflicts:
	dist/css/bootstrap.css
2014-02-06 18:52:03 -08:00
Mark Otto 596495c89b Merge pull request #12621 from twbs/carousel-img-responsive-extend
use :extend(.img-responsive) in Carousel's Less
2014-02-06 18:49:21 -08:00
Chris Rebert 7c1511502e use :extend(.img-responsive) in Carousel's Less 2014-02-06 15:52:26 -08:00
Chris Rebert fda8d91c86 use :extend in thumbnail Less 2014-02-06 15:42:54 -08:00
Chris Rebert 651b289e26 Merge pull request #12613 from twbs/sized-btn-group-extend
use Less' extend feature in btn-group-lg etc.
2014-02-06 15:12:14 -08:00
XhmikosR ef25676f6f Merge pull request #12616 from twbs/jszip
Update jzip to v2.1.0.
2014-02-06 23:35:15 +02:00
XhmikosR 5769b776e5 bs-raw-files-generator.js: use the global directive to define the btoa variable. 2014-02-06 23:34:02 +02:00
XhmikosR aae64a9eba Update jzip to v2.1.0. 2014-02-06 23:10:37 +02:00
XhmikosR 119ed54bd1 Merge pull request #12605 from ZDroid/license-object
Use license object instead of licenses array
2014-02-06 21:04:36 +02:00
Chris Rebert 37c21a3ac7 use Less' extend feature in btn-group-lg etc. 2014-02-06 10:59:04 -08:00
Chris Rebert 87219cfeca Merge pull request #12612 from ZDroid/grunt-path
Update grunt paths
2014-02-06 10:42:01 -08:00
Zlatan Vasović 9bb5c319b8 Update grunt paths 2014-02-06 19:39:45 +01:00
Zlatan Vasović 96fd2dca02 Use license object instead of licenses array 2014-02-06 11:37:39 +01:00
Supergibbs 08ff305ed7 Added border radiuses to table when in a panel. Fixes #12461 2014-02-05 14:29:23 -08:00
Mark Otto 7eb532262f Merge pull request #12465 from XhmikosR/docs-img
Docs: losslessly compress images.
2014-02-05 14:11:46 -08:00
Mark Otto 81d9a46dcd Merge pull request #12534 from Techwraith/patch-1
Allow the bootstrap package in npm to expose css and less
2014-02-05 13:54:53 -08:00
Mark Otto f16a2376c1 add basic back to top link to docs sidenavs, fixes #12589 2014-02-05 13:46:24 -08:00
Chris Rebert 7861f6e8a5 possibly avoid some extra S3 charges
Refs https://github.com/boto/boto/issues/2078
2014-02-05 10:45:05 -08:00
Mark Otto 00cb50a41a grunt dist--includes changes from #12025 and decimal changes, likely from a change in dependencies 2014-02-04 19:27:25 -08:00
Mark Otto 45e65eef3d Merge pull request #12025 from ZDroid/clean-visibility-mess
Fix #12015 and minify styles
2014-02-04 18:29:05 -08:00
Mark Otto 28f5f6ecf3 Merge pull request #12512 from ZDroid/placeholder-img-fix
Improve alignment of the dashboard placeholder images
2014-02-04 16:21:23 -08:00
Chris Rebert cc9242aa86 Merge pull request #12583 from twbs/grunt-directory
reorganize all grunt tasks into one directory
2014-02-04 15:33:58 -08:00
Chris Rebert cd8a896ce6 Merge pull request #12554 from ZDroid/grunt-test-note
Add `grunt test` note
2014-02-04 13:21:45 -08:00
Chris Rebert 46f9d27142 reorganize all grunt tasks into one directory
also fixes #12581
2014-02-04 13:18:54 -08:00
Zlatan Vasović 0ed6075010 Add grunt test note 2014-02-04 22:06:15 +01:00
Panayiotis Lipiridis 40e1a3bd9f Sticky footers without any wrappers 2014-02-04 13:56:42 +01:00
Mark Otto ef3c560a06 Reorder grunt dist tasks to ensure JS gets copied over 2014-02-04 02:04:23 -08:00
Mark Otto 1387784d60 Merge branch 'master' of github.com:twbs/bootstrap 2014-02-04 02:01:45 -08:00
Mark Otto 07098d1bb7 Fixes #12470: Scope large modal styles to minimum viewport width 2014-02-04 02:01:31 -08:00
Chris Rebert 91f941929e Merge pull request #12574 from twbs/os-x-chrome-busted
disable OS X Chrome in Selenium tests to fix the build
2014-02-04 01:58:40 -08:00
Chris Rebert b16efebc8e disable OS X Chrome in Selenium tests to fix the build 2014-02-04 01:51:40 -08:00
Mark Otto 95494f806d Merge pull request #12521 from twbs/outline-none-note
add note to CONTRIBUTING.md about `outline: none`
2014-02-04 01:49:29 -08:00
XhmikosR 2deb5f9f91 Compress examples screenshots with kraken.io.
Before: 1,12 MB (1.174.728 bytes)
After:  1,11 MB (1.173.614 bytes)
2014-02-04 11:33:28 +02:00
XhmikosR 7dd51beb42 Docs: losslessly compress images.
Before: 25,1 KB (25.773 bytes)
After:  23,7 KB (24.352 bytes)
2014-02-04 11:33:28 +02:00
Mark Otto 952afba70d Merge pull request #12570 from XhmikosR/libs
Update docs libs
2014-02-04 01:23:16 -08:00
Mark Otto d158e822a1 Merge pull request #12572 from XhmikosR/master
Gruntfile.js: Move common uglify properties together.
2014-02-04 01:22:29 -08:00
XhmikosR aeed64d1cb Gruntfile.js: Move common uglify properties together. 2014-02-04 11:14:20 +02:00
XhmikosR ec050fa0ab Update less.js to v1.6.2. 2014-02-04 11:11:40 +02:00
XhmikosR 2576fecf95 Update jszip to the latest git (https://github.com/Stuk/jszip/commit/202003821ddd1b5295ddec23ed8e421464bc0c44). 2014-02-04 11:08:12 +02:00
XhmikosR 389e574aaa Update Filesaver.js to the latest git (2014-01-24). 2014-02-04 11:08:12 +02:00
Chris Rebert 9cf9f6c099 Merge pull request #12499 from twbs/move-responsive-imgs-sect
move .img-responsive docs from Overview to Images section
2014-02-04 01:00:32 -08:00
Mark Otto 9a01aa2c44 Merge pull request #12568 from XhmikosR/examples-csscomb
Add examples in csscomb
2014-02-04 00:55:54 -08:00
XhmikosR 3ab2324df0 Remove double semicolon. 2014-02-04 10:39:02 +02:00
XhmikosR 9f668a5573 Add examples/**/*.css in csscomb task. 2014-02-04 10:39:02 +02:00
Mark Otto 9ba49426e9 Merge pull request #12466 from XhmikosR/12457
Add examples/css in the csslint task.
2014-02-04 00:27:12 -08:00
Mark Otto ec6c9d2824 Don't offset customizer alert, grunt dist 2014-02-04 00:18:34 -08:00
Mark Otto 229bc6fef9 Merge pull request #12553 from ZDroid/nocf
Remove comma first rule
2014-02-03 23:48:39 -08:00
Mark Otto 266a2e11e0 Merge pull request #12533 from 1000hz/tighten-popover-arrows-scope
Scope popover arrow css to direct descendant
2014-02-03 23:40:52 -08:00
Chris Rebert 819b19e39c fix #12494 in the migration docs 2014-02-03 23:05:51 -08:00
XhmikosR 48118576f1 Examples: fix csslint errors. 2014-02-04 09:04:40 +02:00
XhmikosR 3a89fbc9a3 Add examples/**/*css in the csslint task.
Fixes #12457.
2014-02-04 09:04:40 +02:00
Chris Rebert 8ee208e9c1 fix #12566 2014-02-03 12:19:50 -08:00
Chris Rebert 149c4be726 die tabs, die! 2014-02-03 10:02:58 -08:00
Zlatan Vasović 0ef0c7b2c0 Remove comma first rule
Removes outdated coding style rule.
2014-02-03 17:12:59 +01:00
stoudenmire a484b3bd7a fixed two typos in carousel.less
carousel.less has two typos in glyphicon classnames. fixed them.
2014-02-03 16:24:07 +01:00
Chris Rebert d675284cf6 Safari's justified nav bug is still present as of Safari v7.0.1; fixes #12454 2014-02-03 02:38:18 -08:00
Chris Rebert e5665c2417 Merge pull request #12546 from twbs/modal-hiding-now-implicit
Mention .modal.fade.hide => .modal.fade in migration docs
2014-02-03 02:13:16 -08:00
Chris Rebert e958008048 fix #12541 2014-02-03 02:11:25 -08:00
Chris Rebert d8bb6c2987 Merge pull request #12545 from twbs/arrivederci-help-inline
add removal of .help-inline to the migration guide
2014-02-03 02:05:31 -08:00
Chris Rebert d5558621b2 add removal of .help-inline to the migration guide; fixes #12539 2014-02-03 02:04:21 -08:00
Chris Rebert b0dc512a4b Merge pull request #12544 from twbs/sayonara-inverse-btn
add .btn-inverse removal to migration guide
2014-02-03 01:58:46 -08:00
Chris Rebert 69af98e6bb add .btn-inverse removal to migration guide; fixes #12538 2014-02-03 01:57:45 -08:00
Chris Rebert 1abc308399 Merge pull request #12543 from twbs/fix-12540
Fixes #12540
2014-02-03 01:54:13 -08:00
Chris Rebert a2ff16c3ce fix #12540 2014-02-03 01:51:32 -08:00
Chris Rebert 27e080df4b fix #12527 2014-02-02 22:51:19 -08:00
Chris Rebert e9212e8ab7 update docs about destination of remote modal content; fixes #12494 2014-02-02 22:11:18 -08:00
Chris Rebert 1a137ffb6d Merge pull request #12517 from twbs/getting-started-SO
add StackOverflow to Community section of Getting Started docs
2014-02-02 21:44:40 -08:00
Chris Rebert 880a38e1a4 add StackOverflow to Community section of Getting Started docs 2014-02-02 21:44:09 -08:00
Chris Rebert d99d79d2e8 fix #12531 2014-02-02 21:38:37 -08:00
Daniel Erickson fd9b29b43e Allow the bootstrap package in npm to expose css and less 2014-02-02 17:33:40 -08:00
Cina S 847adb7dad Tightening up popover arrow css scope to apply only to direct descendant arrows. 2014-02-02 16:14:22 -06:00
Mark Otto 02ae5a2728 Merge pull request #12519 from twbs/bower-badge
add Bower badge to README
2014-02-02 11:29:02 -08:00
Chris Rebert f234496239 add note to CONTRIBUTING.md about outline: none 2014-02-01 23:19:28 -08:00
Chris Rebert f2d45fd2f8 add Bower badge to README 2014-02-01 21:25:19 -08:00
Zlatan Vasović 09f62f6a7a Improve alignment of the dashboard placeholder images
Fixes #12435
2014-02-01 22:46:55 +01:00
Chris Rebert 9c054fd4c0 Merge pull request #12503 from ZDroid/ed
Don't re-set indent style for [*.py]
2014-02-01 13:35:12 -08:00
Zlatan Vasović 59a38b7bf6 Don't re-set indent style for [*.py]
Just inherit it from [*].
2014-02-01 14:37:19 +01:00
Zlatan Vasović 1e09a9d1d7 Remove redundant :-moz-placeholder styles
No need for old Firefox versions support.
2014-02-01 14:20:41 +01:00
Chris Rebert d6f25e13ec mv .img-responsive docs from Overview to Images section 2014-02-01 00:26:46 -08:00
Chris Rebert 813467ddaf rm callout about creating .container-fluid-alikes now that .container-fluid has been added 2014-02-01 00:11:23 -08:00
Chris Rebert 362708acdd Merge pull request #12480 from twbs/clarify-jquery-err-msg
Clarify JS error message about missing jQuery
2014-01-31 14:13:27 -08:00
Mark Otto 58bf3f9432 grunt after last commits 2014-01-31 13:40:32 -08:00
Mark Otto 9f36bc2bf6 Merge pull request #12448 from PHLAK/master
Fix issue causing .navbar-brand element height to be shorter than .navbar height
2014-01-31 13:39:23 -08:00
Mark Otto 1802cedbc1 Use scss option instead of css for better highlighting 2014-01-31 13:12:31 -08:00
Chris Rebert 4b194471b0 fix #12484 2014-01-31 10:32:32 -08:00
Chris Rebert 623d650758 most of Bootstrap's components are pure CSS and thus don't require jQuery
Refs https://news.ycombinator.com/item?id=7156305
2014-01-31 09:50:47 -08:00
Chris Rebert 40d3cf6cd7 Merge pull request #12463 from XhmikosR/12440
Downgrade holder.js to v2.2.0.
2014-01-31 00:40:43 -08:00
XhmikosR 7b9c0a38a7 Downgrade holder.js to v2.2.0.
Fixes #12440.
2014-01-31 09:32:55 +02:00
Chris Rebert 2c6b099f91 fix "pading-right" [sic] typo in dashboard.css; fixes #12455 2014-01-30 20:39:12 -08:00
Chris Rebert e430675d14 use correct+newer name for retina mixin in docs; fixes #12450 2014-01-30 14:46:58 -08:00
Chris Kankiewicz 22e576c600 Fix issue causing .navbar-brand element height to be shorter than .navbar height 2014-01-30 14:59:54 -07:00
Chris Rebert 00685be0e9 Merge pull request #12445 from twbs/browserstack-runner-update
update to browserstack-runner v0.1.0
2014-01-30 13:01:07 -08:00
Chris Rebert 2f81246174 Merge pull request #12444 from twbs/grunt-saucelabs-update
update to grunt-saucelabs v5.0.0
2014-01-30 13:00:46 -08:00
Chris Rebert bf0cedc624 update to browserstack-runner v0.1.0 2014-01-30 12:32:30 -08:00
Chris Rebert dd6bb5a335 update to grunt-saucelabs v5.0.0 2014-01-30 12:30:55 -08:00
Chris Rebert c86c8de4f2 rm duplicate warning callouts in Input Groups docs 2014-01-30 12:25:02 -08:00
Julian Thilo a9567a9e0c Apply eaa2b83 to master as well 2014-01-30 21:16:48 +01:00
Chris Rebert c1a5e1443f Merge pull request #12436 from XhmikosR/jquery
Update jQuery to v1.11.0.
2014-01-30 11:12:40 -08:00
XhmikosR 8939268a33 Update jQuery to v1.11.0.
Also, use Google's CDN per #11369.
2014-01-30 20:50:17 +02:00
Chris Rebert 7c6e4a231c rm outdated note about lack of .col-{xs,sm}-offset-0; fixes #12439 2014-01-30 10:49:43 -08:00
Chris Rebert 9f26194489 note specific versions of IE where progress bar animation supported; fixes #12437 2014-01-30 10:42:44 -08:00
Mark Otto 1409cde7e8 Bump versions, run grunt 2014-01-30 08:30:37 -08:00
Mark Otto 9a6b7ab375 grunt 2014-01-30 08:14:18 -08:00
Geremia Taglialatela 0da527f169 fixed first element padding of list-inline 2014-01-30 14:55:19 +01:00
Julian Thilo c2784ddd75 Merge pull request #12432 from ChrisRiddell/signin-email-fix
Wrong input css for signin example
2014-01-30 04:54:19 -08:00
Chris Riddell d002f0459d its an email input 2014-01-30 23:14:05 +10:30
Mark Otto d4b1bfd667 grunt 2014-01-29 22:44:06 -08:00
Mark Otto d2f1887bb5 Merge branch 'master' into pr/12388
Conflicts:
	dist/css/bootstrap.min.css
2014-01-29 22:18:29 -08:00
Mark Otto 9195d8e8eb Follow up to #11655: don't reset opacity on disabled buttons 2014-01-29 21:57:44 -08:00
Mark Otto 7ba2eede4e fix css url 2014-01-29 21:44:36 -08:00
Mark Otto 80ef14a11a Merge pull request #12423 from ZDroid/name
Rename pack.min.css to docs.min.css to match with docs.min.js
2014-01-29 21:44:01 -08:00
Mark Otto d631e0b92d Fix #12422: Reset height on multiple select in input size mixin 2014-01-29 21:34:10 -08:00
Mark Otto 545c957f17 Fixes #12424: Account for Normalize change on figure element so that we don't potentially screw folks over 2014-01-29 21:23:23 -08:00
Zlatan Vasović 00f062fc7e Rename pack.min.css to docs.min.css to match with docs.min.js 2014-01-29 20:50:10 +01:00
Chris Rebert 9ec5905c07 Merge pull request #12415 from XhmikosR/master
Gruntfile.js: remove unused code.
2014-01-28 17:35:09 -08:00
Chris Rebert 37926839ff Merge pull request #12417 from ZDroid/cmt
Remove redundant jshint comment
2014-01-28 15:54:23 -08:00
Zlatan Vasović f8bb6811bd Remove redundant jshint comment 2014-01-28 22:47:23 +01:00
XhmikosR 615f1ad4aa Gruntfile.js: remove unused code. 2014-01-28 21:07:56 +02:00
Mark Otto 01dabd3391 Merge pull request #12406 from twbs/normalize_v3
Upgrade to Normalize v3
2014-01-28 10:57:31 -08:00
Mark Otto a9a4d81730 grunt 2014-01-28 10:08:40 -08:00
Mark Otto 493d143cbd v3 instead of rc1 2014-01-28 10:07:33 -08:00
Donald Pipowitch 7037c6fc72 refactored and renamed grid mixins 2014-01-28 10:48:45 +01:00
Julian Thilo 3a62811bbd Update javascript.html 2014-01-28 00:01:10 +01:00
Julian Thilo 0a5cb2f908 Fix typo 2014-01-27 23:07:14 +01:00
Mark Otto b7ac009a52 Remove #8350's reset for number inputs since Normalize fixes those upstream 2014-01-27 12:25:39 -08:00
Mark Otto 400720d00b Remove optgroup resets from #7611 since Normalize fixes those upstream 2014-01-27 12:24:35 -08:00
Mark Otto 6a0a139cda Upgrade to Normalize v3-rc1 in prep for v3 final 2014-01-27 12:08:55 -08:00
Mark Otto 45ea456468 Merge branch 'master' of github.com:twbs/bootstrap 2014-01-27 09:42:33 -08:00
Mark Otto e08e871f01 document id requirement in carousels per #12393 2014-01-27 09:24:51 -08:00
Julian Thilo 72a31db210 Merge pull request #12403 from Quy/master
Change positioning reference from left to right in affix's example.
2014-01-27 09:22:17 -08:00
Quy Ton 5c1852fb74 Change positioning reference from left to right in affix's example. 2014-01-27 09:17:57 -08:00
Chris Rebert 50ad304bb5 Merge pull request #12315 from twbs/use-shrinkwrap
Do npm caching based on npm-shrinkwrap.canonical.json
2014-01-26 20:46:14 -08:00
Mark Otto 16fd8cd01e Merge pull request #12398 from twbs/deprecate-box-shadow-mixin
mark .box-shadow() mixin as deprecated
2014-01-26 19:15:31 -08:00
Chris Rebert 1a36e4fa1e docs & comments: v3.1 => v3.1.0 2014-01-26 17:48:15 -08:00
Chris Rebert 602e5f8f11 mark .box-shadow() mixin as deprecated; fixes #12396 2014-01-26 17:44:01 -08:00
Chris Rebert 5a3f1a90ba fix #12261 2014-01-26 14:22:06 -08:00
Alan Hamlett e38fd138ce fixes #10495 by forcing .navbar-brand height to prevent it's inner content from increasing navbar height 2014-01-25 21:40:56 -08:00
Chris Rebert 3157a37775 Merge pull request #12387 from twbs/osx-chrome
re-enable OS X Chrome in Sauce tests
2014-01-25 18:33:23 -08:00
Chris Rebert 6717f642bb re-enable OS X Chrome in Sauce tests 2014-01-25 17:55:52 -08:00
Chris Rebert 77362a3b45 Merge pull request #12386 from twbs/update-iphone
update to iOS v7 in Sauce test config
2014-01-25 17:11:49 -08:00
Chris Rebert d56def706a update to iOS v7 in Sauce test config 2014-01-25 17:02:02 -08:00
Chris Rebert 9ec1e8694b README: use Bootstrap v3-specific StackOverflow tag 2014-01-25 16:38:47 -08:00
Chris Rebert 87e5b16b17 disable IE11 in BrowserStack config due to frequent timeouts 2014-01-25 16:35:13 -08:00
Chris Rebert 86a5846ada Merge pull request #12378 from andrewdisley/patch-1
Fix #10348: Customizer dependencies
2014-01-25 16:30:02 -08:00
Chris Rebert 15921e5109 Merge pull request #12385 from hnrch02/update-load-grunt-tasks
Update load-grunt-tasks to v0.3.0
2014-01-25 16:27:05 -08:00
Heinrich Fenkart 72568ce588 Update load-grunt-tasks to v0.3.0 2014-01-25 21:03:44 +01:00
Chris Rebert 12a4263471 Merge pull request #12266 from twbs/linux
enable Linux Chrome & Linux Firefox in Sauce tests
2014-01-25 12:00:10 -08:00
Mark Otto 45b964c246 Merge pull request #12380 from twbs/translation-german
Add German translation
2014-01-25 11:10:20 -08:00
Julian Thilo 0cbfdd19bd Add link to German translation and reorder links 2014-01-25 16:08:15 +01:00
Andrew Disley a1b0bb7a10 Fix #10348: Customizer dependencies 2014-01-25 12:35:46 +00:00
Mark Otto 6d090e243d Merge pull request #12366 from Quy/master
Change a word.
2014-01-24 22:36:05 -08:00
Julian Thilo af1ba5cf74 Clarify nesting in grid example 2014-01-25 01:58:54 +01:00
Quy Ton 4b5991586d Change a word. 2014-01-24 11:24:50 -08:00
Chris Rebert 643e814e7b Merge pull request #12365 from Quy/master
Remove Twitter from tweet button
2014-01-24 10:43:06 -08:00
Quy Ton da86f6fbbb Remove Twitter from tweet button 2014-01-24 10:37:12 -08:00
Mark Otto 4b2fe3f96f Merge branch 'master' of github.com:twbs/bootstrap 2014-01-24 11:56:04 -06:00
Mark Otto 64e8132426 Fix #12359: Reset min-width on fieldsets so that they don't break responsive tables and behave more like standard block level elements 2014-01-24 11:55:59 -06:00
Chris Rebert f1c1469b83 Merge pull request #12357 from twbs/border-box-note
add note in Less source about global `box-sizing: border-box;`
2014-01-23 20:57:45 -08:00
Mark Otto 829eefd6f7 Merge pull request #12356 from twbs/wcag-contributing
add WCAG color guideline to CONTRIBUTING.md
2014-01-23 20:55:39 -08:00
Mark Otto bd6751e932 Merge pull request #12355 from twbs/aria-contributing
add WAI-ARIA guideline to CONTRIBUTING.md
2014-01-23 20:53:33 -08:00
Mark Otto 44fc629d44 Fix #12353: Scope table border reset in panels to first-child rows 2014-01-23 22:52:26 -06:00
Chris Rebert b30cff4888 Add ref in Less to docs regarding box-sizing conflicts
Refs #12351
2014-01-23 20:51:23 -08:00
Chris Rebert b9d1ae092f add ID to "Box sizing" section of Getting Started docs 2014-01-23 17:01:43 -08:00
Chris Rebert 31e8a48783 "bottom increment" => "decrement" in explanatory comment 2014-01-23 15:07:04 -08:00
Chris Rebert aa8b1543be add WCAG color guideline to CONTRIBUTING.md 2014-01-23 14:01:59 -08:00
Chris Rebert 2f26eaea5b add WAI-ARIA guideline to CONTRIBUTING.md 2014-01-23 12:50:57 -08:00
Chris Rebert 7d015817ed fix typo and use the v3-specific StackOverflow tag 2014-01-23 11:18:56 -08:00
Chris Rebert 7a6bc67826 Merge pull request #12347 from twbs/ie-11-browserstack
enable IE11 in BrowserStack tests
2014-01-22 21:34:42 -08:00
Mark Otto f748390cf5 Follow-up to #12250: remove remaining page margins for print 2014-01-22 21:51:23 -06:00
Mark Otto 08e83a62b7 Fix #11655: Fix broken disabled states for iOS form controls and buttons 2014-01-22 21:43:08 -06:00
Mark Otto 833c208bf5 Merge branch 'master' of github.com:twbs/bootstrap 2014-01-22 21:20:06 -06:00
Mark Otto 1e1af8687d Merge pull request #12250 from twbs/rm-print-margins
remove default left-right print margins per upstream h5bp change
2014-01-22 19:18:24 -08:00
Mark Otto b945491426 Merge branch 'master' of github.com:twbs/bootstrap 2014-01-22 21:15:25 -06:00
Mark Otto 7b24a3b99c Fixes #12344: Update docs to show workaround for using button element with justified button groups 2014-01-22 21:15:17 -06:00
Mark Otto 11a22fb615 Merge pull request #12345 from twbs/printer-wackiness-note
add note about printer viewport weirdness
2014-01-22 17:52:00 -08:00
Chris Rebert 6d08763136 add docs note to address #12078 2014-01-22 17:28:00 -08:00
Chris Rebert 9798b0bf0b enable IE11 in BrowserStack tests 2014-01-22 14:57:32 -08:00
Julian Thilo 494014babe No more lists. 2014-01-22 19:04:19 +01:00
Julian Thilo 57597c4761 Merge pull request #12340 from browserstack/update_bs_runner
Update browserstack-runner package
2014-01-22 08:46:41 -08:00
Julian Thilo 2022e15aa8 Gone, gone. 2014-01-22 17:00:09 +01:00
Rahul Nawani 6c7db9d56e update browserstack runner package 2014-01-22 21:15:55 +05:30
Chris Rebert 81b234e74a Merge pull request #12334 from Quy/master
Reorder lead/nav of About docs page
2014-01-21 22:18:44 -08:00
Quy Ton c08aef1655 Reorder lead info of About docs page 2014-01-21 22:12:44 -08:00
Quy Ton e5c7c2acc1 Reorder nav of About docs page 2014-01-21 22:02:54 -08:00
Mark Otto 06dcf91364 Merge pull request #12326 from twbs/navbar-var
add @navbar-collapse-max-height Less variable
2014-01-21 20:50:26 -08:00
Mark Otto 109ba82eed Merge pull request #12327 from twbs/about-ordering
reorder sections of About docs page
2014-01-21 20:15:21 -08:00
Chris Rebert 1942f36455 remove default left-right print margins per upstream h5bp change
Refs:
    https://github.com/h5bp/html5-boilerplate/commit/57be193031b95b003b96efe9eba7a4db7f58f4e1
    https://github.com/h5bp/html5-boilerplate/issues/1477
2014-01-21 16:29:49 -08:00
Chris Rebert 9e862cdf70 enable Linux Chrome & Linux Firefox in Sauce tests 2014-01-21 16:28:38 -08:00
Chris Rebert 068d7a11f9 reorder sections of About docs page
most folks are probably more interested in History and Team than Branding
2014-01-21 10:28:54 -08:00
Chris Rebert 67271a18ac add @navbar-collapse-max-height Less variable 2014-01-21 10:23:57 -08:00
Julian Thilo 7938134fd1 Merge pull request #12321 from coliff/patch-3
Update index.html
2014-01-21 03:15:49 -08:00
Christian ae579e950b Update index.html
This is very minor, but to help encourage best practises it'd be best to have the input type 'email' for this email input example instead of 'text'
2014-01-21 18:36:48 +09:00
Chris Rebert c658e4e926 fix typo in README 2014-01-21 00:55:56 -08:00
Mark Otto cd78b43185 Merge pull request #12308 from twbs/fix-12298
Fix #12298
2014-01-20 20:15:37 -08:00
Mark Otto e4f33a91d9 Merge branch 'master' of github.com:twbs/bootstrap 2014-01-20 22:12:02 -06:00
Mark Otto 317aa8092d spacing 2014-01-20 22:11:51 -06:00
Chris Rebert bc9335650c fix #12007 by clarifying target of dropdown events 2014-01-20 18:39:13 -08:00
Chris Rebert ebc4f998dc Merge pull request #12318 from twbs/fscking-customizer
Template the customizer's nav sidebar too
2014-01-20 18:09:59 -08:00
Chris Rebert 3de48d29f5 fix #12280 by templating the customizer's nav sidebar too
The customizer is such a PITA.
2014-01-20 18:06:16 -08:00
Chris Rebert 5d35c4909c Merge pull request #12282 from XhmikosR/grunt-contrib-uglify
Update grunt-contrib-uglify dependency.
2014-01-20 17:28:42 -08:00
Chris Rebert 8a1f4426a2 Merge pull request #12317 from twbs/grunt-task-license
clarify Grunt task licensing
2014-01-20 16:58:11 -08:00
Chris Rebert 6b8d4e9c76 clarify Grunt task licensing 2014-01-20 16:56:24 -08:00
Chris Rebert 5cc3c62e30 slap a lang attr on <html> in the Getting Started basic template
for consistency with docs/examples/starter-template/index.html
2014-01-20 16:53:31 -08:00
Chris Rebert 50000b5930 nitpick phrasing 2014-01-20 15:05:25 -08:00
Chris Rebert f4a916d351 upgrade #callout-navbar-overflow from info to warning 2014-01-20 15:02:48 -08:00
Julian Thilo 4ec861316f fix markup typo, duh 2014-01-21 00:00:52 +01:00
Julian Thilo 4552bcf66f fix #12311 2014-01-20 23:51:13 +01:00
Julian Thilo 4a36ecaac6 fix #12314 2014-01-20 23:36:52 +01:00
Chris Rebert 14baf4ef27 Merge pull request #12303 from twbs/doc-s3
document S3 cache more fully
2014-01-20 13:56:58 -08:00
Chris Rebert ece15cb010 Merge pull request #12307 from twbs/bye-site-baseurl
docs: use relative URLs instead of site.baseurl
2014-01-20 13:55:07 -08:00
nkav 4380ca4348 Corrected tag for Alert JS animation example from <a> to <button>
Also removed href attribute and added type="button"
2014-01-20 13:46:41 -08:00
XhmikosR 9818ad532e Update grunt-contrib-uglify dependency. 2014-01-20 09:37:02 +02:00
Chris Rebert 79487ba499 fix #12298 2014-01-19 23:07:32 -08:00
Chris Rebert f59573db0d docs: use relative URLs instead of site.baseurl 2014-01-19 22:50:09 -08:00
Chris Rebert 4120aadd68 Merge pull request #12306 from twbs/raw-files.min.js
rename raw-files.js to raw-files.min.js
2014-01-19 22:36:08 -08:00
Chris Rebert 336f5f1dce rename raw-files.js to raw-files.min.js
it's not /technically/ minified, but close enough
it's autogenerated, not terribly human-readable, and not meant to be directly modified
2014-01-19 22:29:51 -08:00
Chris Rebert 06a7bdd0b0 grunt build-raw-files dist 2014-01-19 22:27:01 -08:00
Chris Rebert adda5d55c6 Merge pull request #12304 from Quy/master
Replace page.base_url with relative url
2014-01-19 22:21:29 -08:00
Quy Ton 0d153fa643 Replace page.base_url with relative url 2014-01-19 21:03:17 -08:00
Chris Rebert 6f1236f81a document S3 cache more fully; fixes #12289 2014-01-19 18:48:35 -08:00
Chris Rebert 0349fe0f0b Merge pull request #12295 from ZDroid/types
Improve grunt config and vars
2014-01-19 15:43:52 -08:00
Chris Rebert 937e067a27 grunt build-customizer-vars-form 2014-01-19 15:28:30 -08:00
Chris Rebert 04cfca25af s3_cache.py: fix name in USAGE message 2014-01-19 15:12:09 -08:00
Zlatan Vasović 956064ec56 Improve grunt config and vars 2014-01-19 22:41:01 +01:00
Julian Thilo a77fba3c37 Merge pull request #12302 from Quy/master
More "LESS" to "Less" changes
2014-01-19 13:35:06 -08:00
Quy Ton 3e9ba3f671 More "LESS" to "Less" changes 2014-01-19 13:27:51 -08:00
Mark Otto e71a85a525 remove confusing comment 2014-01-19 10:23:00 -08:00
Julian Thilo 2a75e559f6 Merge pull request #12297 from Quy/master
Additional changes to #12275 and #12292
2014-01-19 08:15:10 -08:00
Quy Ton f2d37ccc23 Additional changes to #12275 and #12292 2014-01-19 07:41:14 -08:00
Julian Thilo 0dc26b2e07 Make head elements order uniform across templates and examples 2014-01-19 15:59:21 +01:00
Julian Thilo 4f1852d5c2 Merge pull request #12292 from ZDroid/meta
Improve <meta> tags
2014-01-19 06:54:34 -08:00
Zlatan Vasović cf8f1ec0cd Improve <meta> tags 2014-01-19 13:27:17 +01:00
Zlatan Vasović 885a870f43 Fix #12025 and minify styles 2014-01-19 12:52:31 +01:00
Mark Otto 9c97c5a729 expo callout copy 2014-01-19 09:17:00 +02:00
Mark Otto 7e145a13c8 Merge pull request #12288 from twbs/x-ua-compat
add X-UA-Compatible <meta> to basic template
2014-01-18 20:45:45 -08:00
Chris Rebert 60298dd623 add X-UA-Compatible <meta> to basic template 2014-01-18 18:39:46 -08:00
Chris Rebert b67cba2b4d make WP8 device-width hack code fully consistent between docs HTML & docs JS 2014-01-18 18:35:47 -08:00
Chris Rebert 20772462df grammar: fix plural possessive 2014-01-18 17:17:53 -08:00
Chris Rebert 0be0090983 fix anomalous indentation 2014-01-18 17:13:16 -08:00
Julian Thilo 3a1aa33860 Dustin' the docs: Typos, Grammar, etc. in css.html 2014-01-19 01:47:12 +01:00
westurner a73dacf4a0 Added WAI-ARIA roles to examples/theme/index.html (document, main)
https://en.wikipedia.org/wiki/WAI-ARIA

http://www.w3.org/TR/wai-aria/roles
2014-01-18 16:32:14 -08:00
Mark Otto 2179f9d68a Merge pull request #12287 from Quy/master
Add table's .info variant to migration guide
2014-01-18 16:21:39 -08:00
Quy Ton 9e8afcc661 Add table's .info variant to migration guide 2014-01-18 16:08:39 -08:00
Mark Otto e5d6ab9b31 link to docs license 2014-01-18 14:50:45 -08:00
Mark Otto b790ea9011 Merge pull request #12219 from ZDroid/rn
Rename docs/LICENSE-DOCS to docs/LICENSE
2014-01-18 14:49:00 -08:00
Mark Otto 032869a439 Merge pull request #12248 from twbs/bg-variant
refactoring: add & use .bg-variant() mixin
2014-01-18 14:47:29 -08:00
Julian Thilo 10a158ff93 Fix typos, sentences in getting-started.html 2014-01-18 23:46:32 +01:00
Mark Otto 2115ac525b Run grunt dist after adding 'a' requirement to the text emphasis classes 2014-01-18 14:40:48 -08:00
Mark Otto 3b6ab5075e Merge branch 'master' into bg-variant
Conflicts:
	less/mixins.less
2014-01-18 14:40:17 -08:00
Mark Otto 572e6a959a Merge pull request #12286 from watilde/fixes-panel
Fixes #12263: Remove border radius when it's not both ends in panel
2014-01-18 14:29:11 -08:00
Mark Otto b32d92ef71 Merge pull request #12249 from twbs/modal-md
add & use @modal-md Less var for uniformity
2014-01-18 14:28:45 -08:00
Mark Otto 9c9a2f3e08 Merge pull request #12247 from twbs/text-emphasis-variant
refactoring: add & use .text-emphasis-variant() mixin
2014-01-18 14:28:33 -08:00
Mark Otto cfe38a4241 Merge branch 'master' into modal-md 2014-01-18 14:12:04 -08:00
Mark Otto cd1bea0616 Merge branch 'master' into bg-variant 2014-01-18 14:11:55 -08:00
Mark Otto 689e75e4b1 Merge branch 'master' into text-emphasis-variant 2014-01-18 14:11:36 -08:00
Mark Otto b1721f42cc Merge branch 'master' of github.com:twbs/bootstrap 2014-01-18 14:09:17 -08:00
Mark Otto c322612218 move migration docs to new separate page, leave callout on getting started page; fixes #12244 2014-01-18 14:09:09 -08:00
Julian Thilo 67594cb544 Fix holder.js links in examples
Replaces links to holder.js with links to the new docs.min.js.
The uncompressed holder.js file is now in docs/assets/js/vendor,
which is excluded from Jekyll builds. In turn, Holder is now
included in docs.min.js, which is smaller than holder.js,
so this should make everybody happy. :)
2014-01-18 22:58:05 +01:00
Daijiro Wachi 6856c9f7f6 remove border radius when it's not both ends in panel 2014-01-19 06:43:57 +09:00
Mark Otto a521e982d5 Merge pull request #12281 from XhmikosR/vendor
Move docs third-party libraries to a separate folder.
2014-01-18 11:42:34 -08:00
Mark Otto 7b42103df6 kill bottom margin on last docs section 2014-01-18 11:33:50 -08:00
Julian Thilo a56cf753ce Make spelling of Less uniform throughout the docs 2014-01-18 18:40:47 +01:00
Julian Thilo 092b1a47ef Fix typo in index.html 2014-01-18 18:15:37 +01:00
XhmikosR 4bca3c79b3 Move docs third-party libraries to a separate folder. 2014-01-18 08:15:21 +02:00
Mark Otto dcdf716eef copy 2014-01-17 19:04:14 -08:00
Chris Rebert 172de467eb present browser compatibility info in a table 2014-01-17 17:12:52 -08:00
Chris Rebert d8c87ddc28 fix #12277
Thanks to @Quy for pointing these out.
2014-01-17 14:28:01 -08:00
Tobias Lindig 084f0fb113 add namespace .bs also to the event dismiss.modal 2014-01-17 12:16:53 -08:00
Chris Rebert d6e8006ea6 Merge pull request #12276 from twbs/grunt-contrib-qunit
bump grunt-contrib-qunit to v0.4.0
2014-01-17 12:06:12 -08:00
Chris Rebert 58c4a8c0f1 bump grunt-contrib-qunit to v0.4.0 2014-01-17 11:56:53 -08:00
Chris Rebert ffdc18cbbf fix #12274 2014-01-17 11:52:35 -08:00
Chris Rebert c5bed1a850 Merge pull request #12275 from ZDroid/ncss
Replace Normalize with Normalize.css
2014-01-17 11:43:18 -08:00
Zlatan Vasović 93ab926dc7 Replace Normalize with Normalize.css 2014-01-17 20:22:32 +01:00
Julian Thilo af5cebf76b Merge pull request #12271 from tlindig/modal_remove_needless_space
remove needless space character
2014-01-17 06:29:12 -08:00
Tobias Lindig 7fab3c30f2 remove needless space character 2014-01-17 13:34:03 +01:00
Chris Rebert 6af0013ac5 Revert "Add tooltip viewport option, respect bounds of the viewport"
This reverts commit edb221a20c.
Reverting due to broken JS unit tests.

Conflicts:
	docs/javascript.html
2014-01-16 20:32:59 -08:00
Chris Rebert faa783e989 Merge pull request #12267 from twbs/ie-10
enable IE10 for Sauce tests
2014-01-16 20:07:43 -08:00
Mark Otto 03f4534307 Merge branch 'bo-tooltip-viewport' of https://github.com/benogle/bootstrap into benogle-bo-tooltip-viewport
Conflicts:
	docs/javascript.html
2014-01-16 20:01:28 -08:00
Mark Otto 8eef0a47ee Merge branch 'master' of github.com:twbs/bootstrap 2014-01-16 20:00:36 -08:00
Mark Otto 380019ccb2 Split box-sizing reset for faster rendering 2014-01-16 20:00:28 -08:00
Chris Rebert ee396aeb8e enable IE10 for Sauce tests 2014-01-16 19:53:02 -08:00
Chris Rebert bd8ef99028 temporarily disable OS X Chrome Sauce test since it's being flaky
e.g.:
Tested http://127.0.0.1:3000/js/tests/index.html
Environment: OS X 10.9::chrome
>> Timeout, waited for more than 300000 milliseconds
2014-01-16 19:52:24 -08:00
Chris Rebert 600f62dc78 Merge pull request #12265 from twbs/ie-11
enable IE11 in Sauce tests
2014-01-16 17:00:46 -08:00
Chris Rebert ecf8148c3f Merge pull request #12264 from twbs/mavericks-safari-7
upgrade to Safari 7 in Sauce tests
2014-01-16 16:10:50 -08:00
Chris Rebert 4a50ac0bdd enable IE11 in Sauce tests 2014-01-16 15:35:08 -08:00
Chris Rebert 60fb8b76f9 Merge pull request #12262 from twbs/osx-firefox
re-enable OS X Firefox in Sauce tests
2014-01-16 15:25:50 -08:00
Mark Otto d07e8fece4 grunt 2014-01-16 15:03:34 -08:00
Chris Rebert ded7008e40 upgrade to Safari 7 in Sauce tests 2014-01-16 14:51:41 -08:00
Chris Rebert 1ca0f8dbc0 re-enable OS X Firefox in Sauce tests 2014-01-16 14:47:11 -08:00
fat 4bd6a52562 add missing paren 2014-01-16 14:28:21 -08:00
fat 82ff4e2e40 tooltip subpixel test fixes 2014-01-16 14:25:28 -08:00
fat 3b2418e688 remove flaky pos bottom test which is effect by unit scroll pos 2014-01-16 13:44:08 -08:00
fat 2f76821a4d new qunit 2014-01-16 13:33:09 -08:00
Chris Rebert bc074d5488 Merge pull request #12260 from patricker/patch-1
Update javascript.html to fix Tabs example
2014-01-16 10:55:22 -08:00
patricker 47f786e6ea Update javascript.html
Fixed issue in Tabs example where the div had been marked as 'active' but the li had not been.  The correct tab of data would be displayed on load, but no tabs would be highlighted.  The tabs with fade example does not have this issue.  jsFiddle: http://jsfiddle.net/uXV56/
2014-01-16 11:41:34 -07:00
Chris Rebert 190ae7bb31 Merge pull request #12258 from ibash/master
Fixing js error in IE9 where no transition is supported
2014-01-16 10:18:52 -08:00
Islam Sharabash ad64b0acc8 Fixing js error in IE9 where no transition is supported 2014-01-16 10:11:59 -08:00
Chris Rebert 81610c6048 Merge pull request #12252 from browserstack/browserstack-runner
Browserstack runner tunnel timeout
2014-01-15 23:14:13 -08:00
Rahul Nawani 2bdf99fcc1 add debug for browserstack-runner 2014-01-16 11:56:08 +05:30
Rahul Nawani a8e14bf1f8 update browserstack-runner package 2014-01-16 11:55:44 +05:30
Mark Otto 96a9e1bae0 Merge pull request #12245 from twbs/footer-links
add Issues & Releases links back to footer
2014-01-15 20:14:37 -08:00
Chris Rebert b2e88d1359 add & use @modal-md Less var for uniformity 2014-01-15 18:53:22 -08:00
Chris Rebert b121207e10 refactoring: add & use .bg-variant() mixin 2014-01-15 18:21:56 -08:00
Chris Rebert b886fd2f01 refactoring: add & use .text-emphasis-variant() mixin 2014-01-15 18:07:22 -08:00
Chris Rebert 47ff60426d add Issues & Releases links back to footer 2014-01-15 17:29:54 -08:00
Chris Rebert 0ef8d1bad4 reassert #12231 & #12232 (merge went badly?) 2014-01-15 17:24:57 -08:00
Mark Otto 78e81a1de9 Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	docs/assets/css/pack.min.css
2014-01-15 16:25:29 -08:00
Mark Otto 7e7264e224 fix ad placement 2014-01-15 16:25:04 -08:00
Julian Thilo 95f24dca9a Fix customizer's toggle buttons' margin 2014-01-16 01:19:00 +01:00
Julian Thilo 5ac8dca8ad Adapt about.html lead to latest changes 2014-01-16 01:08:00 +01:00
Julian Thilo fa052c9659 Fix footer links 2014-01-16 00:58:13 +01:00
Chris Rebert 47bbc30b2c increase Sauce concurrency
Per https://github.com/twbs/bootstrap/issues/11087#issuecomment-32309827
Thanks @admc & @saucelabs !
2014-01-15 15:55:47 -08:00
Mark Otto fcb78bcef7 Merge pull request #12243 from twbs/cleanup-about
move Community & Translations docs sections from About to Getting Started
2014-01-15 15:54:35 -08:00
Chris Rebert 53bcb829bb move Community & Translations docs sections from About to Getting Started 2014-01-15 15:34:10 -08:00
Mark Otto 9bd5979013 Merge pull request #12242 from twbs/sass-contributing
add link to Sass CONTRIBUTING file in the About page
2014-01-15 15:27:07 -08:00
Julian Thilo 4c9433d13d Adhere to MailChimp's brand guidelines ;) 2014-01-16 00:22:05 +01:00
Julian Thilo bb964b131c Remove popovers from components.html lead
because they're only really featured on javascript.html
Replacement: input groups
2014-01-16 00:17:04 +01:00
Chris Rebert a624981ef3 add link to Sass CONTRIBUTING file in the About page 2014-01-15 15:04:38 -08:00
Chris Rebert 9039a5e90b remove inaccurate comment 2014-01-15 15:04:08 -08:00
Mark Otto 0335b8df52 Merge branch 'master' of github.com:twbs/bootstrap 2014-01-15 15:01:50 -08:00
Mark Otto 6986bdb2a7 Fix page headers 2014-01-15 15:01:41 -08:00
Chris Rebert 91c6419d09 Getting Started: fix ID of heading so matches TOC 2014-01-15 14:26:29 -08:00
Chris Rebert 8dc1d00dd4 add a couple commas 2014-01-15 13:44:23 -08:00
Chris Rebert 208df78971 Merge pull request #12241 from twbs/jekyll-encoding
Set Jekyll encoding and tweak Windows notes
2014-01-15 13:43:12 -08:00
Mark Otto 14975e4ee9 indentation and page header changes 2014-01-15 13:24:34 -08:00
Julian Thilo 00239f6034 Set Jekyll encoding and tweak Windows notes 2014-01-15 22:18:35 +01:00
Mark Otto a633fc042d Merge branch 'master' into docs_derp
Conflicts:
	docs/components.html
	docs/css.html
2014-01-15 13:08:35 -08:00
Mark Otto 1facbf6e7a Merge pull request #12232 from twbs/mixing-docs
clarify docs regarding non-mixable components
2014-01-14 21:47:24 -08:00
Mark Otto 96031c101d Merge pull request #12231 from twbs/callouts
callout severity tweaks
2014-01-14 21:46:46 -08:00
Mark Otto b93ce03f19 Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	docs/assets/js/customize.min.js
2014-01-14 21:45:10 -08:00
Mark Otto 413c8a6da5 Fixes #12210: badges in xs buttons 2014-01-14 21:44:38 -08:00
Chris Rebert 9ebd8d39a9 clarify docs regarding non-mixable components 2014-01-14 21:26:19 -08:00
Chris Rebert 488443c9ad downgrade .img-responsive cross-reference callout from warning to info 2014-01-14 21:03:49 -08:00
Chris Rebert 76e226b136 upgrade form-group + input-group callout from info to warning 2014-01-14 21:02:56 -08:00
Chris Rebert 811639c452 downgrade <label>-related callouts from danger to warning 2014-01-14 21:02:06 -08:00
Chris Rebert 2ba15c3750 upgrade tooltip/popover-in-groups callout from info to warning 2014-01-14 21:01:09 -08:00
Chris Rebert 5ead87d519 revert unnecessary customizations of Blob.js & FileSaver.js
Per https://github.com/eligrey/Blob.js/pull/20
& https://github.com/eligrey/FileSaver.js/pull/63
The library author has deemed the existing /*! @source URL */ comments to be
sufficient attribution, and these already survive minification.

Refs ea591748ed
2014-01-14 20:46:25 -08:00
Chris Rebert e2a18430f9 Merge pull request #12213 from twbs/browserstack
tests: run BrowserStack in parallel with Sauce Labs
2014-01-14 20:44:47 -08:00
Chris Rebert c1a81f7bde Merge pull request #12229 from twbs/richer-results
more detailed QUnit test results in Sauce
2014-01-14 20:21:54 -08:00
Chris Rebert b260d93c58 more detailed QUnit test results in Sauce 2014-01-14 20:21:15 -08:00
Ben Ogle edb221a20c Add tooltip viewport option, respect bounds of the viewport 2014-01-14 17:42:29 -08:00
Mark Otto cae63200d8 Merge branch 'master' into docs_derp
Conflicts:
	docs/_includes/old-bs-docs.html
2014-01-14 15:53:06 -08:00
Mark Otto edd0b97be5 Don't copy-pasta all the Sass docs because fuck keeping that up to date. Instead, point to https://github.com/twbs/bootstrap-sass/blob/master/README.md. 2014-01-14 15:52:40 -08:00
Chris Rebert 8fb75ee9e7 add missing semicolon 2014-01-14 14:25:25 -08:00
Chris Rebert 3a97697456 tests: run BrowserStack in parallel with Sauce Labs
Per https://github.com/twbs/bootstrap/issues/11087#issuecomment-31922999
and internal twbs team discussion.
Effectively reverts the deletions from #11701.
2014-01-14 14:13:52 -08:00
Chris Rebert 2a6b6f8537 Merge pull request #12224 from twbs/raw-files-banner
add copyright notice to raw-files.js
2014-01-14 13:28:50 -08:00
Chris Rebert 46b0874ef5 add copyright notice to raw-files.js 2014-01-14 13:27:50 -08:00
Julian Thilo 027af6deb4 Merge pull request #12220 from ZDroid/link
Link the blog post instead of main blog page
2014-01-14 06:03:35 -08:00
Zlatan Vasović c11f78d7eb Link the blog post instead of main blog page 2014-01-14 14:40:27 +01:00
Chris Rebert d1fd917b7a Merge pull request #12218 from ZDroid/docs.js
Rename uglify.js to uglify.min.js for consistency
2014-01-14 04:49:58 -08:00
Zlatan Vasović 4f58356e91 Rename docs/LICENSE-DOCS to docs/LICENSE
It sounded weird.
2014-01-14 13:47:18 +01:00
Zlatan Vasović c335104957 Rename uglify.js to uglify.min.js for consistency 2014-01-14 13:41:21 +01:00
Mark Otto c4b41ceae3 header masthead changes 2014-01-13 22:59:09 -08:00
Mark Otto b776749507 make page headers like masthead 2014-01-13 22:54:22 -08:00
Mark Otto eca81939cc Merge branch 'master' into docs_derp
Conflicts:
	docs/assets/css/pack.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
2014-01-13 22:43:18 -08:00
Mark Otto 8c0cb806c6 Merge pull request #12215 from twbs/attribution-comments
sort out attribution banners of docs assets
2014-01-13 22:38:47 -08:00
Chris Rebert ea591748ed sort out attribution banners of docs assets; fixes #11976 2014-01-13 21:58:27 -08:00
Chris Rebert aff64cffce avoid redundant banner in minified docs CSS 2014-01-13 21:31:40 -08:00
Chris Rebert 2d038186e3 add a title/description to customizer.js's attribution comment 2014-01-13 21:08:04 -08:00
Chris Rebert df70e8d845 Merge pull request #12214 from twbs/slightly-newer-qunit
upgrade to QUnit v1.0.0
2014-01-13 19:28:23 -08:00
Chris Rebert dde38280f7 upgrade to QUnit v1.0.0 2014-01-13 19:21:07 -08:00
Chris Rebert bfe74f7b2f Revert accidental overzealousness from 16eccc43d9
Let's not confuse the archaeologists & historians.
2014-01-13 19:09:51 -08:00
Chris Rebert b9216a292c update to Holder.js 5b79144fa 2014-01-13 17:50:17 -08:00
Chris Rebert 685fe722c2 preserve third-party attribution comments when minifying docs JS 2014-01-13 17:00:26 -08:00
Chris Rebert d62d7b0733 document subheading syntax 2014-01-13 02:37:55 -08:00
Mark Otto b17dca240e Merge branch 'master' into docs_derp
Conflicts:
	docs/assets/js/docs.min.js
2014-01-12 16:10:57 -08:00
Chris Rebert 80bed836e0 grunt dist build-customizer 2014-01-12 14:53:21 -08:00
XhmikosR f972331a10 update to FileSaver.js version 2013-12-27 / 0055d054ac
Refs #12196
2014-01-12 14:47:54 -08:00
Chris Rebert 4b5e73b842 add Blob.js separate from filesaver.js
Blob.js version 2013-12-27 / 0055d054acbca43eff44fc25c891055440685d9c
Refs #12196
2014-01-12 14:41:30 -08:00
XhmikosR ef22ab5aed update less.js to v1.6.1 & use accurate filename; refs #12196 2014-01-12 14:32:58 -08:00
XhmikosR 77ff3871fd update holder.js to v2.3; refs #12196 2014-01-12 14:23:41 -08:00
Chris Rebert 4787a69efb fix #12154 2014-01-12 13:51:03 -08:00
Mark Otto 4b1ff7fa49 Formatting and docs changes 2014-01-12 00:04:24 -08:00
Mark Otto 36aa3afb4f Improve spacing and alignment of sections and their headings 2014-01-11 23:15:37 -08:00
Mark Otto 613a95d838 brand guidelines cleanup 2014-01-11 19:42:10 -08:00
Mark Otto 79c18da452 homepage improvements 2014-01-11 19:35:40 -08:00
Mark Otto bacfd65cb2 Merge branch 'master' into docs_derp
Conflicts:
	docs/getting-started.html
2014-01-11 19:13:10 -08:00
Chris Rebert 80c9c14ab9 rm lingering reference to Recess in the docs
Refs c0200426ee
2014-01-11 17:15:08 -08:00
Mark Otto e2908975ad Merge branch 'master' of github.com:twbs/bootstrap 2014-01-11 14:49:03 -08:00
Mark Otto 1127cd6287 grunt dist 2014-01-11 14:48:47 -08:00
Mark Otto e68d3b961e Merge branch 'minify-assets' of https://github.com/XhmikosR/bootstrap into XhmikosR-minify-assets
Conflicts:
	package.json
2014-01-11 14:48:04 -08:00
Mark Otto 8e41961f9e Merge pull request #12193 from ZDroid/migration
Update docs per `.container-fluid` addition
2014-01-11 13:08:24 -08:00
Zlatan Vasović 62fe50df73 Update docs per .container-fluid addition
- Remove `.container-fluid` from "removed classes".
- Container isn't fluid by default (`.container`) and `.row` isn't percentage-based, so update docs.
2014-01-11 22:04:33 +01:00
Mark Otto 7a2c352b50 Don't test Linux browsers since we don't support them officially and they're failing our tests 2014-01-10 19:04:11 -08:00
Mark Otto 8a04ed44a1 Merge branch 'master' of github.com:twbs/bootstrap 2014-01-10 18:57:01 -08:00
Mark Otto 3a8e99e91e Fixes #12171: Ensure panel groups have a bottom margin since we nuke it on child panels 2014-01-10 18:56:44 -08:00
Chris Rebert b192d29981 refer to correct component 2014-01-10 18:56:39 -08:00
Mark Otto 17f2ef46aa docs mention for #12188 2014-01-10 18:47:51 -08:00
Chris Rebert e8cabf332a use height adjectives for greater clarity 2014-01-10 15:33:04 -08:00
Chris Rebert 46f5bbcf33 document #11675 2014-01-10 14:41:23 -08:00
Chris Rebert c6a5e6accb rm outdated <select> references from comments in forms.less 2014-01-10 14:34:25 -08:00
Mark Otto 831bbb8b45 Clarify that the focus docs styles are not in the repo, per https://github.com/twbs/bootstrap-sass/issues/497 2014-01-09 21:21:51 -08:00
Mark Otto ea20f44815 Merge branch 'master' into docs_derp
Conflicts:
	docs/assets/css/docs.css
2014-01-09 20:33:55 -08:00
Mark Otto 7f153974e1 Fixes #11990 and #12159: Make range inputs block level and 100% wide by default 2014-01-09 18:07:14 -08:00
Mark Otto 99b66c1f2c grunt dist 2014-01-09 18:06:46 -08:00
Mark Otto 04161a8c75 more derp 2014-01-09 18:05:04 -08:00
Mark Otto 1c66664bed Merge pull request #12175 from waynn/patch-3
use periods for consistency in each line
2014-01-09 14:28:27 -08:00
Chris Rebert 82eccef7e3 mixins.less: fix typo in comment 2014-01-09 13:45:10 -08:00
Waynn Lue cba9d81340 use periods for consistency in each line 2014-01-09 12:22:31 -08:00
Chris Rebert 6645e5daad Merge pull request #12174 from ZDroid/absolute-urls
Use absolute instead of relative URLs
2014-01-09 11:54:56 -08:00
Zlatan Vasović 8c85e1b5a3 Use absolute instead of relative URLs 2014-01-09 20:33:13 +01:00
Chris Rebert fc62379e61 grunt dist 2014-01-09 11:11:13 -08:00
Chris Rebert 1276503754 Merge pull request #12164 from thomaswelton/issue-12162
Fix value of svg font ID & removed hard coding
2014-01-09 11:07:42 -08:00
Chris Rebert 1fc68c3560 Merge pull request #12163 from ZDroid/wrong-paths
Update paths in bower.json
2014-01-09 09:59:30 -08:00
Chris Rebert 4896141121 Merge pull request #12160 from waynn/patch-2
missing a period after "Twitter, Inc"
2014-01-09 09:56:07 -08:00
Zlatan Vasović 431c544fbc Update paths in bower.json
- Replace `*.html`, `docs/assets` and `examples` with `docs` (new directory)
- Instead of `_*`, it's just `_config.yml`, without regex (speeds up bower download a few milliseconds)
2014-01-09 11:20:23 +01:00
thomaswelton 04ba67d6f1 Add new varaible @icon-font-svg-id and set it to be the correct SVG font ID, used new variable in glyphicons.less 2014-01-09 10:16:27 +00:00
Waynn Lue f116106bf6 missing a period after "Twitter, Inc" 2014-01-09 00:11:01 -08:00
Chris Rebert 7ba6daabfe bump grunt-contrib-jade to v0.9.1 2014-01-08 21:15:37 -08:00
Chris Rebert 29547a2102 JSHint is on crack?
Linting docs/grunt/bs-raw-files-generator.js ...ERROR
[L3:C5] W079: Redefinition of 'btoa'.
var btoa = require('btoa')
2014-01-08 18:45:40 -08:00
Chris Rebert 8a10bd5231 grunt build-customizer 2014-01-08 18:39:45 -08:00
Chris Rebert 72ff8ff9fb grunt dist 2014-01-08 18:39:08 -08:00
Chris Rebert 9443044606 Merge pull request #11158 from twbs/templated-customizer
Autogenerate the customizer's variables form
2014-01-08 18:36:32 -08:00
Chris Rebert db829f8620 add support for '//===' for <h3>s in bs-lessdoc 2014-01-08 12:41:51 -08:00
Chris Rebert 39861714a8 Use JS & Jade to generate the customizer variables form HTML from variables.less; fixes #11095
also updates variables file organization (courtesy @mdo)
2014-01-08 12:41:51 -08:00
Chris Rebert c9ba678b9f JSCS can be dumb sometimes 2014-01-08 12:37:10 -08:00
Chris Rebert 1736bcb05c Merge pull request #12150 from twbs/extract-from-gruntfile
cleanup Gruntfile by extracting executable code
2014-01-08 11:01:03 -08:00
Julian Thilo 24c16d9904 Merge pull request #12155 from Dudytz/master
updated path docs-assets to docs/assets
2014-01-08 08:20:18 -08:00
Eduardo 9f0afd57f0 updated path docs-assets to docs/assets 2014-01-08 16:43:56 +01:00
XhmikosR d06d61dc12 Use single quotes in the jqueryCheck too. 2014-01-08 13:41:17 +02:00
XhmikosR d7bf9372ec Remove extra newline from banner. 2014-01-08 13:41:17 +02:00
XhmikosR 016d573a80 Use the docs banner for all the docs generated files. 2014-01-08 13:41:17 +02:00
XhmikosR 9b71314fd8 Turn advanced optimizations off until it's fixed in clean-css. 2014-01-08 13:41:17 +02:00
XhmikosR f00bbdd994 Minify docs CSS too. 2014-01-08 13:41:17 +02:00
XhmikosR ebf7807985 docs-assets: concatenate and minify all javascript files. 2014-01-08 13:41:16 +02:00
Mark Otto 692eb554aa Merge pull request #12151 from wangsai/no-preboot
no preboot
2014-01-08 00:52:51 -08:00
wangsai 7e16425acb no preboot 2014-01-08 16:22:50 +08:00
Chris Rebert d7a128c636 extract glyphicons.yml generator out of Gruntfile into separate module 2014-01-07 22:34:09 -08:00
Chris Rebert d1c29af591 extract raw-files.js generator out of Gruntfile into separate module 2014-01-07 22:16:52 -08:00
Chris Rebert b67fc6906a Merge pull request #12149 from twbs/bump-grunt-contrib-less
bump grunt-contrib-less to v0.9.0
2014-01-07 20:05:09 -08:00
Chris Rebert 9ae5d321b5 bump grunt-contrib-less to v0.9.0 2014-01-07 19:50:58 -08:00
Chris Rebert a712abd06e enable CSSLint in test suite; fixes #12094 2014-01-07 19:34:49 -08:00
Chris Rebert c891be5e5f adjust filename to indicate that customize JS is minified 2014-01-07 19:10:31 -08:00
Chris Rebert ef7bf0abf8 grunt dist build-customizer 2014-01-07 19:05:29 -08:00
Chris Rebert c635d8f547 have customizer output Bootstrap Theme too; fixes #12003 2014-01-07 18:57:15 -08:00
Chris Rebert 07309edce5 make customizer compilation code more generic 2014-01-07 18:55:13 -08:00
Chris Rebert bf5017c01c fix #12143 2014-01-07 17:08:40 -08:00
Chris Rebert 9eab6ffd1c Merge pull request #12147 from ZDroid/double
Drop redundant 'the'
2014-01-07 14:02:45 -08:00
Zlatan Vasović ec594887fe Drop redundant 'the' 2014-01-07 22:40:23 +01:00
Julian Thilo 8fd177bfa7 Fix #12073: Consistent order of variations
This changes the order of component variations throughout the repo (code and docs) to be more consistent.
The order now used everywhere is the one most frequently found in the repo before:
Default, Primary, Success, Info, Warning, Danger
2014-01-07 22:24:45 +01:00
Chris Rebert 5f328dce88 Merge pull request #12057 from ZDroid/nl
'use strict' on new line
2014-01-07 00:31:27 -08:00
Chris Rebert 5e39e6c9d0 Merge pull request #12135 from leoj3n/patch-2
Improve wording in CONTRIBUTING.md
2014-01-07 00:27:54 -08:00
Joel Kuzmarski 3661c4b8ff Improve wording in CONTRIBUTING.md
Parts of the "Pull requests" section are strangely worded.

This commit fixes that.
2014-01-07 02:11:07 -06:00
Chris Rebert 0a09dd46cb Merge pull request #12133 from leoj3n/patch-1
Fix bad anchor link in CONTRIBUTING.md
2014-01-06 23:55:17 -08:00
Joel Kuzmarski 483974695c Fix bad anchor link in CONTRIBUTING.md
Hey look, I'm contributing to CONTRIBUTING.md!

This anchor must have been overlooked while updating the docs in a previous commit. Expected behavior: scroll the document to a linked section. Experienced behavior: nada.

This proposed file change renames the anchor text from `coding conventions` to `coding guidelines` and changes the anchor link from `#code-conventions` to `#code-guidelines`.
2014-01-07 01:45:33 -06:00
Julian Thilo 158a2394a2 Merge branch 'master' of https://github.com/twbs/bootstrap 2014-01-07 01:30:16 +01:00
Julian Thilo 8d903fbd02 duh, missed one more file
X-Ref: https://github.com/twbs/bootstrap/commit/7fcfe61f4da41356b2ae974ad20536db0d74e83f
2014-01-07 01:27:49 +01:00
Julian Thilo c42b6a3f8b missed a file
X-Ref: https://github.com/twbs/bootstrap/commit/7fcfe61f4da41356b2ae974ad20536db0d74e83f
2014-01-07 01:22:13 +01:00
Julian Thilo 7fcfe61f4d Update copyright notices in all places
- Implements new format "Copyright 2011-xxxx Twitter, Inc.", which resonates well with our History page and more accurately reflects the copyright status of the repo
- grunt dist to update all the files
2014-01-07 01:05:24 +01:00
Mark Otto f389111e68 justify text 2014-01-06 09:26:08 -08:00
Mark Otto 99338caed0 Merge pull request #12125 from juniorconte/input-block-level
notes from .input-block-level
2014-01-06 09:14:44 -08:00
juniorconte 7722ab5566 notes from .input-block-level 2014-01-06 11:41:15 -02:00
Chris Rebert aed56fc0a6 New Year 2014-01-05 23:45:15 -08:00
Chris Rebert bbe5041cbf Merge pull request #12116 from twbs/pacify-csslint
make CSSLint happier
2014-01-05 23:44:17 -08:00
Mark Otto a5e29a8f34 link 2014-01-05 23:43:13 -08:00
Mark Otto 745bec59cf Move homepage examples to data file 2014-01-05 23:37:14 -08:00
Mark Otto 9421f0af82 Merge branch 'master' into docs_derp
Conflicts:
	docs/_layouts/default.html
	docs/_layouts/home.html
2014-01-05 23:23:55 -08:00
Mark Otto 5b7f508c60 Merge pull request #12107 from twbs/same-footer-links
harmonize footer links on homepage & docs pages
2014-01-05 23:21:11 -08:00
Mark Otto 3e54be9ae6 Merge branch 'master' into docs_derp
Conflicts:
	docs/components.html
2014-01-05 23:19:34 -08:00
Chris Rebert 422bdc50f9 Merge pull request #12118 from wangsai/fix-out-container
fix the paragraph outside of '.bs-docs-section'
2014-01-05 22:54:01 -08:00
wangsai ed8ef84597 fix the paragraph outside of '.bs-docs-section' 2014-01-06 14:39:09 +08:00
Chris Rebert 9fa2c95d78 make CSSLint happier; refs #12094 2014-01-05 21:29:26 -08:00
Mark Otto 0593a20638 grammarghhhhhhhhhhhh 2014-01-05 20:54:31 -08:00
Mark Otto 12dacee313 copy 2014-01-05 20:53:40 -08:00
Chris Rebert 938bc12c58 add /docs/assets JS to JSCS Grunt task config 2014-01-05 20:52:37 -08:00
Mark Otto 34566f4934 Merge pull request #12115 from Quy/master
Delete reference to a non-existent class
2014-01-05 20:16:17 -08:00
Quy Ton c613143638 Delete reference to a non-existent class 2014-01-05 20:08:37 -08:00
Chris Rebert 7653b845f8 Merge pull request #12082 from kevinsawicki/use-dollar-instead-of-jquery
Use $ instead of jQuery
2014-01-05 18:06:55 -08:00
Mark Otto 78e6036c68 Merge branch 'master' into docs_derp 2014-01-05 17:50:07 -08:00
Mark Otto ed5c7baaf1 Merge branch 'master' into docs_derp 2014-01-05 17:49:40 -08:00
Mark Otto 990303ab54 Merge pull request #12110 from twbs/one-control-per-input-group
document single .form-control per .input-group limitation
2014-01-05 15:57:33 -08:00
Chris Rebert 6684005f63 document single .form-control per .input-group limitation; fixes #12109 2014-01-05 14:44:48 -08:00
Chris Rebert 5fc434c5f1 harmonize footer links on homepage & docs pages 2014-01-05 13:45:56 -08:00
Mark Otto 1d0bf580c9 Use mix of medium and small grid clases on dashboard example 2014-01-05 13:26:15 -08:00
Mark Otto 9af8692307 Merge pull request #12105 from twbs/navbar-containers
add .container(-fluid) to remaining navbar examples
2014-01-05 13:19:49 -08:00
Chris Rebert ae255447f2 add .container(-fluid) to remaining navbar examples for consistency/accuracy
follow-up to 93a4d6cc5e
2014-01-05 12:55:03 -08:00
Chris Rebert 41257fe794 Merge pull request #12104 from ghoullier/master
Replace getElementsByTag with querySelector in IE10 Mobile viewport JS snippet
2014-01-05 11:47:00 -08:00
Gregory HOULLIER a53cf55be2 Replace getElementsByTag by querySelector for IE10 Mobile plateform. 2014-01-05 20:15:48 +01:00
Chris Rebert 711d0b8337 Merge pull request #12099 from Quy/master
Fix typos
2014-01-05 08:52:16 -08:00
Quy Ton 3e92ab0149 Fix typos 2014-01-05 08:38:32 -08:00
Chris Rebert c7eac32d3e Merge pull request #12098 from ZDroid/reorg
Group repo vars together in Jekyll config
2014-01-05 08:05:40 -08:00
Chris Rebert 055705741e Merge pull request #12097 from ZDroid/deprecated
Replace @screen-sm with @screen-sm-min
2014-01-05 08:01:55 -08:00
Zlatan Vasović f63cd94e43 Reorganize vars 2014-01-05 11:51:49 +01:00
Zlatan Vasović 78eb8cc0f4 Replace @screen-sm with @screen-sm-min 2014-01-05 11:38:26 +01:00
Chris Rebert b9d779a73c Merge pull request #12095 from Quy/master
Fix typo
2014-01-04 21:43:25 -08:00
Quy Ton 82ed81fddf Fix typo 2014-01-04 21:35:06 -08:00
Mark Otto 72d4fafd66 Merge pull request #12092 from Quy/master
Use relative URLs and fix anchor links
2014-01-04 19:31:52 -08:00
Chris Rebert 7ca113b487 Merge pull request #12090 from nschonni/patch-2
Quote Node 0.10 so correct version is printed
2014-01-04 12:20:38 -08:00
Quy Ton a617c805f2 Fix anchor links 2014-01-04 09:28:56 -08:00
Quy Ton 11f56bbb7b Use relative URLs 2014-01-04 09:10:02 -08:00
Nick Schonning 8662323cd5 Quote Node 0.10 so correct version is printed 2014-01-04 10:46:05 -05:00
Chris Rebert 84c33a822d Replace lingering page.url instance with site.baseurl
Refs #12083 & #12037
2014-01-03 16:19:20 -08:00
Kevin Sawicki 5141e4da10 Use $ instead of jQuery 2014-01-03 14:39:18 -08:00
Mark Otto 0b75e2d738 Merge branch 'master' into docs_derp 2014-01-03 13:18:12 -08:00
Chris Rebert 007d61cfad flip order so sentence reads better 2014-01-03 12:29:45 -08:00
Chris Rebert 56b5f5b353 de-emphasize /docs/assets and docs HTML now that they're outside of the root dir 2014-01-03 12:21:38 -08:00
Chris Rebert 096a72d897 Merge pull request #12081 from Quy/master
Update source code download structure
2014-01-03 12:14:20 -08:00
Quy Ton 63df2ced6e Update source code download structure 2014-01-03 11:42:27 -08:00
Julian Thilo 71688061b4 Merge pull request #12080 from Quy/master
Refer to popovers instead of tooltips.
2014-01-03 11:04:14 -08:00
Quy Ton a53779d020 Refer to popovers instead of tooltips. 2014-01-03 10:55:06 -08:00
Mark Otto 9f44f17057 updates to homepage 2014-01-02 10:54:10 -08:00
Mark Otto 60e6e7d4fb Merge pull request #12063 from ZDroid/tc
Drop trailling comma
2014-01-02 10:52:43 -08:00
Zlatan Vasović 0cc4fe6ee3 Drop trailling comma
No need for it.
2014-01-02 15:46:13 +01:00
Mark Otto 70459c1454 Merge branch 'master' into docs_derp
Conflicts:
	docs/_includes/footer.html
	docs/assets/css/docs.css
2014-01-01 12:27:09 -08:00
Mark Otto c583b79655 Merge pull request #12055 from wangsai/fix-assets-links-of-examples
fix assets links in all examples
2014-01-01 12:02:28 -08:00
Julian Thilo 8113717363 Merge pull request #12056 from ZDroid/ny
New Year
2014-01-01 09:45:50 -08:00
Zlatan Vasović 0f060e7bc4 'use strict' on new line 2014-01-01 15:42:41 +01:00
Zlatan Vasović 1c83d68ca4 New Year 2014-01-01 15:37:08 +01:00
wangsai e4508bb37c fix assets links in all examples 2014-01-01 22:29:13 +08:00
Mark Otto 50cf0b1a9d Update Gruntfile.js to copy 'dist/' files to 'docs/dist/' with 'grunt dist' task; Fixes #12030: navbar toggle focus state 2013-12-31 18:23:10 -08:00
Mark Otto 83d26de6d5 Fix broken JS 2013-12-31 17:47:16 -08:00
Mark Otto bab240252a Merge branch 'master' into docs_derp 2013-12-31 13:57:43 -08:00
Mark Otto e3aa358696 derp 2013-12-31 13:57:35 -08:00
Mark Otto 905adb5b83 fix homepage images 2013-12-31 13:56:20 -08:00
Mark Otto b253cb2c1e Merge branch 'master' into docs_derp
Conflicts:
	_config.yml
	docs/_includes/footer.html
	docs/_includes/nav-main.html
	docs/_includes/old-bs-docs.html
	docs/_layouts/default.html
	docs/_layouts/home.html
	docs/getting-started.html
	docs/index.html
2013-12-31 13:53:33 -08:00
Mark Otto 8812856de1 Merge pull request #12037 from twbs/docs_dir
Bring back the `/docs` directory
2013-12-31 13:43:32 -08:00
Mark Otto 05cc208333 Merge branch 'master' into docs_dir 2013-12-31 13:43:11 -08:00
Mark Otto ac3f48bb19 Fixes #12046: move .csscomb.json and .csslintrc to less/ folder 2013-12-31 13:16:28 -08:00
Mark Otto 295736aff2 Merge pull request #12049 from ZDroid/update-de
Update dependencies (again)
2013-12-31 12:57:55 -08:00
Mark Otto 78e1af58d6 typo 2013-12-31 11:57:44 -08:00
Mark Otto b43371cd0a @nschonni's feedback <3 2013-12-31 11:38:32 -08:00
Mark Otto 1e4540f11b @cvrebert's feedback 2013-12-31 10:51:39 -08:00
Mark Otto 0df96d8c32 Merge branch 'master' into docs_dir 2013-12-31 10:38:31 -08:00
Zlatan Vasović 17fb7aee2d Update dependencies (again) 2013-12-31 19:20:57 +01:00
Chris Rebert a1b5458073 Merge pull request #12043 from supergibbs/fixed_typo_in_customize.html
Fixed typo
2013-12-29 23:26:57 -08:00
Supergibbs df16f9f123 Fixed typo 2013-12-29 23:16:41 -08:00
Chris Rebert 6ecdb31009 Sauce now supports latest Firefox on OS X Mavericks 2013-12-29 21:15:29 -08:00
Chris Rebert 0fe777b271 default to latest Firefox version on OS X 2013-12-29 21:13:56 -08:00
Chris Rebert 0e412dc1a3 fix capitalization of iOS 2013-12-29 20:45:36 -08:00
Chris Rebert 7f20eff44d Merge pull request #12041 from twbs/mv-sauce-into-infra
mv sauce_browsers.yml out of the project root
2013-12-29 20:29:44 -08:00
Chris Rebert 990c2392e5 mv sauce_browsers.yml out of the project root 2013-12-29 20:25:40 -08:00
fat d18ba50837 add note about ios dropdown compat 2013-12-29 19:40:31 -08:00
fat 1fea9656b6 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-29 19:25:24 -08:00
Chris Rebert 3d3e2f2553 Merge pull request #12036 from ZDroid/grunt-fs-minify
Merge two fs variable declarations into one
2013-12-29 19:23:57 -08:00
fat 2a0b99104c Merge branch 'dropdown-aria-roles' of git://github.com/plumlee/bootstrap into plumlee-dropdown-aria-roles
Conflicts:
	js/dropdown.js
2013-12-29 19:23:15 -08:00
fat 8a62f21113 fixes #11379 - Fix carousel this.sliding not getting reset if $next.hasClass('active') 2013-12-29 19:01:32 -08:00
fat 76f0d0ff32 fixes #11373 - adds related target to dropdown events 2013-12-29 18:57:22 -08:00
fat 162d9e1776 Merge branch 'scrollspy-speedy-scroll-top' of git://github.com/ziogaschr/bootstrap into ziogaschr-scrollspy-speedy-scroll-top
Conflicts:
	dist/js/bootstrap.min.js
2013-12-29 18:04:43 -08:00
fat 9d73d9c38c Merge branch 'master' of github.com:twbs/bootstrap 2013-12-29 17:54:40 -08:00
fat ce4a2e4352 fixes #11288 - Vertical scroll position of modal saves between openings 2013-12-29 17:53:59 -08:00
Mark Otto 70b8b330f0 no more page.base_url 2013-12-28 23:08:46 -08:00
Mark Otto f10cf21a8f Streamline copy process by not bringing over full files into docs/dist/, only take minified ones 2013-12-28 23:05:02 -08:00
Mark Otto a9c829bc0c Rearrange repository contents because muahahahahahaha 2013-12-28 22:47:03 -08:00
Jacob ea40e7999d Merge pull request #11203 from jasny/patch-1
Scrollspy acting up when targets are hidden
2013-12-28 22:06:26 -08:00
fat 5bf13914e4 fixes #10658 jQuery Popover content loses bound events on second setContent call. 2013-12-28 20:59:45 -08:00
Mark Otto 6405442e66 drop the title 2013-12-28 18:47:32 -08:00
Mark Otto 068010409b Merge pull request #12035 from tomByrer/master
fixed .clearfix example, + doc link
2013-12-28 18:46:36 -08:00
Zlatan Vasović 0016b508cb Merge two fs variable declarations into one
One is enough.
2013-12-28 23:33:32 +01:00
tomByrer 120dce43e8 fixed .clearfix example, + doc link 2013-12-28 12:01:32 -07:00
Mark Otto 9e1153d049 spacing 2013-12-27 16:44:00 -08:00
Mark Otto adab81ddcd Merge branch 'master' into docs_derp 2013-12-27 16:41:33 -08:00
Mark Otto a2aaf80c7e grunt on last merge 2013-12-27 16:41:25 -08:00
Mark Otto 84326a3e59 big brand update 2013-12-27 14:04:44 -08:00
Mark Otto 140d24c8fb Merge pull request #12028 from moshevds/deprecated-screen-md
Small fix: I noticed the use of a deprecated variable.
2013-12-27 12:40:02 -08:00
Môshe van der Sterre dd9c5fdb08 Small fix: I noticed the use of a deprecated variable. This seems to be the only occurrence. 2013-12-27 21:27:51 +01:00
Mark Otto 87288da72c more nav changes 2013-12-26 22:03:37 -08:00
Mark Otto a73767e518 the final frontier 2013-12-26 21:49:40 -08:00
Mark Otto 5b02dbd97a Merge branch 'master' into docs_derp
Conflicts:
	_config.yml
2013-12-26 21:40:15 -08:00
fat 201088cb5f update accordion-group to panel 2013-12-26 20:33:44 -08:00
fat c595db19ff fixes #10911 - add loading event for use with remote option :| 2013-12-26 20:26:27 -08:00
fat 499cca2115 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-26 19:40:41 -08:00
fat d21369c1ed fixes #10890 2013-12-26 19:40:18 -08:00
Mark Otto d43eb0a513 less fun to address #12008 2013-12-26 19:37:19 -08:00
Mark Otto ca7498faa0 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-26 19:08:34 -08:00
Mark Otto 567dc12e86 Fixes #12012: Use correct banner in docs js 2013-12-26 19:08:19 -08:00
fat cd0ad94aae rebuild 2013-12-26 18:30:16 -08:00
fat 3c73904e17 update tool/pop destroy placement 2013-12-26 18:27:43 -08:00
Jacob 6baf266cda Merge pull request #10761 from jochenberger/dont-create-tooltip-for-destroy
don't create new Tooltip/Popover objects just to destroy them immediately
2013-12-26 18:25:29 -08:00
fat 39091b0748 nope 2013-12-26 18:18:53 -08:00
Jacob bf3c525d05 Merge pull request #11496 from satazor/patch-1
Clear timeout on destroy.
2013-12-26 18:18:09 -08:00
fat 34fb5767cb fixes #10798 2013-12-26 17:53:31 -08:00
Jacob 37bfd8fa60 Merge pull request #10801 from Travesty3/master
Add 'collapse' class back after expanding
2013-12-26 17:50:41 -08:00
Jacob bea46fca70 Merge pull request #10834 from Prinzhorn/master
Only preventDefault on click on [data-toggle="modal"] when the element is a link
2013-12-26 17:46:59 -08:00
Chris Rebert 0bcc5a2814 add Python indentation style to editorconfig; refs #12023 2013-12-26 13:44:27 -08:00
Chris Rebert be6ad3fda0 Merge pull request #12009 from ZDroid/no-utf8-py
Replace UTF-8 characters in s3_cache.py with ASCII characters
2013-12-26 13:28:22 -08:00
Chris Rebert e0268c32cb Merge pull request #12022 from ZDroid/update-deps
Update dependencies
2013-12-26 13:16:13 -08:00
Zlatan Vasović 2426a2aeef Update dependencies
Updates grunt-html-validation and grunt-jekyll dependencies.
2013-12-26 21:55:55 +01:00
Mark Otto d8e4c1578d Merge pull request #12010 from ZDroid/wrong-indent
Fix wrong indent in .jscs.json
2013-12-26 12:54:23 -08:00
Chris Rebert e4b036d278 Merge pull request #12021 from XhmikosR/master
Add docs-assets/css/docs.css to csslint too.
2013-12-26 12:32:34 -08:00
Julian Thilo 1e938f1781 Merge pull request #12019 from XhmikosR/badge
Change david-dm theme to make README badges uniform
2013-12-26 10:58:23 -08:00
Chris Rebert 1e6ae57575 Merge pull request #12020 from XhmikosR/package
Update dependencies.
2013-12-26 10:52:38 -08:00
XhmikosR b590b268ad Update dependencies. 2013-12-26 19:54:04 +02:00
XhmikosR 5cb8510a81 README.md: switch to the shields.io dependency badges theme. 2013-12-26 19:52:39 +02:00
XhmikosR 5eab9cbe82 Add docs-assets/css/docs.css to csslint too. 2013-12-26 19:49:33 +02:00
fat fc7049b18f fixes #10675 2013-12-25 20:33:05 -08:00
fat 3161acd710 build js 2013-12-25 20:04:49 -08:00
fat c25fa0661a Merge branch 'tooltip-events-fix' of git://github.com/lukaszfiszer/bootstrap into lukaszfiszer-tooltip-events-fix
Conflicts:
	js/tooltip.js
2013-12-25 20:03:28 -08:00
Zlatan Vasović 1e05029d1a Fix wrong indent in .jscs.json 2013-12-25 20:22:52 +01:00
Zlatan Vasović d381771f6a Replace UTF-8 characters in s3_cache.py with ASCII characters 2013-12-25 20:19:59 +01:00
Mark Otto 3fdde76b74 don't be repetitive on homepage 2013-12-25 14:32:00 +02:00
Mark Otto e29a3b65cd Merge branch 'master' of github.com:twbs/bootstrap 2014-01-22 15:37:11 -06:00
Mark Otto d1f69d4a7e scope styles to masthead, not homepage 2014-01-22 15:37:05 -06:00
fat dffd4ffad2 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-24 17:00:55 -08:00
fat 394e0fa611 fixes #11788 - focusin focusout instead of focus/blur 2013-12-24 17:00:34 -08:00
Jacob 0fab6e7ea7 Merge pull request #11722 from DocX/patch-1
Use document scroll height instead of offset height
2013-12-24 16:43:24 -08:00
fat d9266aee96 add docs for affix events 2013-12-24 16:37:53 -08:00
fat c77740bd3a fixes #11720 - Add events trigger to affix 2013-12-24 16:29:51 -08:00
fat 073f8c049d Merge branch 'master' of github.com:twbs/bootstrap 2013-12-24 13:43:47 -08:00
fat f689a26a1c note for #10486 add note about data-toggle dropdown dependency 2013-12-24 13:43:09 -08:00
Jacob 139b395dfb Merge pull request #10359 from ixti/patch-1
Pass $element to offset top/bottom calc funcs
2013-12-24 13:21:19 -08:00
fat a93a753c7d fixes #10134 – dont use jquery offset directly because it uses sub pixel rendering 2013-12-24 13:07:42 -08:00
fat fe7fffe034 Merge branch 'slide-event-reset' of git://github.com/Rowno/bootstrap into Rowno-slide-event-reset
Conflicts:
	js/tests/unit/carousel.js
2013-12-24 12:50:55 -08:00
fat 0a75e4c09b fixes #10283 2013-12-24 12:40:24 -08:00
fat 558b6a478d Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	dist/js/bootstrap.min.js
	docs-assets/js/raw-files.js
2013-12-24 12:35:24 -08:00
fat 50bd4edb8c fixes #10236
if affixed top add scrollTop to it position.top
calculate and cache pinnedoffset independent of scrolling for initial load
2013-12-24 12:32:06 -08:00
Mark Otto 1da3a8c6b1 Merge pull request #12001 from soundarapandian/fix_typo_contributing
Use correct directory name for bootstrap contribution
2013-12-24 12:24:07 -08:00
Mark Otto 04ec4354ed don't roll back that comment 2013-12-24 12:18:53 -08:00
Mark Otto 5c2dfbf33b Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	docs-assets/js/raw-files.js
2013-12-24 12:17:48 -08:00
Mark Otto 679c786237 roll back version numbers to avoid broken links in docs and readme (fixes #12000) 2013-12-24 12:16:17 -08:00
Gleb Mazovetskiy 25390716ea Reflect sass readme change in css.html 2013-12-24 17:20:52 +01:00
soundarapandian 8b564f9e32 Use correct directory name for bootstrap contribution 2013-12-24 16:05:19 +05:30
Jacob 237b85a7c1 Merge pull request #11933 from twbs/fat-10105
change where modal loads content -– fixes #10105, #9318, #9459
2013-12-23 23:31:11 -08:00
fat fe839e6e78 change where modal loads content -– fixes #10105, #9318, #9459 2013-12-23 23:30:06 -08:00
Mark Otto 52a964d19b Merge pull request #11999 from XhmikosR/respond.js
Update Respond.js
2013-12-23 23:26:05 -08:00
XhmikosR 3d65fc2b65 Update Respond.js to v1.4.2. 2013-12-24 09:22:53 +02:00
fat 1fc08c1973 fixes #10568 - kill hoverstate info once command has been executed 2013-12-23 22:57:39 -08:00
fat a87b150bc7 fixes #10205 Scrollspy Doesn't Support Chinese ID Targets http://mathiasbynens.be/notes/html5-id-class 2013-12-23 22:08:43 -08:00
Mark Otto 71e9db4183 add callout about justified button group borders to address #11964 2013-12-23 20:28:21 -08:00
Mark Otto 340e2f5534 Merge pull request #11970 from supergibbs/Better_10492_fix
Fixes #10492 better
2013-12-23 18:53:30 -08:00
Supergibbs f3ce6a9696 Fixes #10492 better:
- Made more generic. Applies to "> .table" and "> .table-responsive > .table" to support td/tr background colors too and not just .table-striped
- Supports tfoot
2013-12-23 16:07:55 -08:00
Mark Otto 0bd5bca695 Fixes #11975: Change from png to .ico for favicon 2013-12-23 15:16:25 -08:00
Mark Otto 37bc0c230d Merge branch 'master' of github.com:twbs/bootstrap 2013-12-23 13:26:01 -08:00
Mark Otto 4376ce8466 Upgrade to CSScomb 1.2.1 and reset some ordering to ensure no rogue spaces 2013-12-23 13:25:51 -08:00
Mark Otto 00850e247c Merge pull request #11989 from ZDroid/banner
Improve banner
2013-12-23 12:42:41 -08:00
Zlatan Vasović 608926e808 Improve banner 2013-12-23 18:02:42 +01:00
Mark Otto f32796559a Merge pull request #11978 from XhmikosR/clean-up-_gh-pages
Jekyll: exclude more files/folders.
2013-12-22 23:15:35 -08:00
Mark Otto 96b5ae8b6a grunt 2013-12-22 22:32:35 -08:00
Mark Otto 6fda30e1c4 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-22 22:31:28 -08:00
Mark Otto 9fc0e20381 Fixes #10492 and some of #11970: round the proper corner on table cells in panels 2013-12-22 22:31:13 -08:00
Mark Otto 45a8a9508e Merge pull request #11974 from XhmikosR/meta
Normalize meta
2013-12-22 22:20:23 -08:00
Mark Otto 90ba7fa836 Merge pull request #11972 from XhmikosR/comma
Get rid of JSHint's `laxcomma` option now that the comma is used on the ...
2013-12-22 22:08:33 -08:00
Mark Otto b505c8557d fixes #11961: dropdown alignment docs improvements 2013-12-22 22:07:01 -08:00
Mark Otto 6cde19fc33 Merge pull request #11963 from twbs/sass_docs
Add docs for Sass port
2013-12-22 21:47:11 -08:00
Mark Otto fd15b00861 space 2013-12-22 21:42:08 -08:00
Mark Otto 8bc6aeb60a add what's included 2013-12-22 21:27:12 -08:00
Mark Otto 906b0c595b Merge branch 'master' into sass_docs 2013-12-22 21:23:24 -08:00
Mark Otto cb7cdd0c05 Revert to CSScomb 1.1.0 because 1.2.0 and 1.2.1 fuck up our compiled CSS 2013-12-22 21:18:45 -08:00
Mark Otto ec13eb8d38 Remove timestamp on generated Glyhpicons 2013-12-22 21:05:08 -08:00
Mark Otto 7ccb0333e4 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-22 21:01:00 -08:00
Mark Otto 51628d2050 grunt 2013-12-22 21:00:53 -08:00
Mark Otto 146800ef43 Merge pull request #11979 from ZDroid/fix-old-links
Fix old links
2013-12-22 17:30:35 -08:00
Chris Rebert fa2380758e Merge pull request #11982 from ZDroid/update-deps
Update dependencies
2013-12-22 12:23:52 -08:00
Zlatan Vasović 88c3619d2c Update dependencies 2013-12-22 19:01:00 +01:00
Zlatan Vasović 28adcbe439 Fix old links
Replace recess with less.
2013-12-22 16:26:05 +01:00
XhmikosR ea5a4ec31e Jekyll: exclude more files/folders.
We still can't exclude `./fonts/" and "./js/" due to https://github.com/jekyll/jekyll/issues/906
2013-12-22 11:45:18 +02:00
XhmikosR a05a11e5dc Get rid of JSHint's laxcomma option now that the comma is used on the right side. 2013-12-22 09:02:08 +02:00
XhmikosR b27fecb7a3 bower.json: sort by name. 2013-12-22 08:59:36 +02:00
XhmikosR 29aaf66a8a Normalize package.json. 2013-12-22 08:59:36 +02:00
XhmikosR 6e3ac8f2a4 js/.jscs.json: sort by name. 2013-12-22 08:59:36 +02:00
Mark Otto 12980e7ea4 link homepage sass and less 2013-12-21 13:42:10 -08:00
Mark Otto 176e35d33d rework downloads to simplify and add sass 2013-12-21 13:40:42 -08:00
Mark Otto 16ff01f629 remove dat 2013-12-21 11:17:39 -08:00
Mark Otto 02c40ab991 Merge branch 'master' into docs_derp
Conflicts:
	_layouts/default.html
	components.html
2013-12-21 11:17:29 -08:00
Mark Otto c66924cc1b add section for contents 2013-12-21 10:36:20 -08:00
Mark Otto 2f56922937 config url 2013-12-21 10:09:39 -08:00
Mark Otto bb644eede6 Team members on About page 2013-12-21 10:08:04 -08:00
Mark Otto 86e6c869a3 remove some unintional code 2013-12-21 09:59:24 -08:00
Mark Otto 0c49f846e3 Merge branch 'master' into sass_docs 2013-12-21 09:45:47 -08:00
Mark Otto 5f9695ae7c readme typo from #11965 2013-12-21 09:36:51 -08:00
Mark Otto b734a2a435 Merge pull request #11965 from tomByrer/md-tweaks
condenced README CONTRIB changes
2013-12-21 09:36:18 -08:00
tomByrer c84688fc4f https://github.com/twbs/bootstrap/pull/11950#issuecomment-31033824 2013-12-21 09:39:34 -07:00
Mark Otto 033476ccc7 more Less 2013-12-20 21:19:45 -08:00
Mark Otto 66c280c855 Sass docs; LESS to Less because fuck caps 2013-12-20 21:02:25 -08:00
Mark Otto 810c7ec4f8 Merge pull request #11956 from tlindig/tl_pagination_customizing
add new variables for "pagination" to improve support of customizing
2013-12-20 12:29:49 -08:00
Mark Otto e1bd300f2f Merge pull request #11960 from ZDroid/no-leading-commas-json
Drop remaining leading commas
2013-12-20 11:18:04 -08:00
Zlatan Vasović b604c2fbac Drop remaining leading commas 2013-12-20 20:09:51 +01:00
Mark Otto f1d4a3bb5c Merge pull request #11959 from ZDroid/update-grunt-csscomb
Update grunt-csscomb dependency
2013-12-20 11:08:39 -08:00
Zlatan Vasović e95c396f44 Update grunt-csscomb dependency
Per David DM.
2013-12-20 19:59:18 +01:00
Tobias Lindig 7f599cedf3 add new variables for "pagination" to improve support of customizing 2013-12-20 17:06:53 +01:00
Mark Otto 2854c5c3fb Fixes #11952: Refactor blockquote styles
* Deprecate .pull-right class for .blockquote-reverse
* Move font-size change to the parent, blockquote, instead of setting on the p element to allow more flexible content
2013-12-19 19:40:08 -08:00
Mark Otto 81b1e6801f correct jsbin link 2013-12-19 19:28:22 -08:00
Chris Rebert 2c5e5b23e1 Merge pull request #11951 from bnewcomb/master
Fix sentence grammar
2013-12-19 19:10:16 -08:00
Ben Newcomb 2e0337a61b Minor grammar change
'as well' was used twice in sentence
2013-12-19 18:57:43 -08:00
Mark Otto 523eca14e8 Merge pull request #11930 from ssorallen/master
Write Glyphicons to _data, generate Glyphicons markup
2013-12-19 15:03:43 -08:00
Mark Otto 4a01acaf67 Merge pull request #11941 from ZDroid/left-plus
No leading pluses
2013-12-19 14:06:01 -08:00
Mark Otto caadd72084 Merge pull request #11939 from ZDroid/weird-indents
2 instead of 4 spaces in .csscomb.json
2013-12-19 14:05:19 -08:00
Chris Rebert 2898e73ec4 "Thosing" [sic] => "Those" 2013-12-19 11:39:57 -08:00
Julian Thilo fc03fac9e4 Fix sentence in css.html 2013-12-19 20:12:31 +01:00
Julian Thilo b298d2f481 Merge pull request #11945 from robertgentel/patch-1
Update css.html
2013-12-19 10:56:36 -08:00
robertgentel ded1e72202 Update css.html
Documentation (missing word)
2013-12-19 11:06:45 -06:00
Zlatan Vasović 1bf5abab31 No leading pluses 2013-12-19 15:32:37 +01:00
Zlatan Vasović 9201ccd08b 2 instead of 4 spaces in .csscomb.json 2013-12-19 13:11:05 +01:00
Chris Rebert fb8310fbc6 Merge pull request #11936 from KostyaTretyak/patch-1
Deleted curly brackets (in css.html)
2013-12-19 01:23:10 -08:00
kostyatretyak 09c7870971 Deleted curly brackets (in css.html) 2013-12-19 11:07:56 +02:00
Chris Rebert 85ba12932f Merge pull request #11935 from tlindig/tl_fix_typo_modal-open
Docu: typo fix: replaced 'model-open' with 'modal-open'
2013-12-19 00:30:04 -08:00
Tobias Lindig 50f1bc47ec typo fix: replaced 'model-open' with 'modal-open' 2013-12-19 09:09:04 +01:00
Chris Rebert 091146ee73 Merge pull request #11934 from twbs/auto-latest-browsers
omit versions in Sauce browser config; no explicit version implies latest
2013-12-18 23:39:03 -08:00
Chris Rebert fbb0e8b146 omit versions in Sauce browser config; no explicit version implies latest version 2013-12-18 23:29:52 -08:00
Mark Otto edbd1a81e0 Merge pull request #11932 from dzwillia/th-td-position-static
Added position: static to table th and td when using grid classes for sizing
2013-12-18 21:41:19 -08:00
fat 22f9767714 check that href id's are followed by valid char – fixes #10044 2013-12-18 21:14:01 -08:00
dzwillia d9586e2863 Added position: static to table th and td. 2013-12-19 00:10:58 -05:00
Ross Allen b048ea545f Write Glyphicons to _data, generate Glyphicons markup
This generates a glyphicons.yml file from the glyphicons.less source,
and then components.html uses that data to generate the Glyphicons docs
by iterating through the data. The _data directory was introduced in
Jekyll 1.3.0, and GitHub Pages is already on [version 1.4.2][1].

Fixes #11862.

[1] https://github.com/github/pages-gem/blob/master/github-pages.gemspec#L16
2013-12-18 20:15:51 -08:00
Mark Otto 87727370e0 Merge pull request #11929 from twbs/maintainers
mention core team maintenance & community contributors
2013-12-18 19:04:18 -08:00
Chris Rebert 07da1d731a mention core team maintenance & community contributors 2013-12-18 18:54:07 -08:00
Mark Otto 4eaa297e68 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-18 17:34:40 -08:00
Mark Otto b59b37bc2c Fixes #11918: Fork the @h5bp contributing guidelines and combine with our coding guidelines 2013-12-18 17:34:30 -08:00
Mark Otto b8810fb75d Fixes 2013-12-18 17:32:52 -08:00
Mark Otto 171c4b7fc4 fixes #11447: add docs warning about loading once for remote modal option 2013-12-18 16:56:41 -08:00
Chris Rebert 08854cf8a6 using templating doesn't seem to work there; hardcode license URL instead
Tested the customizer, the generated zip had:
    css/bootstrap.css:line 6: * Licensed under MIT (<%= _.pluck(pkg.licenses, "url").join(", ") %>)
Revised customizer generates:
    css/bootstrap.css:line 4: * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
2013-12-18 16:25:23 -08:00
Mark Otto 07705673b6 Merge branch 'master' into docs_derp
Conflicts:
	_layouts/default.html
2013-12-18 16:19:46 -08:00
Chris Rebert fe7c7ccf29 rebuild minified customizer JS so it reflects the licensing change 2013-12-18 15:50:59 -08:00
Mark Otto 3315d4d9f4 license in customizer 2013-12-18 15:35:24 -08:00
Chris Rebert df3716647d update licensing header in JS files & run grunt 2013-12-18 15:29:19 -08:00
Mark Otto 766bf50b88 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-18 15:26:17 -08:00
Mark Otto ccc894361f update license faqs for apache 2013-12-18 15:26:07 -08:00
Chris Rebert 5428523a37 cleanup licensing section more 2013-12-18 15:16:29 -08:00
Mark Otto 922cd046ef grunt after that carousel merge 2013-12-18 15:13:50 -08:00
Mark Otto 1bb0001189 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-18 15:12:51 -08:00
Mark Otto 27697ef7e3 another apache mention 2013-12-18 15:12:30 -08:00
Mark Otto 629a4743f0 remove license readme mention 2013-12-18 15:08:38 -08:00
Mark Otto 40651cf1ea more license mentions 2013-12-18 15:08:16 -08:00
Mark Otto b9ca65ebe7 Merge pull request #11416 from danielboendergaard/carousel-duration
Carousel: Use the transition duration from CSS
2013-12-18 15:01:47 -08:00
Mark Otto e8e60ae4bc version bump 2013-12-18 14:56:08 -08:00
Mark Otto cb40a2ee8c Punt Apache license information and stick with MIT 2013-12-18 14:54:24 -08:00
Mark Otto f29132350c grunt 2013-12-18 14:52:50 -08:00
Mark Otto af2c6de6d5 Merge pull request #11928 from twbs/we_have_to_go_back_kate
Follow up to reverted commits
2013-12-18 14:49:05 -08:00
Mark Otto 56c36346c1 drop the the, it's cleaner 2013-12-18 14:38:10 -08:00
Mark Otto 79e97fef40 derp 2013-12-18 14:37:30 -08:00
Mark Otto 324f6ca562 buttons should be more mixin friendly 2013-12-18 14:29:33 -08:00
Mark Otto ab740f0f0f navbars need to use prefixed nav class or they won't work as expected 2013-12-18 14:28:03 -08:00
Mark Otto 3416e87a97 restore inline block on breadcrumbs and ensure proper code formatting for readibility 2013-12-18 14:27:21 -08:00
Mark Otto 961687e4db run grunt dist 2013-12-18 14:26:37 -08:00
Mark Otto 0a955844ab rewrite readme to restore lost information, only with a bit more formatting consistency 2013-12-18 14:24:59 -08:00
Mark Otto 8598c700f5 Merge pull request #11927 from twbs/revert_commits
Revert commits
2013-12-18 14:21:35 -08:00
Julian Thilo 2b312bf3c1 Revert commits
Bootstrap is being relicensed from Apache 2.0 to MIT so that more of our community can use the free and open source software we lovely create together. As commits are copyright their original authors, the commits of any individual not agreeing to relicense their contributions are being removed to be later rewritten by the @twbs/team.

This undoes the changes introduced by the following commits:
https://github.com/twbs/bootstrap/commit/7ea34ae0ef79c793e9a9d393b4eef825b71e84b5 , https://github.com/twbs/bootstrap/commit/7376eef378fe7d5e69b8b8cce93c7c64b751d55a , https://github.com/twbs/bootstrap/commit/303ba1326bbe367598ab4cc063b4607507208e56 , https://github.com/twbs/bootstrap/commit/7d1c8c2a0ce16331583a965821690f7715e62908 , https://github.com/twbs/bootstrap/commit/11319f6da9f9a19ec40743cdfe868ac732698149 , https://github.com/twbs/bootstrap/commit/110fc8860117d8675345806219ba313b18086db2 , https://github.com/twbs/bootstrap/commit/ced08f69359f3a70771804a98fa3c499f388cc74
2013-12-18 22:58:13 +01:00
Mark Otto bc265ac647 callout colors 2013-12-18 13:52:39 -08:00
Mark Otto 1d0aa6e45c more docs 2013-12-18 13:40:29 -08:00
Mark Otto d87e70fd49 footer alignment 2013-12-18 13:13:27 -08:00
Mark Otto 5bba874467 Merge branch 'master' into docs_derp 2013-12-18 13:06:47 -08:00
Mark Otto 3f577ab86c Merge pull request #11881 from ZDroid/patch-1
Require comma on left side
2013-12-18 13:01:43 -08:00
Mark Otto ee709db679 Merge pull request #11804 from twbs/css-source-maps
enable CSS source maps in grunt-contrib-less
2013-12-18 12:57:38 -08:00
Chris Rebert c4b0684e65 fix typo 2013-12-18 11:45:30 -08:00
Mark Otto 6315043b1c Merge branch 'master' into docs_derp 2013-12-18 11:41:48 -08:00
Mark Otto c262e5b47c add source maps 2013-12-18 10:23:46 -08:00
Mark Otto 1bc8607bdf Merge branch 'master' into css-source-maps
Conflicts:
	Gruntfile.js
2013-12-18 10:22:18 -08:00
Mark Otto d15218a09c Fixes #11899: Ensure proper margins and .small/small usage for heading tags (e.g., .h1-.h6) 2013-12-18 09:49:05 -08:00
Mark Otto 0d0b5c7ddb add inline note about navbar sizing 2013-12-18 09:48:04 -08:00
Mark Otto c1f68dd4d4 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-18 09:42:45 -08:00
Mark Otto 8142493b42 fixes #11925: cover template for firefox 2013-12-18 09:42:37 -08:00
Mark Otto b93d6dfbdf tweaks 2013-12-18 09:42:13 -08:00
Chris Rebert 671fb7020b Merge pull request #11923 from wangsai/fix-id
fix href of "Browser and device support"
2013-12-18 01:05:48 -08:00
wangsai 98ef4284f0 fix href of "Browser and device support" 2013-12-18 16:57:55 +08:00
Mark Otto 91fdd89100 Merge pull request #11910 from InWayOpenSource/btn-group-inside-input-group-btn
Fix handling of .btn-group placed inside .input-group-btn
2013-12-17 22:49:55 -08:00
Chris Rebert 36e3311b3e Merge pull request #11916 from ZDroid/fix-iversions
Downgrade Safari and OS X
2013-12-17 11:46:54 -08:00
Zlatan Vasović 575f29cee1 Downgrade Safari and OS X 2013-12-17 20:39:32 +01:00
Chris Rebert dcfe710fa4 enable failHard grunt-html-validation option; fixes #11876 2013-12-17 01:35:16 -08:00
Chris Rebert af1afb10bd upgrade to grunt-html-validation v0.1.11 2013-12-17 01:29:19 -08:00
Sebastian Podjasek ae640d4f1c Fix handling of btn-group placed inside input-group-btn (used for mixing dropdowns with normal buttons) 2013-12-16 22:56:28 +01:00
Zlatan Vasović ba3639b202 Require comma on left side 2013-12-16 18:06:31 +01:00
Chris Rebert 94635eb972 Merge pull request #11893 from twbs/separate-browsers-file
move Sauce test browsers list out of Gruntfile into separate file
2013-12-16 00:43:21 -08:00
Chris Rebert 0f72123c43 move Sauce test browsers list out of Gruntfile into separate file 2013-12-16 00:42:45 -08:00
Mark Otto b6b2c90a7d Merge branch 'master' into docs_derp 2013-12-16 00:39:50 -08:00
Chris Rebert 2ae39d7166 Merge pull request #11891 from twbs/cache-jekyll-bundle
use S3-cached Jekyll install to further speed up the Travis build
2013-12-16 00:02:42 -08:00
Chris Rebert 498f00a244 use S3-cached Jekyll install 2013-12-15 23:52:44 -08:00
Mark Otto ec261a83a5 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-15 22:10:05 -08:00
Mark Otto ca14b9652c inform the people that fixed positioning ain't all it's cracked up to be /cc #11888 2013-12-15 22:09:45 -08:00
Mark Otto 05b0a74d9a Merge pull request #11887 from twbs/minor-panels-refactor
minor refactoring of 4ee93c9f85
2013-12-15 22:04:57 -08:00
Chris Rebert 6bb73df50e Merge pull request #11890 from twbs/generic-caching
make S3 caching significantly more generic
2013-12-15 21:26:52 -08:00
Chris Rebert 95c72b573e make S3 caching significantly more generic 2013-12-15 21:12:33 -08:00
Chris Rebert 637b20f6d5 minor refactoring of 4ee93c9f85 2013-12-15 20:56:23 -08:00
Chris Rebert 75db355073 Merge pull request #11886 from twbs/html-validator-config
explicitly set more HTML5 validator options
2013-12-15 19:45:34 -08:00
Chris Rebert 43c3d785ef explicitly set more HTML5 validator options 2013-12-15 19:42:47 -08:00
Chris Rebert 94bdea0054 use unique IDs for input feedback examples so HTML validates 2013-12-15 19:15:26 -08:00
Chris Rebert f8cee54f4b use unique IDs for modal labels in doc examples so HTML validates 2013-12-15 19:07:26 -08:00
Chris Rebert 4db1d69e98 simplify JS snippet slightly 2013-12-15 19:00:37 -08:00
Chris Rebert a2f7c3015e fix typo in docs 2013-12-15 18:45:56 -08:00
Chris Rebert 023731b4c7 fix var name in example to follow JS conventions 2013-12-15 18:19:10 -08:00
Chris Rebert be508e043c copyediting 2013-12-15 18:13:50 -08:00
Mark Otto 4ee93c9f85 Fixes #10492 again, this time for last row's corners on striped tables 2013-12-15 17:22:55 -08:00
Mark Otto 2979e4bcea Add new form feedback states, clean up existing form styles
New stuff:

* Adds `.has-feedback` and `.form-control-feedback` to show icon-based
form feedback to users. Fixes #11836.
* Removes the `width: 1em` on `.glyphicon` because it makes it
impractical to resize the width of all icons, even if they’re not
“empty” (e.g., a simple `.glyphicon { width: 30px; }` wouldn’t work,
nor would a class preceeded by a parent class.

Clean up:

* Sets `width: auto;` on all `.form-control`s within inline forms.
* Removes all the inline `select` menu `width` styles because all
inputs are now `auto`.
* Update form states docs to separate out sections better.
2013-12-15 17:15:09 -08:00
Mark Otto d9345ff7d5 Fixes #11266: Apply a pixel-based line-height to date inputs for iOS 7 2013-12-15 15:27:46 -08:00
Mark Otto 4f22670c6e formatting and comment 2013-12-15 15:24:52 -08:00
Mark Otto d1f15baa71 Merge branch 'master' into pr/11817
Conflicts:
	dist/css/bootstrap.min.css
	less/input-groups.less
2013-12-15 15:07:38 -08:00
Mark Otto b04a1de9b0 Fixes #11402: Updated fix for select.form-control width in inline-forms 2013-12-15 14:52:49 -08:00
Mark Otto 24eee65c25 grunt 2013-12-15 14:32:14 -08:00
Mark Otto 6bc7126643 Merge pull request #11494 from blowsie/patch-2
Fixed single dropdown-toggle in btn-group-veritcal not being rounded
2013-12-15 14:28:49 -08:00
Mark Otto 393d523cdb Fixes #11660: Depcreate small and .small in blockquote in favor of footer 2013-12-15 14:23:55 -08:00
Mark Otto 9023c087db Merge branch 'master' of github.com:twbs/bootstrap 2013-12-15 14:14:32 -08:00
Mark Otto f5c13a3e1b revert an earlier change to move the component-animations.less file because it fubared modal backdrop .fade usage 2013-12-15 14:14:09 -08:00
Mark Otto f6fe62cdf7 run grunt on modal scrolling change 2013-12-15 14:13:25 -08:00
Mark Otto 122245fe87 Merge branch 'master' into pr/11676
Conflicts:
	less/modals.less
2013-12-15 14:10:48 -08:00
Mark Otto 55f6beb427 Merge branch 'master' into pr/11776
Conflicts:
	package.json
2013-12-15 14:09:50 -08:00
Mark Otto e7a56df5a2 Merge pull request #11732 from dak/include-dev-fonts-in-bower
Don't exclude fonts from bower installs
2013-12-15 14:07:17 -08:00
Mark Otto 56eecf97ac Merge branch 'master' of github.com:twbs/bootstrap 2013-12-15 13:53:41 -08:00
Mark Otto ee80b5e1d4 typo 2013-12-15 13:52:56 -08:00
Mark Otto f126411735 Merge pull request #11840 from ZDroid/pagination-boom
Improve pager customization
2013-12-15 13:46:11 -08:00
Mark Otto 93a4d6cc5e Fixes #11783: Document requirement of .container(-fluid) in navbars 2013-12-15 13:44:26 -08:00
Mark Otto 540677c42a Fixes #11795: Update the contributing guidelines to include some more CSS guidelines 2013-12-15 13:39:45 -08:00
Mark Otto a13d459491 Clarify number of columns in nested grid 2013-12-15 13:08:17 -08:00
Mark Otto d57e81d06d Fixes #11799: Mention support of number of add-ons in docs 2013-12-15 12:41:47 -08:00
Mark Otto c7c9929c12 Fixes #11770: Move component-animations.less to the utility section of import list to match Customizer 2013-12-15 12:31:40 -08:00
Mark Otto a925a0b985 Browser/device support docs update
* Fixes #11055: add mention of select menu styling on Android stock
browsers with included optional fix
* Update IDs and docs nav to include bookmark links to each section
* Add callout to navbar docs about fixed position, inputs, and virtual
keyboard
2013-12-15 12:27:46 -08:00
Mark Otto cb3d9dfe83 Fixes #11833: add warning to docs for popover multiple line positioning; update it's docs with example markup, too 2013-12-15 11:44:16 -08:00
Mark Otto 1264cb7140 update tooltip docs 2013-12-15 11:41:46 -08:00
Mark Otto 61ec569211 Fixes #11805 with docs mention of navbar 2013-12-15 11:36:16 -08:00
Mark Otto f60b8169c6 finalize blog template 2013-12-15 11:33:06 -08:00
Mark Otto a7029edc61 Restyle the blockquote to not thin text or change line-height 2013-12-15 11:29:58 -08:00
Mark Otto fd62247bf8 Merge branch 'master' into cover_template 2013-12-15 11:16:57 -08:00
Mark Otto 2b86e05a61 Change variable 2013-12-15 11:09:03 -08:00
Mark Otto bc261ecc52 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-15 11:02:45 -08:00
Mark Otto a319ec5b7d Fixes #11829: Adds .make-xs-column mixins 2013-12-15 11:02:32 -08:00
Mark Otto 2ea370f93b Merge pull request #11861 from freeman/master
Issue #11852 : create a new variable for the list group active item link...
2013-12-15 10:59:23 -08:00
Mark Otto 9a8e619543 Fixes #11871: commas last 2013-12-15 10:57:11 -08:00
Mark Otto ad782ff89a comments and spacing 2013-12-15 10:53:53 -08:00
Mark Otto 8c13565e3c Merge branch 'master' of github.com:twbs/bootstrap 2013-12-15 10:39:12 -08:00
Mark Otto 82c52a7e9d Fixes #11801: use correct variables for grid containers 2013-12-15 10:38:54 -08:00
Mark Otto ca7fd08646 Merge pull request #11879 from ZDroid/wrong-variable
Fix wrong variable name
2013-12-15 10:28:32 -08:00
Zlatan Vasović ae170a5930 Fix wrong variable name 2013-12-15 11:47:23 +01:00
Mark Otto 168469f545 Fixes #11588: Scope font-size to only p elements in a .jumbotron and remove the supersized line-height from the base class 2013-12-14 21:50:47 -08:00
Mark Otto 647e9eb0f1 Fixes #11555: Add @tooltip-opacity variable 2013-12-14 21:43:08 -08:00
Mark Otto 072ccd4dda Fixes #11572: Add contextual background-color classes to match text classes; move both sets of classes to Helper Classes section of the CSS docs 2013-12-14 21:40:16 -08:00
Mark Otto 67b536ea51 change class name 2013-12-14 21:25:57 -08:00
Mark Otto bcc2c8b09e Merge branch 'master' of github.com:twbs/bootstrap 2013-12-14 20:04:52 -08:00
Mark Otto 432b9f9cde Fixes #11561: Add float: left; to .form-control within input groups to prevent IE9 from screwing up placeholder text and select menu arrows 2013-12-14 20:04:12 -08:00
Chris Rebert c243e2417e Merge pull request #11864 from twbs/parallelize-build
parallelize Travis using build matrix & test subsuites
2013-12-14 19:40:28 -08:00
Mark Otto 4da03c83c5 correct bookmark prefix 2013-12-14 19:31:20 -08:00
Mark Otto 88a8669656 document #11326 2013-12-14 19:31:03 -08:00
Chris Rebert 39a2dab722 parallelize Travis using build matrix & test subsuites 2013-12-14 19:11:04 -08:00
Mark Otto e98c2dc3ad Merge pull request #11326 from ZDroid/animations
Add `.animation-*()` mixins
2013-12-14 18:58:41 -08:00
Mark Otto 35dd6b9fd7 Merge pull request #10704 from XhmikosR/various
rm unused vars
2013-12-14 18:55:25 -08:00
Mark Otto 46c3d27468 Merge branch 'master' into pr/11435
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.min.css
2013-12-14 16:56:56 -08:00
Mark Otto 4c64c1eecd Merge branch 'master' into pr/11302
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.min.css
2013-12-14 16:46:40 -08:00
Mark Otto d79431ca02 Document new modal sizes 2013-12-14 16:29:55 -08:00
Mark Otto 323a40cc53 Merge branch 'master' into pr/11162
Conflicts:
	less/modals.less
2013-12-14 16:29:47 -08:00
Mark Otto 83c60ef3ee Merge branch 'master' into pr/11107
Conflicts:
	docs-assets/js/raw-files.js
2013-12-14 16:20:19 -08:00
Mark Otto 4afcebe0e7 Merge pull request #11286 from BBosman/well-border
Add well-border variable
2013-12-14 16:17:41 -08:00
Mark Otto 544b8ecab7 Fixes #10921: Add support for input groups within button toolbars
* Floats any `.input-group` within a toolbar
* Simplifies the CSS to remove sibling selectors and instead use a
negative amrgin on the parent with only `margin-left`

See it in action: http://jsbin.com/aGEcUqAT/1/.
2013-12-14 16:03:21 -08:00
Mark Otto fd4130534f mention lack of support for split button dropdowns in vertical button groups 2013-12-14 15:56:01 -08:00
Mark Otto a54dbfdf2a Merge branch 'master' into pr/10951
Conflicts:
	dist/css/bootstrap.min.css
	less/modals.less
2013-12-14 15:38:21 -08:00
Mark Otto f1869771bc Fixes #10505: Document more of LESS vars and mixins 2013-12-14 14:18:43 -08:00
Mark Otto 85316c8a0c Merge branch 'master' of github.com:twbs/bootstrap 2013-12-14 13:23:25 -08:00
Mark Otto 11c6ab767c Fixes #10370: Improved and deprecated dropdown menu alignment options
* Removes an old pair of selectors that didn’t properly target the
right-aligned navbar alignment of dropdown menus.
* Deprecates the `.pull-right` alignment in favor of a more specific
and unique class name.
* Adds `.dropdown-menu-right` as the new alignment class. This is then
mixin-ed into the `.navbar-right.navbar-nav` dropdown menus for
auto-alignment.
* To override that auto-alignment, use `.dropdown-menu-left` as needed.
2013-12-14 13:22:56 -08:00
Chris Rebert 9e50078321 Merge pull request #11878 from ZDroid/patch-1
Add `try` and `catch` to keywords
2013-12-14 13:13:24 -08:00
Zlatan Vasović 7f6cf5e50c Add try and catch to keywords 2013-12-14 21:57:59 +01:00
Mark Otto 914f5e6a1d Fixes #11867: Add @panel-body-padding variable 2013-12-14 11:44:54 -08:00
Mark Otto ecc6f4e6bc Merge branch 'master' into pr/11868
Conflicts:
	dist/css/bootstrap.min.css
2013-12-14 11:36:54 -08:00
Mark Otto 22820d7151 Fixes #10495: Float Glyphicon and set margins in .navbar-brand to ensure there is no added height because wtf even is CSS 2013-12-13 23:06:04 -08:00
Chris Rebert ce07ff84cd Merge pull request #11869 from twbs/cache-node_modules
use S3-based node_modules caching
2013-12-13 17:35:39 -08:00
Chris Rebert 6b6b059ac3 time all the things 2013-12-13 17:22:46 -08:00
Chris Rebert 42697a4ecb use S3-based node_modules caching 2013-12-13 17:20:32 -08:00
Chris Rebert de6b9e9df1 Merge pull request #11874 from ZDroid/hotfix
';' isn't needed
2013-12-13 14:31:15 -08:00
Zlatan Vasović e3d799fca3 ';' isn't needed 2013-12-13 23:15:02 +01:00
Tobias Lindig 37b2c8a812 add dist files. 2013-12-13 12:27:56 +01:00
Tobias Lindig b7bf212995 use @zindex-modal for .modal and @zindex-modal-background for .modal-backdrop.
removed z-index for .modal-dialog, it was not necessary because the parent element (.modal) already has a z-index.
2013-12-13 12:24:20 +01:00
Mark Otto 5f9ecc7351 -ms-transform is for IE9 only, IE10+ don't require it 2013-12-12 23:01:11 -08:00
Mark Otto 0e6d34f24f Merge pull request #11819 from janpanschab/ms-transform-origin
Transform-origin mixin for IE
2013-12-12 22:59:08 -08:00
Chris Rebert 2d693def43 Merge pull request #11863 from twbs/update-osx
Sauce tests: update to later browsers supported by OS X 10.9
2013-12-12 22:16:31 -08:00
Chris Rebert 56d89ed7ae Sauce tests: update to later browsers supported by OS X 10.9 2013-12-12 21:58:44 -08:00
Mark Otto 0cb570724d quotes 2013-12-12 18:10:58 -08:00
Mark Otto d2d2f77ffe text update 2013-12-12 15:21:49 -08:00
Mark Otto 885d14b042 move icons to partial 2013-12-12 15:21:34 -08:00
Mark Otto d704bf0a52 just column width, not max 2013-12-12 14:59:25 -08:00
Mark Otto 0b4efcda90 more docs homepage cleanup 2013-12-12 14:57:43 -08:00
mrasscha ce39cbe6fa Issue #11852 : create a new variable for the list group active item link text. 2013-12-12 20:48:08 +01:00
Mark Otto f8a78d7de7 homepage images 2013-12-12 10:28:43 -08:00
Mark Otto da24a3e118 typo 2013-12-12 10:28:37 -08:00
Chris Rebert 730ccd2a20 Merge pull request #11859 from dzwillia/add_dropdown_caret_color
Add @dropdown-caret-color variable back to variables.less
2013-12-12 10:02:53 -08:00
dzwillia 4b47c60835 Added @dropdown-caret-color variable back to variables.less (deprecated) 2013-12-12 12:53:59 -05:00
Mark Otto 4fc2907723 Merge branch 'master' into docs_derp
Conflicts:
	docs-assets/css/docs.css
	docs-assets/js/application.js
2013-12-11 22:39:03 -08:00
Mark Otto 0e8baab34a more homepage and sidenav overhaul 2013-12-11 22:37:59 -08:00
Mark Otto fbf31f965e Add new template, Cover 2013-12-11 16:45:41 -08:00
Mark Otto 9966d035cd Merge branch 'master' of github.com:twbs/bootstrap 2013-12-11 10:52:55 -08:00
Mark Otto a3a2525124 Fixes #11837: grid containers are fixed width now, no longer max-width 2013-12-11 10:52:47 -08:00
Mark Otto bdd0890c0f Merge pull request #11841 from ZDroid/breadcrumbs
Use variables for breadcrumb padding
2013-12-11 10:48:51 -08:00
Mark Otto 5ec2b4b255 Merge pull request #11839 from XhmikosR/readme
Clarify Windows workarounds.
2013-12-11 10:47:54 -08:00
Zlatan Vasović 2547f1e20f Use variables for breadcrumb padding 2013-12-11 14:36:26 +01:00
Zlatan Vasović 27859f6b8f Improve pager customization 2013-12-11 14:25:21 +01:00
Chris Rebert f3077ee424 Merge pull request #11838 from XhmikosR/customizer
customizer.js: Remove a workaround for older less.js.
2013-12-11 03:53:44 -08:00
XhmikosR caa3d53dcb customizer.js: remove a workaround for older less.js. 2013-12-11 13:27:23 +02:00
XhmikosR 6355832e90 Clarify Windows workarounds. 2013-12-11 12:57:18 +02:00
Mark Otto 2bc08190ec Combine updates to Windows Jekyll stuff 2013-12-10 19:43:52 -08:00
Mark Otto f32ef36daf Merge pull request #11830 from XhmikosR/jekyll-windows
Update Jekyll on Windows info
2013-12-10 19:40:51 -08:00
Mark Otto 352b6883e9 Merge pull request #11832 from twbs/run_jekyll_on_windows
Help Windows users install Jekyll
2013-12-10 19:40:31 -08:00
Julian Thilo 1d56211653 Help Windows users install Jekyll 2013-12-11 00:13:02 +01:00
XhmikosR b9f12a5637 README.md: mention an alternative workaround for the jekyll issue on Windows. 2013-12-11 00:06:25 +02:00
XhmikosR fc3e7433c2 Update README.md.
Mention that Python needs to be in PATH for Pygments to work and thus jekyll not fail.
2013-12-11 00:06:25 +02:00
Scott Plumlee bbe551044c Allow listbox AIRA role on dropdown component. 2013-12-10 14:17:32 -05:00
Mark Otto 1bce8c9301 Merge pull request #11818 from XhmikosR/less.js
Update less.js to v1.5.1.
2013-12-10 10:03:33 -08:00
Mark Otto 52c87b30a9 Merge pull request #11812 from tlindig/load_grunt_tasks
Build process: use module "load-grunt-tasks" to load grunt tasks
2013-12-10 10:02:01 -08:00
Jan Panschab 3e0366a3df transform origin mixin for explorer 2013-12-10 17:15:41 +01:00
XhmikosR 11180e0fa7 Update less.js to v1.5.1.
This fixes an error with `&:extend(.clearfix all)` when using the customizer.
2013-12-10 18:09:14 +02:00
Tobias Lindig 3b5e0c9a3c hide space characters in input-group-btn to fix segmented buttons double border 2013-12-10 16:47:12 +01:00
Tobias Lindig 3583aa2774 correct indentation 2013-12-10 14:47:50 +01:00
Tobias Lindig 9f12f840b9 Buildprocess: use module "load-grunt-tasks" to load grunt tasks directly from the package.json 2013-12-10 10:28:44 +01:00
XhmikosR 5749039f8d Remove unused variables. 2013-12-10 10:11:10 +02:00
Mark Otto a6b5c7db12 Merge pull request #11809 from twbs/enable-LESS-strictMath
enable strictMath in grunt-contrib-less config
2013-12-09 18:16:18 -08:00
Chris Rebert 95992ef7e9 enable strictMath in grunt-contrib-less config 2013-12-09 16:27:42 -08:00
Chris Rebert 28d8be1634 Merge pull request #11808 from twbs/strict-math-fixes
more LESS strictMath fixes
2013-12-09 16:20:26 -08:00
Chris Rebert ab29b1a335 misc strictMath compliance fixes 2013-12-09 16:14:44 -08:00
Chris Rebert 9664f8da58 add parens around arithmetic in recursive mixin calls to comply with LESS strictMath
<3 @seven-phases-max for helping to confirm & debug this
X-Ref: https://github.com/less/less.js/issues/1725
2013-12-09 16:02:24 -08:00
Chris Rebert 88d8cd90e2 Merge pull request #11807 from twbs/stricter-math
improve compliance with LESS's strictMath
2013-12-09 15:37:56 -08:00
Chris Rebert 10e74a94e6 improve compliance with LESS's strictMath 2013-12-09 15:35:13 -08:00
Chris Rebert 9e38e25534 enable CSS source maps in grunt-contrib-less 2013-12-09 14:29:19 -08:00
Mark Otto 25ec09f06a Merge pull request #11790 from twbs/drop_recess_for_less
Drop grunt-recess for grunt-contrib-less
2013-12-09 11:30:10 -08:00
Mark Otto d466d527a4 Undo merge of #11778 and use cleancss min option 2013-12-09 00:12:11 -08:00
Mark Otto b9b17bc72b grunt 2013-12-09 00:09:52 -08:00
Mark Otto de218bbba8 Merge branch 'pr/11779' into drop_recess_for_less
Conflicts:
	Gruntfile.js
	package.json
2013-12-08 23:56:22 -08:00
Mark Otto 7d4171ccd1 Merge pull request #11792 from twbs/list-group-nest
more nesting in .list-group-item-variant mixin
2013-12-08 23:55:03 -08:00
Mark Otto ea61a19a04 Merge branch 'pr/11778' into drop_recess_for_less
Conflicts:
	Gruntfile.js
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.min.css
2013-12-08 23:48:07 -08:00
Chris Rebert 9ceff60057 more nesting in .list-group-item-variant mixin 2013-12-08 23:34:24 -08:00
Mark Otto 0016c17f93 Switch to &:extend(.clearfix all) for clearfix mixin
Original discussion:
https://github.com/less/less.js/issues/1437#issuecomment-21383639.

Since we’re switching to `grunt-contrib-less`, we can take advantage of
newer LESS features than what RECESS supported. Included in that is the
ability to `:extend`, and not only that, but `:extend(.mixin-name
all)`. By doing so, we remove duplicate CSS for all our elements that
were being clearfix-ed.

Fixes #8947, #8968, #8991, #9257, #9268, #9291, #9430, #9604, #9686,
#9929, #10731, #10793, #11305, #11498, #11533, #11570, #11604, #11652.

(dem issues, tho)
2013-12-08 23:18:28 -08:00
Mark Otto 2a4621b71f Merge branch 'master' into drop_recess_for_less
Conflicts:
	dist/css/bootstrap.min.css
2013-12-08 23:00:01 -08:00
Mark Otto e4c1ef7c6d more closely align property order with recess 2013-12-08 22:55:09 -08:00
Mark Otto 0991c7c341 specify block indent as numeral to prevent fubared media query output 2013-12-08 22:33:24 -08:00
Mark Otto e90ce1c0d5 single array == no rogue spaces 2013-12-08 22:32:07 -08:00
Mark Otto 4540f9e2d2 derp, don't sort min /cc @cvrebert 2013-12-08 22:16:43 -08:00
Mark Otto aae9c2d136 merge, compile 2013-12-08 22:11:46 -08:00
Chris Rebert dbe95f027d fixups to csscomb grunt task 2013-12-08 20:46:12 -08:00
Mark Otto 6df909ad9b Fixes #11786: Nest media queries within print utilities for mixin-friendliness 2013-12-08 19:19:06 -08:00
Mark Otto 6b55e93570 adding json 2013-12-08 19:17:43 -08:00
Mark Otto f1cb57c8c2 restore original options value 2013-12-08 19:12:37 -08:00
Mark Otto c0200426ee Drop grunt-recess for grunt-contrib-less & co 2013-12-08 19:09:27 -08:00
Mark Otto 768f8b00f3 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-08 17:50:26 -08:00
Chris Rebert ae0d48057e fix #11787: document stateful button JS 2013-12-08 17:42:59 -08:00
Mark Otto cdb7d9839e grunt 2013-12-08 17:21:37 -08:00
Mark Otto b98d6ed12b Merge branch 'master' of github.com:twbs/bootstrap 2013-12-08 17:19:45 -08:00
Mark Otto e1247e3edc Match customizer banner to Gruntfile banner 2013-12-08 17:17:51 -08:00
Mark Otto 997a1f4ed2 fix dependency mapping of buttons and button-groups in customizer 2013-12-08 17:17:04 -08:00
Chris Rebert 1f35b6ec5c fix <button>s with .btn but missing accompanying .btn-* 2013-12-08 17:15:26 -08:00
Julian Thilo bab736c7d7 Fix typo in new author meta tag 2013-12-08 22:39:29 +01:00
Mark Otto 5eeaf114cc Merge pull request #11780 from ZDroid/grunt-dev
Don't ignore Gruntfile, it's required for compile
2013-12-08 10:47:24 -08:00
Zlatan Vasović a5d9b358ab Don't ignore Gruntfile, it's required for compile 2013-12-08 13:36:52 +01:00
XhmikosR cbfbf1b2dd Add csslint support. 2013-12-08 13:23:25 +02:00
XhmikosR fdc5d1dc34 Minify css with clean-css. 2013-12-08 13:05:10 +02:00
Zlatan Vasović 77bc82d486 Add .animation-*() mixins 2013-12-08 11:54:04 +01:00
Mark Otto b5613c9af5 Merge pull request #10709 from XhmikosR/quotes
Quotes
2013-12-08 02:52:15 -08:00
XhmikosR eca8ff3803 Use single quotes consistently. 2013-12-08 12:44:14 +02:00
Zlatan Vasović 0c457d48f8 Drop redundant module import 2013-12-08 11:24:47 +01:00
Mark Otto ed63dfd8d3 Merge pull request #11739 from XhmikosR/lint-assets
Lint docs-assets/js/application.js and docs-assets/js/customizer.js.
2013-12-08 02:16:16 -08:00
Mark Otto e349fb2114 fix validation failure 2013-12-08 02:14:43 -08:00
Mark Otto 1f9bfa89dc Fixes #11741: Don't set headings font-family again, just use inherit 2013-12-08 02:14:24 -08:00
Mark Otto c37b710e85 Merge branch 'master' into pr/11744
Conflicts:
	dist/css/bootstrap.min.css
2013-12-08 02:00:37 -08:00
Mark Otto b5008ebf9c add vertical-align back to where it's necessary since we reset from block to inline-block on several inputs 2013-12-08 01:59:44 -08:00
Mark Otto e43e87b2f3 Merge pull request #11748 from bganicky/patch-1
Updated .scale() mixin so that it accepts optional vertical scale factor...
2013-12-08 01:49:38 -08:00
Mark Otto 12500047f9 Merge branch 'master' into pr/11750
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.min.css
2013-12-08 01:45:42 -08:00
Mark Otto 475bbd4d38 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-08 00:17:17 -08:00
Mark Otto d70f4e895c image compression 2013-12-07 23:49:03 -08:00
Mark Otto adf8209b9c Merge pull request #11772 from KostyaTretyak/correction
Fixed some errors in the docs javascript.html
2013-12-07 23:29:36 -08:00
Mark Otto 90cbfc76e4 Add new template, Cover 2013-12-07 23:23:41 -08:00
kostyatretyak 34070af4a3 Merge branch 'master' of https://github.com/twbs/bootstrap into correction 2013-12-08 09:13:22 +02:00
kostyatretyak 6145cc026d Fixed some errors in the docs javascript.html 2013-12-08 09:11:43 +02:00
Mark Otto 6273604601 Add .container-fluid variation for full-width containers and layouts
/cc #10711 #9862
2013-12-07 20:52:51 -08:00
Mark Otto 73bc7d9f12 Add new template, Dashboard 2013-12-07 20:51:25 -08:00
Mark Otto 5fdd917918 improve icon display on narrow devices 2013-12-07 16:28:29 -08:00
Mark Otto 5e6f9b9a37 prevent horizontal scroll on components 2013-12-07 16:22:43 -08:00
Mark Otto 74408de619 Shorter download text because narrow viewports 2013-12-07 16:22:00 -08:00
Mark Otto 0bf5202b92 Fixes #11729: Show code snippets on mobile views 2013-12-07 16:21:46 -08:00
Mark Otto 9edec7ed21 Fixes #11756: Mention document mode checking ability in IE comaptibility modes 2013-12-07 15:57:17 -08:00
Mark Otto a9b86cbfde Merge branch 'pr/11138'
Conflicts:
	dist/css/bootstrap.min.css
	dist/js/bootstrap.min.js
	docs-assets/js/raw-files.js
2013-12-07 14:10:41 -08:00
Mark Otto 07de53c644 Contextual list group cleanup
* Adds nav link to sidebar for contextual classes
* Refactors to use prefixed classes, like .list-group-item-info, instead of chained classes
* Adds default and linked variations to example in docs
2013-12-07 14:09:03 -08:00
Mark Otto a1f737b436 grunt dist after adding .text-justify 2013-12-07 12:19:17 -08:00
Mark Otto bfd8f8c83a Merge branch 'master' of github.com:twbs/bootstrap 2013-12-07 12:18:52 -08:00
Mark Otto b1215d1b2e Fixes #11193: Add kbd element styles to indicate user input via keyboard 2013-12-07 12:18:13 -08:00
Mark Otto a691d54436 Merge pull request #11675 from GraceNut/feature/text-justify
Added text-justify class to type.less
2013-12-07 11:58:31 -08:00
Mark Otto fe58357df1 Fixes #10884: Adds .info variant to contextual table classes 2013-12-07 11:56:35 -08:00
Mark Otto c07632e4e8 Reorder button and table variants for consistent order 2013-12-07 11:47:37 -08:00
Mark Otto 107b334d34 Fixes #11766: Use color var for background on badges in buttons to restore proper background to default button badge 2013-12-07 11:45:11 -08:00
Mark Otto 2b4fa90902 grunt dist 2013-12-07 11:44:32 -08:00
Mark Otto cc1f95652b Merge branch 'master' of github.com:twbs/bootstrap 2013-12-07 11:41:02 -08:00
Mark Otto 775c29fef6 Fixes #11764: Add meta data to docs for description, keywords, and authors 2013-12-07 11:40:08 -08:00
Mark Otto 94a5413ec7 Merge pull request #11757 from ZDroid/darken-toggle
Darken navbar toggle icon bar to meet WCAG
2013-12-07 11:34:03 -08:00
Mark Otto 4032dd0f26 grunt 2013-12-07 11:32:39 -08:00
Mark Otto 73da46c8bb Fixes #11760: Remove mailing list links from readme and about pages
Links are dead now since Google blacklisted the group for massive spam,
which they could be of no help in resolving. We’ll have a new official
forum for discussions soon folks <3.
2013-12-07 11:22:38 -08:00
Mark Otto 4b84acb9a4 Merge pull request #11765 from ZDroid/docs-min-js
Load minified Bootstrap JS code
2013-12-07 11:09:43 -08:00
Zlatan Vasović 8087f95ca4 Load minified Bootstrap JS code 2013-12-07 10:27:28 +01:00
Mark Otto b441632db1 Merge pull request #11761 from twbs/jscs
add JavaScript Code Style checker integration
2013-12-06 19:33:53 -08:00
XhmikosR 2fc2fe75bd Lint docs-assets/js/application.js and docs-assets/js/customizer.js. 2013-12-07 05:05:13 +02:00
XhmikosR f4087df47e Remove incompatible properties. 2013-12-07 04:52:20 +02:00
Chris Rebert c1dae1e13c integrate JSCS 2013-12-06 17:26:07 -08:00
Chris Rebert 351f86e1db fix some JS to pass jscs 2013-12-06 17:23:45 -08:00
Chris Rebert 4be126e014 Merge pull request #11745 from XhmikosR/function-spaces
Be consistent with function () spaces
2013-12-06 16:43:09 -08:00
Chris Rebert 650279f703 Merge pull request #11758 from ZDroid/rm-brstck-bower
Drop browserstack.json from bower.json ignore
2013-12-06 13:45:58 -08:00
Zlatan Vasović c78f3b2712 Drop browserstack.json from bower.json ignore 2013-12-06 22:45:17 +01:00
Zlatan Vasović 78b43d4c99 Darken icon bar to meet WCAG 2013-12-06 22:34:29 +01:00
Mark Otto 01a1c41d49 Merge pull request #11755 from twbs/track-customize-js
track customize.js so that customizer works on GitHub Pages site
2013-12-06 13:21:00 -08:00
Chris Rebert c545312bd6 need customize.js to be tracked for it to work on GitHub Pages
follow-up to #11738
2013-12-06 11:35:58 -08:00
Chris Rebert 2e9cde6fd9 grunt 2013-12-06 11:33:18 -08:00
Mark Otto dc34c8a206 Merge pull request #11738 from XhmikosR/min-assets
Minify docs-assets too.
2013-12-06 11:27:19 -08:00
Chris Rebert e90e602b53 Merge pull request #11742 from vincentchan/master
Added link to Bootstrap in French (in about.html)
2013-12-06 09:44:15 -08:00
Chris Rebert 5e8db4ad11 Merge pull request #11740 from XhmikosR/trailing-spaces
Remove trailing spaces
2013-12-06 09:42:39 -08:00
Luke Noel-Storr b92bee99ef reverted changes in commit 96109d3 which seemed to break conditional classes in striped tables (ignoring the comment above that the previous rules were needed for just this purpose)
fixes issue twbs/bootstrap#11728
2013-12-06 14:11:58 +00:00
Bohdan Ganicky 9ce7e5620c Updated .scale() mixin so that it accepts optional vertical scale factor parameter. 2013-12-06 14:09:55 +01:00
XhmikosR 5e2ef69e1c Use a space before functions' bracket consistently. 2013-12-06 12:43:48 +02:00
XhmikosR 4aad52797c Use a space after function consistently. 2013-12-06 12:43:48 +02:00
Vincent Chan b9ae594ca4 Adding Bootstrap in French 2013-12-06 18:33:20 +08:00
XhmikosR 68a6e57b15 bower.json: remove trailing spaces. 2013-12-06 11:32:57 +02:00
XhmikosR 3de4f23ea2 Minify docs-assets too. 2013-12-06 11:25:29 +02:00
Chris Rebert 7b06538c91 Merge pull request #11723 from stof/patch-1
Added the removal of tab-content and tab-pane in the migration guide
2013-12-05 16:53:15 -08:00
Chris Rebert 3b75d64767 Merge pull request #11733 from KostyaTretyak/edit
Fixed some errors in the documentation
2013-12-05 16:50:03 -08:00
kostyatretyak dde53a56e0 This is error? 2013-12-06 02:28:42 +02:00
Derek Kent b8b250a5d2 Don't exclude fonts from bower installs
Excluding fonts/ from bower installs causes glyphicons to be
unavailable to projects using development Bootstrap LESS files.
2013-12-05 19:05:32 -05:00
kostyatretyak 4ec13704d2 Fixed another small error 2013-12-06 02:03:35 +02:00
kostyatretyak 3ae7e0afe9 Merge branch 'master' of https://github.com/twbs/bootstrap into edit 2013-12-06 01:36:53 +02:00
Christophe Coevoet 813a4fafb6 Added the removal of tab-content and tab-pane in the migration guide 2013-12-05 17:45:22 +01:00
Mark Otto 6d03173a1a Merge pull request #11718 from KostyaTretyak/once
Added link to Ukrainian translation website (in about.html)
2013-12-05 08:09:10 -08:00
Lukáš Doležal 6e9efb2024 Use document scroll height instead of offset height to support body with absolute height 2013-12-05 16:28:31 +01:00
kostyatretyak c7e45fa4a7 Added links to Ukrainian translation website 2013-12-05 12:33:55 +02:00
Mark Otto aac4f0189e one last grunt 2013-12-04 22:54:03 -08:00
Mark Otto 0a5aa8e0a3 Merge pull request #11714 from ZDroid/redundant-comment
Remove redundant, duplicate comment
2013-12-04 22:52:12 -08:00
Zlatan Vasović 01afe84b31 Remove redundant, duplicate comment 2013-12-05 07:43:50 +01:00
Mark Otto b18d3fb80f Merge branch 'master' of github.com:twbs/bootstrap 2013-12-04 22:34:25 -08:00
Mark Otto 45930acdf7 Fixes #11610: Add @grid-float-breakpoint-max to better link navbar behavior across viewports and improve customization.
Also addresses #10371, #10395, and #10465.
2013-12-04 22:32:56 -08:00
Mark Otto 42bee1ddd5 Merge pull request #11671 from XhmikosR/updates
Update 3rd party asset libraries
2013-12-04 21:58:00 -08:00
Mark Otto cf81cb60ef Merge branch 'master' into gradient-prefix-cleanup
Conflicts:
	dist/css/bootstrap.min.css
	docs-assets/js/raw-files.js
2013-12-04 21:23:09 -08:00
Mark Otto 8c5dc542a5 grunt 2013-12-04 21:22:24 -08:00
Mark Otto a45d839874 Fixes #11712: Better support for .table-responsive within .panel's 2013-12-04 21:13:33 -08:00
Mark Otto 66f9c7d6d5 Fixes #11436: mention in docs that .container isn't nestable; update docs to mention width, not max-width 2013-12-04 21:10:13 -08:00
Mark Otto dd28ecd0d5 Merge pull request #11710 from JoahG/bootstrap-thumb
Updates Jumbotron thumbnail
2013-12-04 20:45:57 -08:00
Chris Rebert 02df15db56 Merge pull request #11709 from mdxs/patch-1
Dropping unused variable in dropdown.js
2013-12-04 10:50:50 -08:00
Cyrus Stoller 4031f5ee82 Add a migration tip for .label-important to .label-danger 2013-12-04 10:42:58 -08:00
Joah Gerstenberg 89061b0517 Updates Bootstrap thumbnail 2013-12-04 06:26:12 -06:00
mdxs f7d21d6919 Dropping unused variable in dropdown.js
Dropping an unused variable in the Dropdown function inside the `dropdown.js` code.

There are no new/changed unit tests, as there are no feature/bug changes requiring new test cases.

For the record: I agree to dual-license this contribution under the Apache 2 and MIT licenses.
2013-12-04 11:15:48 +01:00
Chris Rebert 7b945ad296 Merge pull request #11705 from cyrusstoller/migration-guide
Add a migration tip for .label to .label-default
2013-12-04 00:51:13 -08:00
Cyrus Stoller 149e7efb51 Add a migration tip for .label to .label-default 2013-12-04 00:41:05 -08:00
Mark Otto a42e9163cb Merge branch 'master' into responsive-visibility-table
Conflicts:
	dist/css/bootstrap.min.css
2013-12-03 22:58:25 -08:00
Mark Otto ed0d556847 Merge pull request #11697 from twbs/btn-xs-10979
fix .btn-group-xs portion of #10979
2013-12-03 22:55:11 -08:00
Chris Rebert f8e0f16663 fix broken link in CONTRIBUTING.md 2013-12-03 22:08:26 -08:00
Chris Rebert ed2360d05e Merge pull request #11701 from twbs/sauce-labs
switch to Sauce Labs for our cross-browser JS unit testing needs
2013-12-03 21:58:43 -08:00
Chris Rebert bd9332a58a switch to Sauce Labs for our cross-browser JS unit testing needs
Fixes #11087
2013-12-03 21:57:22 -08:00
kostyatretyak 7472c01ce2 Corrected a small error in the documentation 2013-12-04 06:21:54 +02:00
Chris Rebert 1d20611d54 fix invalid HTML in components.html
type="button" doesn't make sense for an <a>
2013-12-03 20:10:55 -08:00
Chris Rebert 4a45650026 fix .btn-group-xs portion of #10979 2013-12-03 18:03:04 -08:00
awebdeveloper 3f1e4b92ee -moz and old webkit syntax removed for gradients based on
http://caniuse.com/#search=grad
2013-12-03 14:13:55 -08:00
Chris Rebert 303f8a33c3 add <table> case to responsive-visibility mixin; see #10056 2013-12-03 13:57:28 -08:00
Chris Rebert bac153127c grunt 2013-12-03 13:54:56 -08:00
Chris Rebert 2d4ee18162 add comment regarding #11598 2013-12-03 13:31:47 -08:00
Chris Rebert 018a1d535b Merge pull request #11691 from twbs/xs-grid-docs-fix
document that XS grid supports offsets and push/pull
2013-12-03 11:28:57 -08:00
Chris Rebert 7a9d9f7dc4 account for #11050 in the docs 2013-12-03 11:22:56 -08:00
Chris Rebert 199872418c reference root issue in explanatory comment 2013-12-03 11:14:13 -08:00
Chris Rebert f2dab82d30 add .gitattributes file to enforce Unix newlines within the repo 2013-12-03 11:06:31 -08:00
Tobias Lindig 5a826a65b2 Gruntfile.js: Set line feed char to '\n' to get same result on all platforms. 2013-12-03 10:49:37 -08:00
Chris Rebert a7ceefc41b Merge pull request #11690 from lipis/patch-2
Get rid of empty line before the last closing bracket
2013-12-03 10:44:15 -08:00
Lipis 92a624a31c Get rid of empty line before the last closing bracket 2013-12-03 15:03:07 +01:00
Joah Gerstenberg 0fcaca86b5 Fixes #11669 - Adds smooth modal scrolling on iOS by default 2013-12-02 14:56:23 -06:00
Haley 3a65b2c11f Added text-justify class to type.less 2013-12-02 13:29:54 -06:00
XhmikosR b8928340f4 Update filesaver.js to the latest git. 2013-12-02 14:15:57 +02:00
XhmikosR c56e63e967 Update jszip.js to the latest git. 2013-12-02 14:13:10 +02:00
XhmikosR 4392d43d7c Update holder.js to v2.2. 2013-12-02 14:12:57 +02:00
Zlatan Vasović 2b56ff0461 Reduce size of the visibility styles 2013-12-02 07:50:17 +01:00
Mark Otto cc6951fa15 Merge pull request #10662 from kevinlisota/thumbnail-images
add responsive CSS to hyperlinked images when thumbnail caption markup used
2013-12-01 21:18:41 -08:00
Mark Otto b636756e53 Merge pull request #11667 from neilhem/master
replace double quotation marks with single in code examples
2013-12-01 20:48:43 -08:00
Rakhat Jabagin ab73ff1828 replace double quotation marks with single in code examples 2013-12-02 10:39:53 +06:00
Mark Otto 4876cbeef8 Merge branch 'master' into pr/11412
Conflicts:
	dist/js/bootstrap.min.js
2013-12-01 20:27:30 -08:00
Mark Otto 1444a3ca63 grunt dist 2013-12-01 20:27:14 -08:00
Mark Otto 37e46ec2b8 add comment 2013-12-01 20:27:09 -08:00
Mark Otto 561aff7942 Merge pull request #11499 from bassjobsen/patch-3
fix navbar dropdown window resize bug
2013-12-01 20:18:40 -08:00
Mark Otto 8a74264344 bump version numbers to 3.0.3 2013-12-01 19:31:52 -08:00
Mark Otto 118e901eb1 grunt 2013-12-01 19:30:10 -08:00
Mark Otto 5a0365524d Rework navbar padding and margins for right aligned last-child elements
This slight reworking of the navbar spacing was brought about by a
problem noted in #11530: use of `.navbar-form.navbar-right` leaves an
extra 15px of space on the right.

Here’s what’s new:

* Removed the `padding` on `.navbar-collapse` within static top, fixed
top, and fixed bottom navbars. Meaning, it’s still there for the
default navbar. This was the root cause of the extra 15px padding for
navbar forms.
* As part of this, I also replaced the existing negative margin
overrides for last-child elements with more contextual ones within
their sub-components.

Overall not too different, but should be more effective now and easier
to work with now.

For example of new changes, see http://jsbin.com/odeSiSo/1/.
2013-12-01 19:27:33 -08:00
Mark Otto 25bc5322aa grunt 2013-12-01 18:35:58 -08:00
Mark Otto d417fcecea Fixes #11357: Vertically center sm and xs buttons in the navbar 2013-12-01 18:13:27 -08:00
Mark Otto 33160d5043 Fixes #9927: Update non-responsive example to prevent .navbar-collapse border from increasing height and increase specificity of nav selectors to keep dropdowns looking the same 2013-12-01 18:06:57 -08:00
Mark Otto 948da5ce9a Merge branch 'master' of github.com:twbs/bootstrap 2013-12-01 17:25:37 -08:00
Mark Otto dd05c0e0a7 fixes #11508: mention in docs that inline forms only work at 768px and up 2013-12-01 13:51:17 -08:00
Mark Otto 17dee30892 Merge pull request #11662 from ZDroid/deprecation-fix
Use mixin instead of whole code
2013-12-01 11:16:17 -08:00
Mark Otto 556d6cef3e Fixes #10941: Fix Glyphicons path for those importing bootstrap.less from another directory 2013-12-01 00:20:47 -08:00
Zlatan Vasović ed29a99df4 Use mixin instead of whole code 2013-12-01 09:18:27 +01:00
Mark Otto 8dfe93d0b9 Add docs example to go with #11536 2013-11-30 23:38:39 -08:00
Mark Otto 53047fa587 Merge branch 'master' into pr/11536
Conflicts:
	dist/css/bootstrap.min.css
2013-11-30 23:35:56 -08:00
Mark Otto 57070dcf45 grunt 2013-11-30 23:35:08 -08:00
Mark Otto 48269dcd28 Fixes #11658: Increase min-height of .radio and .checkbox for horizontal forms to ensure alignment of content below 2013-11-30 23:17:43 -08:00
Mark Otto 841da88f3f Remove browser default top margin from dl elements 2013-11-30 23:08:41 -08:00
Mark Otto cf40b5db60 Fixes #11623: Reset position to static for grid columns within tables to unfuck borders in IE9/10 and Firefox 2013-11-30 23:04:55 -08:00
Mark Otto c6244a94d0 Shorten sticky footer examples footer content to prevent wrapping 2013-11-30 22:41:43 -08:00
Mark Otto 22da6fcfb2 grunt 2013-11-30 21:17:53 -08:00
Mark Otto a127f3921e Fixes #10716: Update what's included docs to add info on both download options 2013-11-30 21:05:39 -08:00
Mark Otto ed98ac7560 Merge branch 'master' of github.com:twbs/bootstrap 2013-11-30 16:37:49 -08:00
Mark Otto 6bc09dd949 Fixes #11268: Account for badges within buttons by matching background to text color and text color to background 2013-11-30 16:29:52 -08:00
Mark Otto 5283e518cc Merge pull request #11217 from ZDroid/nest
Add quick fix to labels and badges in buttons
2013-11-30 16:26:38 -08:00
Mark Otto 359ac8f66a grunt 2013-11-30 16:21:19 -08:00
Mark Otto 67d4e3323d Fixes #11277: Drop the abbr element from the .initialism selector 2013-11-30 16:18:07 -08:00
Mark Otto 9bbdb87150 Fixes #11420: Update migration guide on split of .visible-/.hidden-desktop into .visible-/.hidden-md and .visible-/.hidden-lg 2013-11-30 16:16:24 -08:00
Mark Otto 6a2ca0ab3a Fixes #11444: Use @navbar-padding-vertical for nav links padding 2013-11-30 16:08:49 -08:00
Mark Otto 7aa6b4190b Fixes #11402: Set width: auto; to select.form-control within .form-inline 2013-11-30 15:57:25 -08:00
Mark Otto d2f8b5327b Fixes #11515: Reorder the headings with body text and text emphasis classes 2013-11-30 14:58:35 -08:00
Mark Otto 21e2ae9489 Fixes #11544: Add color: inherit; to .panel-title to ensure proper text color when customizing @headings-color 2013-11-30 14:53:54 -08:00
Mark Otto 82bbccde9b Merge branch 'master' into pr/11648
Conflicts:
	dist/css/bootstrap.min.css
	less/grid.less
2013-11-30 13:09:55 -08:00
Mark Otto 5611320101 Merge branch 'master' of github.com:twbs/bootstrap 2013-11-30 12:52:45 -08:00
Mark Otto 853b69f2df Fixes #11351: Correct grid class reset on input groups by using attribute selector, not an old class from v3 betas 2013-11-30 12:52:08 -08:00
Mark Otto 84f536e02a Merge pull request #11398 from thelukemcdonald/master
Don't print .clearfix() comment references
2013-11-30 12:47:07 -08:00
Mark Otto a52e528d27 Fix up new margins on modals by not setting auto until screen-sm-min 2013-11-30 11:56:06 -08:00
Mark Otto 265118a6a0 Merge pull request #11657 from ZDroid/homepage
Use pkg.homepage
2013-11-30 11:46:22 -08:00
Zlatan Vasović ab87085625 Use pkg.homepage 2013-11-30 16:11:41 +01:00
Mark Otto 0d81c4e339 Merge pull request #11124 from StevenBlack/issue.11098
Fixes issue #11098 -- Button documentation.
2013-11-30 00:58:39 -08:00
Mark Otto 080aa7f5c8 Merge branch 'master' into pr/11299
Conflicts:
	dist/css/bootstrap.min.css
	docs-assets/js/raw-files.js
2013-11-30 00:55:00 -08:00
Mark Otto 819e920d16 Merge branch 'master' of github.com:twbs/bootstrap 2013-11-30 00:43:27 -08:00
Mark Otto a7a9dcaeb2 Alternate fix for #11303: add link to site in banner and remove @mdo and @fat usernames from it 2013-11-30 00:42:36 -08:00
Mark Otto 95487f75d1 Merge pull request #11329 from ZDroid/patch-1
Add 'in' to complete thought
2013-11-30 00:40:32 -08:00
Mark Otto 143427b8ae Merge pull request #11330 from maxwellium/patch-1
fixing offcanvas example for chrome
2013-11-30 00:39:00 -08:00
Mark Otto a15a6dfa96 Merge pull request #11369 from ssorallen/speedier-js-loading
Speedier jQuery and Twitter widgets.js
2013-11-30 00:32:39 -08:00
Mark Otto bb4a39d51c Merge branch 'master' into pr/11388
Conflicts:
	dist/css/bootstrap.min.css
2013-11-30 00:26:53 -08:00
Mark Otto e6eb798178 Merge pull request #11434 from ZDroid/fix-11433
Fix #11433: Better documentation for validation states
2013-11-30 00:23:16 -08:00
Mark Otto 938d40fc20 Merge pull request #11432 from masterbee/WCAG2-color-contrast
Corrected color contrast to WCAG 2.0 AA (Accessibility Tweak) - Forms and Alerts
2013-11-30 00:21:47 -08:00
Mark Otto a06610a030 Merge pull request #11502 from 1000hz/patch-1
Add missing data namespace for dropdown
2013-11-29 23:55:43 -08:00
Mark Otto 5b137e5857 Merge pull request #11511 from ZDroid/fix-xs-comments
Fix comments for extra small grid
2013-11-29 23:46:35 -08:00
Mark Otto f7b7cc3443 Merge pull request #11585 from thriqon/master
Issue #11550 : Easily copyable classes
2013-11-29 23:45:35 -08:00
Mark Otto 40f86af16a Merge pull request #11617 from guybedford/master
include jspm package configuration
2013-11-29 23:43:01 -08:00
Mark Otto 8674228521 Merge branch 'pr/11493'
Conflicts:
	dist/css/bootstrap.min.css
2013-11-29 23:30:26 -08:00
Mark Otto 9f0da54856 grunt to get dist files 2013-11-29 23:29:34 -08:00
Mark Otto e4848286c8 Fix #10979: Don't use .img-thumbnail as a mixin for .thumbnail to avoid dupe and unnecessary styles 2013-11-29 23:19:04 -08:00
Mark Otto bf9f39270c Fixes #11425: Use margin instead of padding on .modal-dialog to enable click-thru to .modal-backdrop 2013-11-29 22:03:49 -08:00
Mark Otto 36b82c37ec Implement #11174 to fix #10936: increase height of large inputs to fix Firefox inconsistencies 2013-11-29 21:59:28 -08:00
Mark Otto 61c641ea05 fixes #10699: use xs grid classes in regular thumbnail docs 2013-11-29 21:08:16 -08:00
Mark Otto 1e6c95cd5d improve affix docs with step-by-step walk through of plugin behavior and required CSS 2013-11-29 20:39:00 -08:00
Mark Otto 7d456aef76 Update scrollspy docs to more clearly indicate usage 2013-11-29 20:25:07 -08:00
Mark Otto a4c54b5e5d Fixes #11390: Add max-width to containers within jumbotrons to avoid horizontal scrollbar 2013-11-29 18:33:59 -08:00
Mark Otto 09cd5289ab Fixes #11468: Prevent default gradient on in Firefox for Android 2013-11-29 17:47:27 -08:00
Zlatan Vasović 702ad4c302 Remove redundant comments 2013-11-29 11:37:06 +01:00
Zlatan Vasović 08e41d769a Add missing last column float 2013-11-29 08:37:54 +01:00
Mark Otto b5f9cc2057 Merge branch 'master' into pr/11414
Conflicts:
	dist/css/bootstrap.min.css
2013-11-28 15:55:17 -08:00
Mark Otto 0be94180b9 grunt 2013-11-28 15:45:45 -08:00
Mark Otto d654f90502 Fixes #10147: Remove outline from carousel controls on focus 2013-11-28 15:37:11 -08:00
Mark Otto 9d939080e6 Fixes #10483 and #10357: Make .container mixin-friendly by moving the width declarations within one class 2013-11-28 14:22:31 -08:00
Mark Otto c13524e7e0 Fixes #11553: Prevent double border on tables in panels without thead content 2013-11-28 12:49:51 -08:00
Mark Otto 9f68a5b241 Fixes #11516: Invert dropdown divider border in navbars 2013-11-28 12:39:39 -08:00
Mark Otto 9d485db721 run grunt after last merge 2013-11-28 12:34:42 -08:00
Mark Otto ec9d4708d2 Merge pull request #11551 from masterbee/outlinetweak
removed color treatment of outline for easier integration
2013-11-28 12:31:18 -08:00
Mark Otto b7b72cc877 Merge branch 'master' into pr/11614
Conflicts:
	dist/css/bootstrap.min.css
2013-11-28 11:57:12 -08:00
Mark Otto 56f4cf0316 Fixes #11634: Add warning to docs to not combine icon classes with other elements 2013-11-28 11:38:28 -08:00
Mark Otto 594d0c700d grunt after merge of last pr; unsure why, but this is rengerating the banners and spacing 2013-11-28 11:33:00 -08:00
Mark Otto 2abaed9876 Merge pull request #11642 from tlindig/caret_color_fix
removed all caret border color settings.
2013-11-28 10:45:11 -08:00
Tobias Lindig 3d5e598e5c add builded files from dist/ 2013-11-28 18:40:15 +01:00
Tobias Lindig ea78248608 removed all caret border color settings. 2013-11-28 17:41:43 +01:00
Mark Otto 9829c86f7c run grunt 2013-11-26 15:21:27 -08:00
Chris Rebert 27abfba89f Merge pull request #11616 from ZDroid/remove-window
Remove redundant 'window.'
2013-11-26 09:20:56 -08:00
Guy Bedford ac6cfbbaad include jspm package configuration 2013-11-26 12:10:06 +02:00
Zlatan Vasović 630fd1cff6 Remove redundant 'window.' 2013-11-26 08:43:26 +01:00
Jesse Mandel bff8ba2b79 Fix for Issue #11411 2013-11-25 15:19:11 -08:00
Chris Rebert fa710fdb09 Merge pull request #11612 from JerryChr/master
Removed unnecessary semicolon
2013-11-25 11:54:46 -08:00
Jerri Christiansen bd44a4b5f3 Removed unnecessary semicolon 2013-11-25 20:41:00 +01:00
Chris Rebert cad664e863 Merge pull request #11598 from ZDroid/customizer-breaks
Fix #11594
2013-11-23 12:17:32 -08:00
Chris Rebert ebc91077f7 Merge pull request #11599 from westonplatter/explicit_fonts
explicitly call out font files
2013-11-23 12:10:33 -08:00
Weston Platter a42d7ff319 explicitly call out font files
Using wildcards to specify fonts causes errors for other
npm modules, EG, https://github.com/blittle/bower-installer/issues/33.
Additionally, it’s better to lock down files included in a
library.
2013-11-23 12:23:18 -07:00
Zlatan Vasović dbbd49b4f8 Fix #11594 2013-11-23 18:29:27 +01:00
Chris Rebert de2ab6453a Merge pull request #11597 from ZDroid/deps-grunt-recess-kickup
Kick up grunt-recess dependency
2013-11-23 09:16:32 -08:00
Zlatan Vasović 4160ff0e44 Kick up grunt-recess dependency 2013-11-23 17:41:31 +01:00
Mark Otto 98980b0fb2 Merge branch 'master' into docs_derp 2013-11-22 22:09:04 -05:00
Mark Otto 37f3944bd9 finish up moving content, tweaking styles 2013-11-22 18:45:38 -05:00
Chris Rebert 4c246c0117 Merge pull request #11534 from twbs/doc-async-modals
document that modal show()/hide() return before animation finishes
2013-11-21 15:40:12 -08:00
Jonas Weber 62299240d8 Issue #11550 : Easily copyable classes
Removed all the periods. Tested in Chrome and Firefox
(current versions). In Chrome you get a stray newline when
triple-clicking, in Firefox it is clean.

fixes #11550
2013-11-21 22:59:12 +01:00
Chris Rebert ccd564650a add more missing role="form"-s 2013-11-21 12:02:54 -08:00
Chris Rebert b34292ce82 Merge pull request #11567 from neilhem/master
add role form for horizontal form example
2013-11-21 11:49:24 -08:00
Chris Rebert 7ab6c2743b Merge pull request #11578 from barraponto/patch-1
Make it clear there's a nested media element in the first example
2013-11-21 11:05:45 -08:00
Capi Etheriel d873af8662 Make it clear there's a nested media element in the first example 2013-11-21 15:13:05 -02:00
Rakhat Jabagin bf62a6241a add role form for horizontal form example 2013-11-21 12:04:48 +06:00
Mario Bonito 55af003669 removed color treatment of outline 2013-11-20 16:44:44 -05:00
Chris Rebert 6ed5a844a8 Merge pull request #11172 from yokomizor/git_ignore_bower_components
added bower_components to .gitignore
2013-11-19 14:15:09 -08:00
Zlatan Vasović 8f589c6cfd Add 'in' to complete thought
Simple grammar fix.
2013-11-19 13:29:19 +01:00
aentan ba4c5dae9b add support for button dropdowns in justified button groups 2013-11-19 17:24:49 +08:00
Chris Rebert afbdc21def fixes part of #11117: doc that modal show()/hide() return before animation finishes 2013-11-18 19:59:09 -08:00
Chris Rebert 2172e2ea8a fix #11089: document modal show+shown events' relatedTarget property 2013-11-18 19:29:08 -08:00
Chris Rebert 446f2325a6 add explanatory comment Re: #11526 2013-11-18 14:22:17 -08:00
Julian Thilo 84a3aa3e0c Merge pull request #11514 from twbs/navbar-text-float-breakpoint
Fix #11513: Don't always float navbar-text
2013-11-18 14:02:17 -08:00
Mark Otto 7c9b93254b Merge pull request #11526 from erikflowers/firefox-placeholder-fix
Firefox placeholder text is faded out and not the full color.
2013-11-18 13:42:52 -08:00
Erik Flowers 50578dda60 - Firefox placeholder text is faded out and not the full color. Adding opacity:1 to it returns it to the proper color
- (this is a re-commit since I messed up my branch last time and failed the travis build)
2013-11-18 11:58:14 -07:00
Chris Rebert ee1c53dca0 Merge pull request #11521 from valera-rozuvan/patch-1
Update dropdown.js
2013-11-18 01:57:56 -08:00
Valera Rozuvan ad86d9a51b Update dropdown.js 2013-11-18 11:55:33 +02:00
Julian Thilo 8aec527614 Run grunt dist 2013-11-17 23:45:42 +01:00
Julian Thilo cdb243706e Fix #11513: Don't always float navbar-text
`navbar-text` should only float when the navbar is expanded on larger
screens, otherwise the element might be (hidden) behind `navbar-nav`.
Fixes #11513.
X-Ref: #8820 #8815
2013-11-17 23:07:28 +01:00
Zlatan Vasović 283c86db38 There are xs-offsets, -pushes and -pulls! 2013-11-17 21:15:25 +01:00
Chris Rebert 6b547b357a Merge pull request #11509 from ZDroid/fix-indents
Fix some weird indents
2013-11-17 02:02:00 -08:00
Zlatan Vasović 9a8a571ad1 Fix some weird indents 2013-11-17 10:24:31 +01:00
Mark Otto 03501f9c4a Merge branch 'master' into docs_derp 2013-11-16 22:02:59 -08:00
Mark Otto ae4d5f21a9 fixes #11449: use menlo over monaco 2013-11-16 18:01:59 -08:00
Mark Otto a2c6daafd0 fixes #10744: back to solid borders on carets 2013-11-16 17:48:31 -08:00
Mark Otto 86678e6602 text size 2013-11-16 16:50:47 -08:00
Cina S. 56f6847ed6 Add missing data namespace for dropdown 2013-11-16 09:43:47 -06:00
Bass Jobsen fbd3cf5f52 Update navbar.less
fix for issue #11243
2013-11-16 12:03:50 +01:00
André Cruz 926b940e86 Clear timeout on destroy.
Clears the internal timeout on destroy so that hanging timers are not fired.
2013-11-15 23:33:23 +00:00
Sam Blowes f4eb3df50a Fixed single btn in btn-group-veritcal not being rounded 2013-11-15 16:48:24 +00:00
Sam Blowes 1f340023e2 Fixed button group button not being 100% width
Example of issue here.
https://dl.dropboxusercontent.com/u/14037764/Development/stackoverflow/bootstrap/vertical-btn.PNG
2013-11-15 16:17:40 +00:00
fat 7545da2e3c fixes #11477 and updates slid event in carousel with namespace 2013-11-14 23:58:29 -08:00
Chris Rebert 57b59fcfd0 Merge pull request #10353 from rwillrich/ignore-files
Bower: Ignore development and documentation files on bower.json. Fix #10313
2013-11-14 15:37:22 -08:00
Julian Thilo 27b62d39e2 Merge pull request #11476 from ZDroid/keyframes
Remove unusual keyframes prefixes
2013-11-14 01:14:06 -08:00
Zlatan Vasović c2a6e950d7 Remove unusual keyframes prefixes 2013-11-13 22:32:46 +01:00
Chris Rebert 4cbc8d49b1 Justified Nav rendering bug fixed in Chrome as of v31.0.1650.48 2013-11-13 12:03:03 -08:00
Chris Rebert c1c2a8e188 Merge pull request #11385 from twbs/justified-nav-example-warning
add warning about WebKit bug to the justified nav example itself
2013-11-11 14:44:40 -08:00
Chris Rebert e7d6af003e Merge pull request #11376 from twbs/double-click-radio-fix
Double-clicking on a .btn-ized radio button shouldn't de-select it
2013-11-10 17:33:12 -08:00
Chris Rebert 7a3f41b11b <3 @asselin for figuring out this combo of 2 patches for #9920; re-grunt 2013-11-10 17:25:17 -08:00
Brian Leonard 5d6e9212a6 Don't deselect radio buttons in data-toggle; fixes #9920
Merges #10787
2013-11-10 17:23:11 -08:00
Nathan Muir 934d1bcae5 Add unit test for #9920
Merges #10385
2013-11-10 17:23:11 -08:00
Chris Rebert a639c6e1cf Merge pull request #11409 from twbs/add-release-checklist
add release checklist to CONTRIBUTING file
2013-11-10 17:17:15 -08:00
Chris Rebert ce0d008bc3 add release checklist to CONTRIBUTING file; fixes #11290 2013-11-10 17:16:21 -08:00
Zlatan Vasović aad447e290 Fix #11400 and #11431 2013-11-09 22:49:58 +01:00
Zlatan Vasović 4bd263c4c1 Better documentation for validation states 2013-11-09 22:14:21 +01:00
Mario Bonito 4386650e60 Corrected color contrast to WCAG 2.0 AA 2013-11-09 13:03:21 -05:00
Daniel Bøndergaard 268f20e84c Carousel: Use the transition duration from CSS
This makes it possible to change the transition duration in CSS
2013-11-08 11:55:06 +01:00
Zlatan Vasović 0da3901ed5 Add missing .small styles and docs 2013-11-08 10:33:22 +01:00
Brian Surowiec 03c161f0c4 Fix glyphicon class name wrapping in IE 2013-11-08 02:03:37 -05:00
Luke McDonald 15fbc4bd06 Don't print .clearfix() comment references 2013-11-07 09:57:55 -06:00
Chris Ziogas ed5dbf1b2b Update affix properly on scrollspy speedy scroll to top of page #11310
Fix scrollspy.js so as affix is updated properly when user scrolls fast
to top of page.

A fix for issue #11310.
2013-11-07 16:39:57 +02:00
Zlatan Vasović 96109d3138 Simplify table state styles 2013-11-07 09:53:33 +01:00
Chris Rebert 463343af63 more nesting in table.less 2013-11-06 18:38:27 -08:00
Chris Rebert 798e64cebf use nesting to make .table-striped & .table-hover mixin-able again; fixes #11387 2013-11-06 18:33:07 -08:00
Chris Rebert ceefbce100 add warning about WebKit bug to the justified nav example itself 2013-11-06 15:21:07 -08:00
Mark Otto 6df6723c15 Merge branch 'master' into docs_derp
Conflicts:
	dist/css/bootstrap.min.css
2013-11-06 14:04:54 -08:00
Chris Rebert 3887f540b9 update remaining version numbers 2013-11-06 13:19:18 -08:00
Mark Otto eaff6bc49a grunt 2013-11-06 13:10:51 -08:00
Mark Otto 98acdaeb00 bump links to 3.0.2; change readme download to release URL format 2013-11-06 13:09:35 -08:00
Mark Otto 88a06640dd Fixes #11295: Restore offset, push, and pull zero classes (e.g., .col-md-offset-0) 2013-11-06 13:03:08 -08:00
Mark Otto d1048a7837 run grunt after version bumps 2013-11-06 13:02:15 -08:00
Mark Otto 6a42305565 bump versions to v3.0.2 2013-11-06 12:57:28 -08:00
Mark Otto b593df1830 docs derp 2013-11-06 11:00:39 -08:00
Chris Rebert c84d96ac1f fix #11378 2013-11-06 10:30:39 -08:00
Chris Rebert 375b9edb41 Merge pull request #11273 from benji07/patch-1
Add a branch alias
2013-11-05 23:36:48 -08:00
Benjamin Lévêque 7df3e142ac Add a branch alias
Add a branch alias to be able to require 3.0.* version (use the branch master if minimum-stability is dev or use a tag if it's defined to stable)
2013-11-06 08:25:40 +01:00
Chris Rebert 89d489dfc7 re-grunt 2013-11-05 16:58:18 -08:00
Chris Rebert f1b0cd491c Merge pull request #10039 from daguej/js-refs
Don't explicitly reference global jQuery
2013-11-05 16:55:55 -08:00
Chris Rebert d2e710a2df fix 1 remaining instance of #11349 2013-11-05 16:37:54 -08:00
Chris Rebert a063e1f736 Merge pull request #11349 from alefteris/examples-navbar-sr-only
Add toogle nav for screen readers in examples
2013-11-05 16:35:14 -08:00
Chris Rebert b6a083e77f Merge pull request #11327 from ZDroid/nestnail
Use nesting for thumbnail styles
2013-11-05 16:20:53 -08:00
Ross Allen 18318b81b0 Add async attribute to Twitter widget script 2013-11-05 07:39:50 -10:00
Ross Allen 68fc2f2515 Add protocol for jQuery to work when accessed as file
URLs without protocols get "file:" prepended when their document is
loaded as a file. Make sure the docs can always be opened by
specifying a protocol.
2013-11-05 07:23:58 -10:00
Ross Allen 4f5a865684 Load Twitter widget async, prevent SPOF
Twitter's widget library[1] provides an async snippet to inject the
script tag later. Since widgets.js came before the local JS, if
twitter.com took long to respond it would prevent subsequent
synchronous script tags.

[1] https://dev.twitter.com/docs/tfw-javascript
2013-11-04 22:17:05 -10:00
Ross Allen 38d6894910 Serve jQuery from cookie-free Google APIs
jQuery.com uses Google Analytics and so sets a cookie when you visit
the site. When you request jquery.js from its CDN, code.jquery.com,
you take a hit from sending your previous GA cookie in the request.

Google Hosted Libraries[1] and googleapis.com never set cookies.

[1] https://developers.google.com/speed/libraries/devguide
2013-11-04 22:11:57 -10:00
Chris Rebert 13b96677ba Merge pull request #11335 from twbs/version-number-updater
add Grunt task to change version numbers
2013-11-04 11:24:32 -08:00
Chris Rebert 0bb122a377 add Grunt task to change version numbers; fixes #11332 2013-11-04 11:22:30 -08:00
Chris Rebert aeee718247 update node.js to v0.10.x (current stable) 2013-11-04 10:41:10 -08:00
Chris Rebert de271bf612 Merge pull request #11354 from Ore4444/patch-1
Fixed links
2013-11-04 08:54:37 -08:00
Ore Landau eae1af1d27 Fixed links
Links to same-page anchors were treated as external links.
2013-11-04 12:33:43 +02:00
Thanos Lefteris 70db224073 Add toogle nav for screen readers in examples 2013-11-03 21:08:24 +02:00
Chris Rebert df3b44f27a Merge pull request #11345 from pborreli/patch-3
Removed duplicated class change from migration instructions
2013-11-02 20:11:08 -07:00
Pascal Borreli 05c826d67d Removed duplicated class change from migration instructions 2013-11-03 03:08:11 +00:00
Chris Rebert fcb906ce09 Merge pull request #11336 from twbs/fix-11317
don't use nonstandard window.location.origin in customizer JS
2013-11-02 15:06:16 -07:00
Julian Thilo 88b651012d Fix #7398 in Basic template
See https://github.com/twbs/bootstrap/issues/7398#issuecomment-27617890 for details.
Thanks @martinburger
2013-11-02 13:34:31 +01:00
Julian Thilo be60ee1377 Merge pull request #11338 from ZDroid/nestform
Use nesting for .placeholder()
2013-11-02 05:27:30 -07:00
Zlatan Vasović f1bc840d43 Use nesting for .placeholder() 2013-11-02 09:35:51 +01:00
Chris Rebert db314528eb don't use nonstandard window.location.origin in customizer JS; fixes #11317 2013-11-01 18:56:27 -07:00
Chris Rebert ea3c89189a Merge pull request #11334 from glebm/patch-2
& > == >
2013-11-01 18:29:45 -07:00
Gleb Mazovetskiy b75d5f5fc4 & > == > 2013-11-02 02:19:11 +01:00
Chris Rebert 4e0d022de5 update version numbers in JS file comment headers to v3.0.1 & regrunt 2013-11-01 17:15:34 -07:00
Julian Thilo 41fa8ead77 Merge pull request #11331 from xt0rted/patch-1
Update customizer.js
2013-11-01 16:38:08 -07:00
Brian Surowiec 8ff7b48b7b Update customizer.js 2013-11-01 19:27:08 -04:00
maxwellium 56aa2af6e1 otherwise content scrolls on chrome
without change, body scrolls on chrome Version 30.0.1599.101 (OSX 10.9)
2013-11-01 22:51:11 +01:00
Zlatan Vasović 3dc0ed35d1 Use nesting for thumbnail styles 2013-11-01 22:09:01 +01:00
Julian Thilo 99ffa28278 Merge pull request #11324 from boki-/patch-1
Update README.md
2013-11-01 11:36:30 -07:00
Bogdan bb54ce0db6 Update README.md
Row 13 link update to tag v3.0.1
2013-11-01 19:30:27 +01:00
Chris Rebert 19fdd707ef Merge pull request #11315 from AJAlabs/master
Added navigation role to example navbars
2013-10-31 13:36:52 -07:00
AJ Acevedo 0d4b9ef72e Added navigation role to example navbars
As per the docs:
http://getbootstrap.com/components/#navbar-default

  modified:   examples/carousel/index.html
  modified:   examples/jumbotron/index.html
  modified:   examples/navbar-fixed-top/index.html
  modified:   examples/navbar-static-top/index.html
  modified:   examples/navbar/index.html
  modified:   examples/non-responsive/index.html
  modified:   examples/starter-template/index.html
  modified:   examples/sticky-footer-navbar/index.html
  modified:   examples/theme/index.html
2013-10-31 16:09:41 -04:00
Kevin Locke 441f9d6717 Support .h1 in place of h1 inside .jumbotron
As in #7284, it can often be useful to style text like a heading in
places where using the heading tag would be either semantically
incorrect, less accessible, or otherwise invalid.

Support this in .jumbotron as in the rest of the document by allowing
elements with class .h1 to stand in for the h1 element.

Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
2013-10-31 10:48:55 -06:00
Mark Otto 867e2bef8d 3.0.1 2013-10-30 10:03:56 -07:00
Mark Otto 147837efaa more grunt 2013-10-30 08:00:32 -07:00
Mark Otto 9fbbce9b2d Merge pull request #11274 from wangsai/fix-examples-urls
remove unused `{{ page.base_url }}` variables, and fix the urls
2013-10-30 07:32:06 -07:00
Mark Otto 697a37e73f Merge pull request #11282 from ZDroid/combination
Combine multiple .thumbnail > img styles
2013-10-30 07:28:24 -07:00
Bas Bosman b8f9f82d18 Add well-border variable
Add a variable to allow the well border color to be specified.

The reason I'd like to see this included is that my companies styleguide
requires an explicit border color on well-like constructs. This variable
allows me to easily override the default to use that color.
2013-10-30 14:10:16 +01:00
Zlatan Vasović 688ca328c9 Combine multiple .thumbnail > img styles 2013-10-30 10:00:28 +01:00
Chris Rebert 77bf572cba Merge pull request #11278 from ZDroid/patch-1
Change tense to imperative
2013-10-29 12:41:42 -07:00
Zlatan Vasović 8a881c78a1 Change tense to imperative
Matches this comment with the commit messages and other comments.
2013-10-29 20:06:45 +01:00
Chris Rebert a8e0679554 Merge pull request #11275 from jared-christensen/master
JS comments pointed to new documentation
2013-10-29 10:29:31 -07:00
Jared Christensen 583697fec3 JS comments pointed to new documentation 2013-10-29 12:10:47 -05:00
wangsai ee96637284 remove unused {{ page.base_url }} variables, and fix the urls 2013-10-30 00:13:35 +08:00
Mark Otto a23740ec03 run grunt 2013-10-28 21:55:08 -07:00
Mark Otto e5c3f2d9d4 restore IDs 2013-10-28 21:50:05 -07:00
Mark Otto 5729f20054 Merge branch 'respondjs-import-note' 2013-10-28 21:49:00 -07:00
Mark Otto 96d7d4a489 edit 2013-10-28 21:48:57 -07:00
Mark Otto c6e76d97ba Fixes #10341: don't change border color on contextual table classes 2013-10-28 21:19:48 -07:00
Mark Otto 4b8c662698 use regular text, not callouts 2013-10-28 21:19:09 -07:00
Mark Otto 67cab7fa05 Fixes #10516: Use auto positioning for dropdowns in justified nav to fix Firefox rendering 2013-10-28 20:51:39 -07:00
Mark Otto dcf51315a3 Merge pull request #11258 from ZDroid/smoothing
Add -moz-osx-font-smoothing
2013-10-28 20:36:40 -07:00
Chris Rebert d1dd1fcdee add warning about Respond.js not supporting @import; fixes #11143 2013-10-28 11:07:56 -07:00
Chris Rebert 0026e5655b Merge pull request #11262 from vsn4ik/fonts_perms
Remove execute permissions on fonts files.
2013-10-28 09:16:53 -07:00
vsn4ik f0c6ac0b70 Remove execute permissions on fonts files. 2013-10-28 17:52:04 +04:00
Zlatan Vasović f9eec5b60a Add -moz-osx-font-smoothing 2013-10-28 09:59:24 +01:00
Mark Otto 30127a4296 Merge pull request #11253 from ZDroid/ditch
Ditch amp
2013-10-27 20:50:23 -07:00
Zlatan Vasović 92f007157a Ditch amp 2013-10-27 13:43:51 +01:00
Mark Otto e9ca4fab13 Merge pull request #11248 from tagliala/chrome-osx-select-print
Chrome for OSX print issue with select tags
2013-10-27 00:45:37 -07:00
Geremia Taglialatela 58cb85be37 #fff of course 2013-10-26 21:52:38 +02:00
Geremia Taglialatela b09417fd75 Fixes #11245 2013-10-26 21:32:29 +02:00
Mark Otto 0365796375 Merge branch 'master' of github.com:twbs/bootstrap 2013-10-26 14:22:33 +01:00
Mark Otto 1ef6caf44f Merge pull request #11200 from yokomizor/variable_way_to_set_caret_width_base
Variable way to set caret width
2013-10-26 06:15:33 -07:00
Mark Otto 4cfe307abe Fixes #11206: remove left padding on first inline list item 2013-10-26 14:13:34 +01:00
Mark Otto 0c714c32f9 Merge branch 'master' of github.com:twbs/bootstrap 2013-10-26 14:12:07 +01:00
Mark Otto 64ffed87a4 Merge pull request #11244 from ZDroid/animation
Add .animation() mixin
2013-10-26 05:49:58 -07:00
Zlatan Vasović aff291e1ca Add .animation() mixin 2013-10-26 14:11:59 +02:00
Mark Otto 72cfe877d8 Remove multiple navbar z-index callout
* Since we removed the z-index of our default navbars in 76baacf2c9, we no longer need this warning.
* A quick test of the new code showed no problems with dropdowns falling behind a sibling navbar, so folks should be good to go.
2013-10-26 12:43:50 +01:00
Mark Otto 4fac7b6d25 Merge pull request #11222 from ZDroid/patch-1
Add another newline to improve final code readability
2013-10-26 03:41:00 -07:00
Zlatan Vasović 20cba845c2 Add another newline to improve final code readability
This divides banner from code.
2013-10-26 10:57:09 +02:00
Mark Otto f47510b172 Merge pull request #11224 from twbs/10506-doc
Document that uncollapsing the mobile navbar requires JS
2013-10-26 01:17:53 -07:00
Chris Rebert abc50a7e9d Merge pull request #11239 from twbs/qunit-equals-deprecated
QUnit.equals() is deprecated; use QUnit.equal() instead
2013-10-25 14:21:43 -07:00
Chris Rebert 7b24f3c47c QUnit.equals() is deprecated; use QUnit.equal() instead 2013-10-25 14:14:30 -07:00
Chris Rebert f2f70a4a74 Merge pull request #11234 from ZDroid/patch-2
Kick up grunt-contrib-jshint dependency
2013-10-25 11:34:54 -07:00
Zlatan Vasović ca6729e3d3 Kick up grunt-contrib-jshint dependency 2013-10-25 17:45:49 +02:00
Chris Rebert a58c83a317 add missing space before open curly brace 2013-10-24 19:56:44 -07:00
Chris Rebert aafe3f90bd fix misspelling in comment 2013-10-24 19:50:08 -07:00
Chris Rebert f31aae469e fix misspelling in comment 2013-10-24 19:48:42 -07:00
Chris Rebert 3cd744fd5e remove ref to nonexistent branch 2013-10-24 19:42:48 -07:00
Chris Rebert c865a68e21 fix WebKit caps in comments 2013-10-24 19:20:08 -07:00
Chris Rebert 91fa801d33 doc that uncollapsing mobile navbar requires JS; per #10506 2013-10-24 15:16:02 -07:00
Chris Rebert 9d2cf56177 goofed on 1 dummy <img> src attribute; thanks @extesy 2013-10-24 12:01:09 -07:00
Chris Rebert 54cd0f8c2f rm dummy 'src' attributes of <img>s & squelch validator warning; fixes #11216 2013-10-23 23:41:17 -07:00
Chris Rebert 0d122fc323 silence validator regarding http-equiv="X-UA-Compatible" 2013-10-23 23:25:17 -07:00
Zlatan Vasović 9a2d169762 Add quick fix to labels and badges in buttons 2013-10-23 22:14:34 +02:00
Mark Otto eb77241ae2 Merge pull request #11209 from ZDroid/new_year
Update license year
2013-10-22 13:45:41 -07:00
Chris Rebert bb3d17553c Merge pull request #11208 from ZDroid/codestyle_fix
Put a space before `{` due to code style
2013-10-22 10:53:25 -07:00
Zlatan Vasović 63433fbef9 Update license year 2013-10-22 18:41:33 +02:00
Zlatan Vasović b034362363 Put a space before { due to code style 2013-10-22 18:34:43 +02:00
Arnold Daniels 5a38a5775f Scrollspy acting up when targets are hidden
If elements are hidden using `display: none;` which are targets mapped by scrollspy, the plugin might select an incorrect or no menu item.

Checking if the target is visible solved this.
2013-10-22 13:31:23 +02:00
Rogério Yokomizo 5f2bd59abb variable way to set @caret-width-base 2013-10-22 02:50:08 -02:00
LFeh 89e0f1669f Adjust in modal size rules 2013-10-21 16:39:31 -02:00
Mark Otto 9673c25e2c Merge pull request #11192 from ZDroid/typo
Change upper case to lower case
2013-10-21 08:58:38 -07:00
Zlatan Vasović 214a78978d Change upper case to lower case 2013-10-21 16:34:18 +02:00
Mark Otto eed53d7811 Fixes #10601: Use overflow-y: auto; for navbar collapse instead of visible to better enable scrolling on Android 4.x 2013-10-21 01:53:41 -07:00
Mark Otto ee9be1a30f run grunt on last commit for gradient syntax change 2013-10-20 23:29:23 -07:00
Mark Otto eef9d5ae7b Merge pull request #10893 from Shaun-Dychko/patch--webkit-linear-gradient
remove comma separating the color and the color-stop in -webkit-linear-gradient in the #gradient .vertical mixin.
2013-10-20 23:27:48 -07:00
Mark Otto 976866dcaa Merge pull request #10729 from lipis/patch-2
Removed the unnecessary override and the !important from .wrap
2013-10-20 23:12:19 -07:00
Mark Otto 9a0849d818 more spacing 2013-10-20 22:56:29 -07:00
Mark Otto 2eec3f919e Merge branch 'master' into pr/10656
Conflicts:
	dist/css/bootstrap.min.css
2013-10-20 22:55:45 -07:00
Mark Otto 6585c5898a spacing 2013-10-20 22:46:21 -07:00
Mark Otto 6ecb5d6cf3 Merge branch 'master' of github.com:twbs/bootstrap 2013-10-20 22:43:03 -07:00
Mark Otto d8fab5aa6e Fixes #10620: remove gradient on buttons for IE9 in theme.less due to bleed through with rounded corners 2013-10-20 22:41:57 -07:00
Mark Otto 98378d2d88 Merge pull request #11188 from twbs/navbar_zindex_auto
Fixes #10433: Navbar z-index refactor
2013-10-20 21:16:37 -07:00
Mark Otto 76baacf2c9 Remove default z-index on navbar and only set on static and fixed variants 2013-10-20 21:12:09 -07:00
Mark Otto c71f89518f Fix up padding on default navbar example 2013-10-20 21:11:51 -07:00
Mark Otto e486bb4f39 Fixes #10433: Navbar z-index refactor
* Resets the default navbar z-index to auto at a certain breakpoint
* Adds fixed navbar z-index var to fixed bottom navbar (previously only on fixed top navbar)
2013-10-20 20:30:16 -07:00
Mark Otto 5aa4c5cb0c fixes #11139: add position: relative; to .modal-dialog so that z-index takes effect 2013-10-20 20:04:10 -07:00
Mark Otto 369f5ba760 Merge branch 'master' of https://github.com/jeonghwan-kim/bootstrap into jeonghwan-kim-master
Conflicts:
	dist/css/bootstrap.min.css
2013-10-20 19:55:56 -07:00
Mark Otto dd34102cb6 Fixes #10522: Enable use of form validation class on .radio, .checkbox, .radio-inline, and .checkbox-inline 2013-10-20 19:54:22 -07:00
Mark Otto 23a85d6a7a fixes #11126: remove box-shadow from open dropdown toggle with .btn-link 2013-10-20 17:59:15 -07:00
Mark Otto 6d5c5105fa Merge pull request #11186 from twbs/carousel_indicators_ie
Carousel indicators for IE8-9
2013-10-20 17:48:36 -07:00
Mark Otto bc76be5dcf Merge branch 'master' into carousel_indicators_ie
Conflicts:
	dist/css/bootstrap.min.css
2013-10-20 17:45:07 -07:00
Mark Otto f45c05a97a fixes #11151: remove unused h5bp class from print CSS 2013-10-20 17:40:19 -07:00
Mark Otto 5e70642dd2 Merge branch 'master' into carousel_indicators_ie 2013-10-20 16:53:57 -07:00
Mark Otto ecadbe56f7 mo grunt 2013-10-20 16:53:45 -07:00
Mark Otto ac6a7f044e Merge branch 'master' into carousel_indicators_ie
Conflicts:
	dist/css/bootstrap.min.css
2013-10-20 16:49:18 -07:00
Mark Otto ecc6d9873f Merge branch 'master' of github.com:twbs/bootstrap 2013-10-20 16:48:52 -07:00
Mark Otto 291fd9828c run grunt dist 2013-10-20 16:48:42 -07:00
Mark Otto 6a93a6b88a Fixes #10903 and #10457: IE8-9 don't support events on elements without background-color, so we have to hack it 2013-10-20 16:46:38 -07:00
Mark Otto 438a40a7f8 Merge pull request #11183 from ZDroid/patch-1
Continue tag way implementation
2013-10-20 14:55:10 -07:00
Zlatan Vasović 8a9e1af18d Continue tag way implementation 2013-10-20 18:50:14 +02:00
Rogério Yokomizo 15f15cafd6 added bower_components to .gitignore 2013-10-19 01:07:10 -03:00
Chris Rebert 32468b087b Merge pull request #11166 from ZDroid/tag_way
(Not HTML) tag way is much better
2013-10-18 13:14:03 -07:00
Zlatan Vasović d2ad1dc88f (Not HTML) tag way is much better 2013-10-18 21:34:18 +02:00
LFeh 77bb7502bc Options of sizes added in modal 2013-10-18 10:05:50 -03:00
Mark Otto eb4a92bfed Merge pull request #11155 from twbs/ie8-file-proto-respond.js-examples-warnings
Warn about IE8 + Respond.js + file:// problem in examples
2013-10-17 19:17:05 -07:00
Mark Otto 0806819bcf Merge pull request #11156 from twbs/mobile-modals-xref
JS docs: add cross-reference to Getting Started mobile modal section
2013-10-17 19:16:12 -07:00
Chris Rebert 73bb911b29 JS docs: add cross-reference to Getting Started mobile modal section 2013-10-17 19:12:24 -07:00
Chris Rebert c23d6a2766 Warn about IE8 + Respond.js + file:// problem in examples; fix #11019 2013-10-17 18:39:03 -07:00
Mark Otto 4c043b7d5f Merge pull request #11096 from twbs/navbar-button-docs
Resolves #10923
2013-10-17 14:53:50 -07:00
Mark Otto 70d85be3b7 Merge branch 'master' into navbar-button-docs 2013-10-17 14:47:31 -07:00
Mark Otto 96a19c18fb copy change, add to buttons anchor section 2013-10-17 14:47:27 -07:00
Mark Otto bb30f6355a Merge branch 'fix-11112' 2013-10-17 14:11:46 -07:00
Mark Otto 1f33dc8033 even shorter banner; remove space between slash and period 2013-10-17 14:11:40 -07:00
Chris Rebert c88cd1cd95 add explicit copyright header to docs CSS & JS files; fixes #11112 2013-10-17 14:02:22 -07:00
Chris Rebert 872c3588f3 Merge pull request #11150 from ZDroid/patch-1
FIx invalid element selector
2013-10-17 12:35:15 -07:00
Zlatan Vasović 5f79354dbe FIx invalid element selector
`kbd` (keyboard) is right, not `kdb`. :P
2013-10-17 21:25:08 +02:00
Chris Rebert 25b7a5200d fix #11144 2013-10-17 11:21:06 -07:00
Chris Rebert a28b2cb9e1 Merge pull request #11141 from vincentchan/master
Update translation sites URL
2013-10-17 01:01:49 -07:00
Vincent Chan d8a68e38f7 Update translation URL 2013-10-17 15:52:59 +08:00
Max Edmands 693915d127 Active state overrides contextual list-item styles 2013-10-16 22:56:13 -07:00
Aaron Borden 0c2055ef38 Adding contextual styles to list-items 2013-10-16 19:02:04 -07:00
Mark Otto 3e9e339ee3 Merge pull request #11137 from twbs/explain-https
add note about third-party JS, CDNs, and HTTPS
2013-10-16 17:28:46 -07:00
Chris Rebert 4d663e3879 add note about third-party JS, CDNs, and HTTPS 2013-10-16 15:50:40 -07:00
Chris Rebert cf95fe20ba upgrade to html5shiv v 3.7.0 2013-10-16 15:36:37 -07:00
Mark Otto c1bf625dfe Merge branch 'master' of github.com:twbs/bootstrap 2013-10-16 10:44:03 -07:00
Mark Otto 8ac1495c63 redo the glyphicons icons list to make icons not blurry on edges /cc @jankovarik 2013-10-16 10:43:56 -07:00
Julian Thilo d880398038 Merge pull request #11128 from lipis/patch-3
Fixed broken link in README.md
2013-10-16 09:34:27 -07:00
Lipis 397481903a Fixed broken link 2013-10-16 16:42:32 +02:00
jeonghwan 976f6dfdad Fixes issue #11122 -- navbar-fixed-bottom border
Enable border-top in .navbar-fixed-bottom
2013-10-16 23:20:34 +09:00
Steven Black 4dffe7d2e3 Fixes issue #11098 -- Button documentation. 2013-10-16 09:39:45 -04:00
Chris Rebert e317e116fd add dots to class name references for consistency 2013-10-15 17:25:34 -07:00
Mark Otto 401dca0ed7 Merge pull request #11110 from nikolawannabe/patch-1
Include a note about text-based form control styling
2013-10-15 17:07:22 -07:00
Case Talbot 9d54a42951 Include a note about text-based form control styling
fixes #8824.
2013-10-15 17:02:21 -07:00
Mark Otto 481791411c Merge branch 'master' of github.com:twbs/bootstrap 2013-10-15 14:11:29 -07:00
Mark Otto acd4a0a140 update jumbotron docs; fixes #11109 2013-10-15 14:11:21 -07:00
Mark Otto 723f85fc0d Merge pull request #11105 from twbs/license-note
Add notes about dual-licensing contributions before switching to MIT in v3.1
2013-10-15 13:12:46 -07:00
Rhodry Korb dd5c8a53ee Add Note About Changing to MIT 2013-10-15 13:06:27 -07:00
Geremia Taglialatela 3bfa630d2a Added opacity to customizer and rebuilt customizer 2013-10-15 21:13:49 +02:00
Geremia Taglialatela 160ed85616 Customizable backdrop opacity 2013-10-15 20:53:56 +02:00
Mark Otto 2380b6be99 Merge pull request #11102 from ZDroid/less-fix
Ditch `&`, as `+ ...` is enought
2013-10-15 11:19:24 -07:00
Zlatan Vasović 0423635614 Ditch &, as + ... is enought 2013-10-15 17:35:11 +02:00
Mark Otto dc495fe9d9 nuke commented out docs css 2013-10-14 22:08:23 -07:00
Alex Kalicki 21fad33858 Resolves #10923
Rebased from #10930
2013-10-14 21:20:17 -07:00
Chris Rebert b05a287eb6 run grunt 2013-10-14 20:47:56 -07:00
Chris Rebert a28d9539c7 fix #10952 2013-10-14 20:45:43 -07:00
Mark Otto 67829c6571 Merge pull request #11094 from twbs/address-10049
Recommend only <div> (not <span>) for putting tooltips on disabled elements
2013-10-14 20:21:17 -07:00
Chris Rebert 27e2c56792 In docs, recommend only <div> (not <span>) for putting tooltips on disabled elements
Per issue comments, `display: inline` elements like <span> don't work for this.
Resolves #10049
2013-10-14 20:18:12 -07:00
Mark Otto a44bd01628 Merge pull request #10533 from topsitemakers/master
adding required attribute for example signin form
2013-10-14 19:56:33 -07:00
Chris Rebert f11aa31023 Merge pull request #10519 from zba/master
changed attr('data-target') to data('target');
2013-10-14 19:14:58 -07:00
Chris Rebert b5d7a51bff Merge pull request #10779 from ssorallen/customizer-bootstrap-less-order
Use bootstrap.less file order in Customizer
2013-10-14 18:56:10 -07:00
Chris Rebert 4e1808930a add IDs to frequently-referenced parts of the docs 2013-10-14 16:24:58 -07:00
Mark Otto 036712ed90 Merge pull request #11091 from yokomizor/extended_thumbnail_hover_state
Extended hover state of linked versions of .thumbnail
2013-10-14 16:14:28 -07:00
Rogério Yokomizo e20b02ad0b extended hover state of linked versions of .thumbnail 2013-10-14 20:10:49 -03:00
Mark Otto fa64846acf Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	dist/css/bootstrap.min.css
2013-10-14 13:45:57 -07:00
Mark Otto 7100711577 unnest the list-group-item link variation for #11085 and #11088 2013-10-14 13:45:32 -07:00
Mark Otto 3fb1381a30 Merge pull request #11084 from ZDroid/variable_way
Unhardcode .table-responsive bottom margin
2013-10-14 11:33:27 -07:00
Mark Otto 256f3a99c3 Merge pull request #11086 from twbs/table-responsive-breakpoint
fix .table-responsive media query; refs #11067
2013-10-14 11:32:46 -07:00
Mark Otto 50dd5d5088 fix about page html validation and run grunt 2013-10-14 11:30:06 -07:00
Mark Otto 6307d2c94d Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	getting-started.html
2013-10-14 11:06:25 -07:00
Mark Otto 1f5c754d57 remove dupe content 2013-10-14 11:05:49 -07:00
Chris Rebert 5c64ef393c fix .table-responsive media query; refs #11067 2013-10-14 10:58:12 -07:00
Zlatan Vasović 4ce1b08c32 Unhardcode .table-responsive bottom margin 2013-10-14 18:22:31 +02:00
Mark Otto 70278a4e4f Merge pull request #11078 from twbs/issue-11019-note
add note to docs about Respond.js & file:// ; fixes part of #11019
2013-10-14 09:09:02 -07:00
Mark Otto efc741b151 Merge pull request #11082 from ZDroid/nuke_zeros
Nuke trailing zeros
2013-10-14 09:08:28 -07:00
Zlatan Vasović b3c04c95d3 Nuke trailing zeros 2013-10-14 15:06:58 +02:00
Chris Rebert 3431f32349 Merge pull request #11079 from wangsai/mother-language
change english link text to chinese
2013-10-14 01:21:26 -07:00
wangsai ee8ba8b540 Add description. And complete russian and spanish languages 2013-10-14 16:04:48 +08:00
Chris Rebert 3c69f59fe5 make Getting Started page's HTML more valid 2013-10-14 00:40:51 -07:00
Chris Rebert df46b1b46e make About page's HTML more valid 2013-10-14 00:38:19 -07:00
Chris Rebert ceb7694ee3 add note to docs about Respond.js & file:// ; fixes part of #11019 2013-10-14 00:10:30 -07:00
wangsai 67c48f7703 change english link text to chinese 2013-10-14 14:52:53 +08:00
Chris Rebert 9416cd3738 update to latest jszip
commit 04fc93045334dc1b679aba5c2dce206da777a85c
2013-10-12T12:39:56-07:00
2013-10-13 23:37:16 -07:00
Chris Rebert 3abe86b7ed Merge pull request #11076 from twbs/respond-js-cdn
use CDN for respond.js
2013-10-13 23:26:28 -07:00
Mark Otto 111b9bd194 Merge pull request #11077 from twbs/avoid-docs-assets-in-example
avoid referencing /docs-assets/ in Getting Started docs example; use CDN URL for respond.js
2013-10-13 23:25:23 -07:00
Mark Otto e521be0f22 Merge pull request #11075 from twbs/respond-js-cross-domain-note
fix #11003
2013-10-13 23:24:35 -07:00
Chris Rebert 8450aa7dbf avoid referencing /docs-assets/ in Getting Started docs example; use CDN URL for respond.js 2013-10-13 23:23:04 -07:00
Mark Otto 202f395b2f Merge branch 'docs_welcome' 2013-10-13 23:19:17 -07:00
Mark Otto 25607c2683 add translations, copy edit a few things, and fix alignment of ads 2013-10-13 23:19:11 -07:00
Chris Rebert c5da0597bc use CDN for respond.js 2013-10-13 23:18:30 -07:00
Chris Rebert f0f1b8319d fix #11003 2013-10-13 22:55:50 -07:00
Mark Otto 810a852f4a Merge pull request #11046 from ZDroid/patch-3
Nicer docs license name
2013-10-13 20:26:36 -07:00
Mark Otto 9da73d79c2 run grunt 2013-10-13 20:12:07 -07:00
Mark Otto e7379f75bd no trailing decimal place 2013-10-13 20:04:28 -07:00
Mark Otto fbc67a395f Merge branch 'master' of github.com:twbs/bootstrap 2013-10-13 20:04:00 -07:00
Mark Otto 36b4639b0d Merge pull request #10949 from StevenBlack/jumbotron.fontsize
Jumbotron: remove the hard-coded font-size from jumbotron.less and moved...
2013-10-13 20:03:02 -07:00
Mark Otto be4e951b7d scope top padding of .form-control-static to be within horizontal forms only; fixes #10927 2013-10-13 20:02:24 -07:00
Mark Otto 44b32a3036 move .hidden to utilities; fixes #10997 2013-10-13 19:59:42 -07:00
Mark Otto 7bd955318a run grunt on that scaffolding change 2013-10-13 19:57:45 -07:00
Mark Otto 5a411af967 Merge branch 'master' of github.com:twbs/bootstrap 2013-10-13 19:57:23 -07:00
Mark Otto f946ff5d25 fix #10257 2013-10-13 19:57:14 -07:00
Mark Otto 7112d06a2b Merge pull request #10955 from ZDroid/patch-1
Insert comma to fix validation warning
2013-10-13 19:41:12 -07:00
Mark Otto f660bd4205 clarify more grid stuff, specifically 100% fluid designs; fixes #10711 2013-10-13 19:36:39 -07:00
Mark Otto 950453db43 mention rows must be in containers in grid docs 2013-10-13 19:31:39 -07:00
Mark Otto ee4a1ea295 docs notice for #11010 2013-10-13 19:24:13 -07:00
Mark Otto bf4c714851 follow up to #10102, cc @cvrebert 2013-10-13 19:12:23 -07:00
Mark Otto ed12d41cae add docs example for #10938 to show responsive column clearing in grid 2013-10-13 19:10:17 -07:00
Mark Otto a43696467f Merge pull request #11050 from twbs/restore_grid_mixins
Restore grid mixins
2013-10-13 19:03:29 -07:00
Mark Otto bf73f1f9d3 Merge branch 'master' into restore_grid_mixins
Conflicts:
	dist/css/bootstrap.min.css
2013-10-13 18:59:40 -07:00
Mark Otto 6351c30782 comment and spacing 2013-10-13 18:58:09 -07:00
Mark Otto 6085973e25 drop .tabbable since it's unused and undocumented /cc #10102 2013-10-13 18:56:31 -07:00
Mark Otto dcbe591fa9 mention .invisible in docs per #10102 2013-10-13 18:56:03 -07:00
Mark Otto 2d1fa8cb5b mention .invisible in docs per #10102 2013-10-13 18:54:15 -07:00
Mark Otto fd293be5a1 mention tooltip markup in docs per #10102 2013-10-13 18:49:13 -07:00
Mark Otto c31ec22661 Merge branch 'master' of github.com:twbs/bootstrap 2013-10-13 18:44:06 -07:00
Mark Otto edca93b8c7 mention .modal-open and .modal-backdrop in docs /cc #10102 2013-10-13 18:43:19 -07:00
Mark Otto 6fa9037e1c mention .dropdown-backdrop and .open in dropdown docs /cc #10102 2013-10-13 18:40:47 -07:00
Mark Otto 6a93e729db Merge pull request #11016 from twbs/address-10965
address #10965; mention Glyphicons-over-file:// problem in Carousel example
2013-10-13 18:35:10 -07:00
Mark Otto 265fda7903 Merge branch 'master' into restore_grid_mixins
Conflicts:
	dist/css/bootstrap.min.css
2013-10-13 18:32:34 -07:00
Mark Otto 727a91de1c another grid .row mention 2013-10-13 17:25:27 -07:00
Mark Otto 49f177fe60 finish grid docs intro for now; needs work though 2013-10-13 17:12:04 -07:00
Mark Otto be1f0b07f3 mention .small in docs /cc #10102 2013-10-13 16:02:56 -07:00
Mark Otto 590975b407 remove undocumented and unsupported .pill-content and .pill-pane /cc #10102 2013-10-13 15:55:13 -07:00
Mark Otto 6c9ec3d87f run grunt dist on .small additions 2013-10-13 15:54:49 -07:00
Mark Otto 857e697d72 Merge branch 'master' of github.com:twbs/bootstrap 2013-10-13 15:24:48 -07:00
Mark Otto ef2e0c99f4 remove screen from all docs media queries 2013-10-13 15:24:39 -07:00
Mark Otto 12fa502e67 Document caret /cc #10102 2013-10-13 15:23:58 -07:00
Zlatan Vasović c75f8a5bf6 Sort dependencies A-Z 2013-10-13 05:31:47 -07:00
Mark Otto 570aa8a309 Merge pull request #11059 from ZDroid/patch-5
Add more functionality to .small to match <small>
2013-10-12 16:58:49 -07:00
Mark Otto d82650102c Merge pull request #10933 from ZDroid/patch-2
Change border to border-radius
2013-10-12 15:35:07 -07:00
Zlatan Vasović 8098f4e5ba Add more functionality to .small 2013-10-12 23:28:50 +02:00
Mark Otto a46003b8c7 restore var to customizer 2013-10-11 22:01:11 -07:00
Mark Otto c814ad1833 Combine separate efforts for grid mixins into one, cleanup and reorganize 2013-10-11 22:00:37 -07:00
Mark Otto dcef0a78d5 Merge pull request #11049 from alexdahl/multiple-modals-doc
documentation that multiple modals are not supported
2013-10-11 18:52:57 -07:00
Alex Dahl dfdde46312 documentation that multiple modals are not supported 2013-10-11 18:11:58 -07:00
Zlatan Vasović 40db8e811d Nicer docs license name
DOCUMENTATION-LICENSE is so long.
2013-10-11 22:53:38 +02:00
Mark Otto 3ea40c0d4f Merge pull request #11018 from twbs/use-https
use https:// for CDN links
2013-10-10 13:37:06 -07:00
Chris Rebert a96aff1e56 fix typo in Getting Started docs prose 2013-10-10 02:27:26 -07:00
Chris Rebert 4b175d908c use https:// for CDN links
- works when viewing page via file://
- sets a good example security-wise
2013-10-10 01:51:18 -07:00
Chris Rebert c42af6951f address #10965; mention Glyphicons-over-file:// problem in Carousel example 2013-10-10 01:42:34 -07:00
Mark Otto 84413f6e29 Merge pull request #11013 from twbs/fix-10989
Use CDNs for more example JavaScripts
2013-10-09 20:05:21 -07:00
Chris Rebert 7016f02e51 Merge pull request #11015 from twbs/use-data-ride-carousel
use data-ride="carousel" in the docs & examples; fixes #11005
2013-10-09 19:49:44 -07:00
Chris Rebert ef1fc34e61 use data-ride="carousel" in the docs & examples; fixes #11005 2013-10-09 19:29:27 -07:00
Chris Rebert 4da37222cf re-remove execute permissions; apparent upstream bug 2013-10-09 18:58:50 -07:00
Chris Rebert 1a0df1fbd0 upgrade holder.js to v2.1 2013-10-09 18:52:57 -07:00
Chris Rebert a388b7906e Merge pull request #10956 from ZDroid/patch-4
Sort tasks alphabetically
2013-10-09 18:31:17 -07:00
Kurt Maine a216589056 Convert "Recess" to "RECESS"
Except when speaking of the "recess" Node package, RECESS should be in all-caps.
2013-10-09 18:18:05 -07:00
Chris Rebert ca090aef02 fix #10805 2013-10-09 18:07:08 -07:00
Chris Rebert f9ed8e6f00 trivial refactor in build-customizer grunt task 2013-10-09 18:03:08 -07:00
herom aad70834fc Fixes #9925: convert font data to base64, fixing 0xefbfbd (Unicode Replacement Character) chars in customizer fonts.
Merges #9982
2013-10-09 18:03:04 -07:00
Stuart P. Bentley 58a47b6bfd Customizer: include config.json in bootstrap.zip
merges #10633; fixes part of #9951
2013-10-09 17:35:26 -07:00
Chris Rebert 5e652332d1 use CDN for jQuery instead of vendoring it; fixes part of #10989 2013-10-09 16:36:15 -07:00
Chris Rebert d72768a16a use CDN for html5shiv instead of vendoring it; fixes part of #10989 2013-10-09 16:36:02 -07:00
Chris Rebert d820c6d225 there's no reason for holder.js to be executable 2013-10-09 15:34:39 -07:00
Chris Rebert da4a275473 Merge pull request #10896 from ZDroid/patch-3
Change clone protocol from git:// to https://
2013-10-09 12:45:43 -07:00
Mark Otto a007769ac3 Merge pull request #10998 from ZDroid/patch-7
Remove [type]
2013-10-09 10:12:17 -07:00
Chris Rebert 65b5b20776 Merge pull request #10996 from ZDroid/patch-6
Updare grunt-jekyll dependency
2013-10-09 01:39:56 -07:00
Zlatan Vasović 62c905f5bc Remove [type]
type="text/css" isn't needed
2013-10-09 09:45:05 +02:00
Zlatan Vasović ef3ac6808f Updare grunt-jekyll dependency 2013-10-09 08:33:03 +02:00
Chris Rebert 730d7f0b13 fix #10986 2013-10-08 11:44:30 -07:00
Mark Otto 969cb04acb Fixes #10126: Update responsive test cases to properly highlight hidden class examples 2013-10-07 15:00:46 -05:00
Mark Otto 352532cd63 Half fix for #9855: Don't fuck with margins for open modal dialog on account of Lion non-scrollbars and inconsistencies elsewhere 2013-10-07 14:39:11 -05:00
Mark Otto 0647049513 Merge branch 'master' of github.com:twbs/bootstrap 2013-10-07 14:32:29 -05:00
Mark Otto 1adbe2043a Fixes #10959: round the .lead values down to nearest pixel via floor() 2013-10-07 14:32:23 -05:00
Mark Otto 704635818f run grunt 2013-10-07 14:31:41 -05:00
Chris Rebert d32380657b Merge pull request #10962 from twbs/doc-h1-thru-h6-classes
document .h1 thru .h6; fixes part of #10102
2013-10-07 00:55:21 -07:00
Chris Rebert a8afb46688 document .h1 thru .h6; fixes part of #10102 2013-10-06 20:18:03 -07:00
Mark Otto e62e7ffcbc Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	css.html
2013-10-06 19:06:40 -05:00
Mark Otto 61aa9a4f60 update gitignore to restore the ruby-version ignore and rename section to all docs stuff 2013-10-06 18:35:07 -05:00
Chris Rebert bb50e33a30 fix #10961 2013-10-06 16:17:32 -07:00
Mark Otto 1eca83336e Merge branch 'master' of github.com:twbs/bootstrap 2013-10-06 17:24:32 -05:00
Mark Otto 548603a926 fixes #10961: change variable names in grid docs 2013-10-06 17:24:26 -05:00
Steven Black 0740d01b4c Good catch by @juthilo - omitted the modified in a prior commit. 2013-10-05 20:48:28 -04:00
Steven Black c7120a7b04 The customizer now displays and collects the new Jumbotron font-size LESS variable 2013-10-05 18:38:45 -04:00
Steven Black 4b27c08783 The Jumbotron font-size LESS variable now conforms to the '@{bootstrapClass}-font-size' naming scheme. 2013-10-05 18:37:53 -04:00
Zlatan Vasović 146cd38867 Sort tasks alphabetically 2013-10-05 21:17:49 +02:00
Zlatan Vasović b1cc07fa15 Insert comma to fix validation warning
BS doesn't support IE6/IE7, so comma can be inserted.
2013-10-05 20:14:19 +02:00
Mark Otto 56093dea99 Merge pull request #10950 from twbs/docs-navbar-class
Fix #10948: Clarify navbar example target in docs
2013-10-05 10:59:44 -07:00
Julian Thilo e8d7fb0737 Change all navbar example targets
According to comment on https://github.com/twbs/bootstrap/issues/10948#issuecomment-25751889 .
2013-10-05 19:32:52 +02:00
Mark Otto a8f21b5ae9 merge in new ads 2013-10-05 11:44:41 -05:00
Martynas 80e8644230 removed outline from modal 2013-10-05 13:55:26 +03:00
Julian Thilo e246a97b91 Fix #10948: Clarify navbar example target in docs 2013-10-05 11:37:52 +02:00
Steven Black 38941881e9 Jumbotron: remove the hard-coded font-size from jumbotron.less and moved it into variables.less where other .font-size-xxxxx things now live. 2013-10-04 21:43:31 -04:00
Julian Thilo 56ee42d335 Merge pull request #10932 from ZDroid/patch-1
Correct grammar
2013-10-03 23:21:30 -07:00
Zlatan Vasović 6f9d980139 Change border to border-radius
Border isn't set, but border-radius is.
2013-10-03 23:15:49 +02:00
Zlatan Vasović 32c7483215 Correct grammar
Jekyll is the third person singular (it), so it should be 'its documentation', not 'their documentation'.
2013-10-03 23:05:23 +02:00
Tobias Lindig 70453c2327 unify button sizing, use mixin ".button-size" also for the base sized button 2013-10-03 10:43:35 -07:00
Chris Rebert c43462678c run grunt 2013-10-03 10:42:55 -07:00
Chris Rebert ab34f27c37 Merge pull request #10871 from ZDroid/patch-2
Remove .ruby-version from excludes
2013-10-03 10:21:39 -07:00
Mark Otto 79c3f23ac4 Merge pull request #10908 from ZDroid/patch-4
Indent banner to match the *'s
2013-10-02 10:59:03 -07:00
Zlatan Vasović dc5625c85b Indent banner to match the *'s 2013-10-02 14:33:17 +02:00
Chris Rebert a32b626f5c run up-to-date grunt 2013-10-01 11:01:08 -07:00
Mark Otto 93bc1af623 Merge branch 'master' of github.com:twbs/bootstrap 2013-10-01 11:37:53 -05:00
Mark Otto b352061d1d run grunt 2013-10-01 11:37:47 -05:00
Zlatan Vasović 41444cd83a Change clone protocol from git:// to https://
Cloning with git: protocol doesn't allow to change anything in `.git/`, like when using `git pull`.
2013-10-01 10:20:31 +02:00
Chris Rebert f9dd7466cf Merge pull request #10806 from twbs/ios-safari-pct-rounding
add iOS and versions to Safari percent rounding warning; fixes #10723
2013-09-30 18:11:20 -07:00
Chris Rebert 5bfd9e0d56 Merge pull request #10826 from twbs/doc-multiple-navbars-unsupported
document that multiple navbars aren't supported by default
2013-09-30 18:06:17 -07:00
Chris Rebert a97918297e add maintenance note regarding #10864's addition 2013-09-30 17:54:49 -07:00
Chris Rebert 5528c6501c document that multiple navbars aren't supported by default; addresses #10824 2013-09-30 17:44:50 -07:00
Mark Otto 0e628b6546 Merge pull request #10864 from akalicki/included_files
Added abridged form of 'What's included' docs to README
2013-09-30 17:15:15 -07:00
Mark Otto ef66c31dd4 Merge pull request #10856 from akalicki/grid_class_docs
Better documentation and optimized examples for grid classes
2013-09-30 17:11:55 -07:00
Mark Otto 33673a4008 Merge pull request #10865 from Quy/master
Apply help-block class to help text in customize.html
2013-09-30 17:10:48 -07:00
Mark Otto 25954702ea Merge pull request #10883 from ZDroid/patch-3
Remove "Remove margin on the body" from base css docs
2013-09-30 17:08:09 -07:00
Mark Otto 6670026572 Merge pull request #10889 from twbs/contextual-table-docs-xs
table contextual classes docs: .col-lg-* => .col-xs-*
2013-09-30 17:07:19 -07:00
Mark Otto cc3f09d4d1 Merge pull request #10888 from twbs/favor-xs-in-docs
use .col-xs-* in "Forms: Column Sizing" docs so more responsive
2013-09-30 17:06:31 -07:00
Shaun Dychko 355525b2b7 remove comma separating the color and the color-stop in -webkit-linear-gradient in the #gradient .vertical mixin. 2013-09-30 13:21:54 -07:00
Chris Rebert def45c1f74 table contextual classes docs: .col-lg-* => .col-xs-* 2013-09-30 11:01:29 -07:00
Chris Rebert 0b8a3e65aa use .col-xs-* in "Forms: Column Sizing" docs so more responsive 2013-09-30 10:52:59 -07:00
Chris Rebert 7247527f04 also use .col-sm-* in other .form-horizontal example for consistency 2013-09-30 10:45:20 -07:00
Zlatan Vasović f2d90d12dc Remove "Remove margin on the body" from base css docs
Normalize did that.
2013-09-30 19:31:41 +02:00
Zlatan Vasović 40c61a9bd7 Remove .ruby-version due to https://github.com/twbs/bootstrap/commit/4f20a29c329aa58919919426cbd2190fabfdb723 2013-09-30 11:26:52 +02:00
Chris Rebert df5aa7c0f1 Merge pull request #10869 from ZDroid/patch-2
Update qunit dependency
2013-09-30 01:09:30 -07:00
Zlatan Vasović 2306375d13 Update qunit dependency 2013-09-30 09:36:20 +02:00
Quy Ton 462f27813f Apply help-block class to help text in customize.html 2013-09-29 18:24:00 -07:00
Alex Kalicki 80d74c1bf7 Moved 'getting started' link out of 'What's included' section in README 2013-09-29 20:45:55 -04:00
Chris Rebert 362c9c9f89 rm unnecessary backslashes from jqueryCheck 2013-09-29 15:37:22 -07:00
Chris Rebert a84bd5d9f1 Merge pull request #10863 from DeanMarkTaylor/patch-2
Update Gruntfile.js fixing undefined jQuery check
2013-09-29 15:32:34 -07:00
Alex Kalicki e21c744a57 Added abridged form of 'What's included' docs to README 2013-09-29 18:17:46 -04:00
Dean Taylor 429e92fd58 Update Gruntfile.js fixing undefined jQuery check
The check to see if jQuery was defined as incorrect causing the "Bootstrap requires jQuery" message to only be displayed if jQuery is defined and has a value which equates to `false`.
2013-09-29 21:14:24 +01:00
Alex Kalicki e34e73714a Better documentation and optimized examples for grid classes 2013-09-28 22:51:30 -04:00
Chris Rebert 1809894e8a Merge pull request #10855 from dan-silver/master
Spelling mistakes in documentation.
2013-09-28 14:42:59 -07:00
Dan Silver 708dbe58f6 Spelling mistakes in documentation. 2013-09-28 16:21:23 -05:00
Chris Rebert fc2cde0230 Merge pull request #10841 from DeanMarkTaylor/patch-1
Update Gruntfile.js removing pointless reading of customize.html.
2013-09-27 10:23:28 -07:00
Dean Taylor f39db19306 Update Gruntfile.js removing pointless reading of customize.html.
I couldn't see a reason to read "customize.html", removed line.
2013-09-27 18:17:02 +01:00
Rodrigo Willrich f32abbb6e1 bower.json: Modify assets directory on ignore to docs-assets 2013-09-27 09:04:33 -03:00
Alexander Prinzhorn 12a3bb31f8 Only preventDefault on click on [data-toggle="modal"] when the element is a link
In it's current state Bootstrap always prevents the default action for a click
event on `[data-toggle="modal"]` elements
(see https://github.com/twbs/bootstrap/blob/master/js/modal.js#L233).
Instead this should only happen when the element is a link.
2013-09-27 11:32:06 +02:00
Chris Rebert eb3807609a Merge pull request #10827 from akalicki/issue_10726
Resolves #10726 - clarifies javascript tab markup in docs
2013-09-26 15:04:23 -07:00
Alex Kalicki 5d6e1d742d Resolves #10726 - clarifies javascript tab markup in docs 2013-09-26 17:49:03 -04:00
Chris Rebert 1cf8fcda65 add iOS and versions to Safari percent rounding warning; fixes #10723 2013-09-25 17:25:50 -07:00
Travesty3 1c1850f63e Add 'collapse' class back after expanding 2013-09-25 08:59:01 -04:00
Mark Otto 1a476b623e don't include . in link 2013-09-24 21:27:49 -05:00
Mark Otto 827fbc0a11 Merge pull request #10797 from twbs/input-groups-xref
add cross-reference to Input Groups in CSS Form docs; fixes #10792
2013-09-24 19:26:58 -07:00
Chris Rebert 2fa03734a3 add cross-reference to Input Groups in CSS Form docs; fixes #10792 2013-09-24 18:48:38 -07:00
Mark Otto 76e9d393ba Merge pull request #10796 from twbs/skip-to-main-content
Use "Skip to main content" phrasing consistently; further #10786 fixes
2013-09-24 18:37:13 -07:00
Chris Rebert af4d102767 Use "Skip to main content" phrasing consistently; further #10786 fixes 2013-09-24 18:02:18 -07:00
Mark Otto 63206a17e8 Merge pull request #10786 from acspike/skip-nav-link-wording
Alter wording of example Skip Nav link to improve pronunciation
2013-09-24 17:24:00 -07:00
Mark Otto cf915f9c64 Merge pull request #10790 from twbs/disable-compatibility-mode
Disable IE Compatibility Mode in docs, examples
2013-09-24 17:16:06 -07:00
Julian Thilo 735105ae72 Add note about IE mode tag being included in docs 2013-09-24 22:49:47 +02:00
Chris Rebert f19126ed08 Merge pull request #10778 from twbs/old-android-glyphicons-fix
Use updated Glyphicons to workaround old Android WebKit bug
2013-09-24 10:39:03 -07:00
Aaron Spike dcfd9f27ff Alter wording of example Skip Nav link to improve pronunciation
Screen reading applications, including Apple's VoiceOver, improperly pronounce the word "content" in "Skip to content" as an adjective rather than a noun because of insufficient context. "Skip to main content" is pronounced correctly. 

See #6 and Guideline #10 at the following site for more information:
http://redish.net/content/papers/interactions.htmlAlter wording of example Skip Nav link to improve pronunciation
2013-09-24 11:52:06 -05:00
Julian Thilo 33e0877d21 Disable IE Compatibility Mode in docs, examples
...because we don't support it and it may cause problems for people
trying to view the docs in IE.
2013-09-24 18:43:16 +02:00
Ross Allen 3663e37005 Use bootstrap.less file order in Customizer
Appending stylesheets by iterating the `__less` Hash creates an order
that is not the same as 'bootstrap.less'.

Some stylesheets like 'component-animations.less' and 'modals.less' have
selectors with matching specificity, and so file order decides which
style wins. This causes issue #10030 by putting `.fade.in` after
`.modal-backdrop.in` and gives the backdrop a higher opacity than
intended.

This change uses the Less ordering in 'bootstrap.less' to generate the
final stylesheets in the Customizer to make sure customized file
ordering matches the distribution file order.

Fixes #10030
2013-09-23 23:33:20 -07:00
Chris Rebert 48f15faa5d run grunt dist 2013-09-23 22:43:48 -07:00
Chris Rebert 2d0f5565ab re-sort affected .glyphicon-* classes by new codepoints 2013-09-23 22:43:48 -07:00
Chris Rebert b160e61451 Update affected .glyphicon-* CSS classes to use new codepoints
.glyphicon-briefcase: U+1F4BC -> U+E139
.glyphicon-calendar:  U+1F4C5 -> U+E109
.glyphicon-pushpin:   U+1F4CC -> U+E146
.glyphicon-paperclip: U+1F4CE -> U+E142
.glyphicon-camera:    U+1F4F7 -> U+E046
.glyphicon-lock:      U+1F512 -> U+E033
.glyphicon-bell:      U+1F514 -> U+E123
.glyphicon-bookmark:  U+1F516 -> U+E044
.glyphicon-fire:      U+1F525 -> U+E104
.glyphicon-wrench:    U+1F527 -> U+E136
2013-09-23 22:43:48 -07:00
Chris Rebert dca7be6b67 Update Glyphicons font to resolve #10106
Workaround an old Android WebKit bug by switching to codepoints within the BMP.
Details: http://stackoverflow.com/questions/9241519/webkit-css-content-unicode-bug
Extra special thanks to @jankovarik for doing this update. <3
Source: https://www.dropbox.com/s/clh9y6lqtmj01l8/halflings_updated_for_android.zip
(As posted in https://github.com/twbs/bootstrap/issues/10106#issuecomment-24539909 )
2013-09-23 22:41:43 -07:00
Chris Rebert b80f58b336 run grunt dist 2013-09-23 22:34:36 -07:00
Mark Otto 9ce142ca12 Merge pull request #10768 from twbs/polaroid-thumbnail-docs
fix #10767; current .img-thumbnail is equivalent to old .img-polaroid
2013-09-23 19:10:38 -07:00
Mark Otto 62c9199dc5 Merge pull request #10770 from twbs/rename-assets
move /assets/ to /docs-assets/ ; fixes #10715
2013-09-23 19:08:50 -07:00
Mark Otto 5911d95d69 Merge pull request #10769 from twbs/deprecate-hide
deprecate .hide; fixes #10446
2013-09-23 19:08:01 -07:00
Chris Rebert f503efc490 avoid using the term "assets" due to potential confusion 2013-09-23 13:02:33 -07:00
Chris Rebert 8aa5181126 move /assets/ to /docs-assets/ ; fixes #10715 2013-09-23 13:02:26 -07:00
Chris Rebert c4e7e3c933 deprecate .hide; fixes #10446 2013-09-23 12:46:57 -07:00
Chris Rebert 29935e4e26 fix #10767; current .img-thumbnail is equivalent to old .img-polaroid 2013-09-23 12:06:33 -07:00
Chris Rebert 229469e059 Merge pull request #10763 from XhmikosR/html5shiv
Update html5shiv to v3.7.0.
2013-09-23 09:03:16 -07:00
XhmikosR d675e82e50 Update html5shiv to v3.7.0. 2013-09-23 16:51:49 +03:00
Jochen Berger f350d1ba3d don't create new Tooltip/Popover objects just to destroy them immediately 2013-09-23 15:14:37 +02:00
Mark Otto 8a181a1388 Merge pull request #10695 from FredericoC/fix-nav-active-caret
Fixed issue where caret wouldn't inherit "active" li style on nav-pills
2013-09-22 16:53:01 -07:00
Mark Otto 5b12736fb7 Merge pull request #10741 from ZDroid/patch-1
Avoid LESS nesting if isn't needed
2013-09-22 07:25:33 -07:00
Mark Otto ed44a3255c Merge branch 'master' of github.com:twbs/bootstrap 2013-09-22 09:20:15 -05:00
Mark Otto 000b445a04 Fixes #10755: Don't remove quotes around q element by default 2013-09-22 09:19:37 -05:00
Chris Rebert 88854a83d1 Merge pull request #10749 from ZDroid/patch-2
@headingsColor → @headings-color
2013-09-21 14:19:21 -07:00
Zlatan Vasović dc3d16648c @headingsColor → @headings-color 2013-09-21 14:19:11 +02:00
Mark Otto 86ec05793a Merge pull request #10693 from twbs/include-docs-license
include a copy of the CC-BY 3.0 License that the docs are under
2013-09-20 22:14:57 -07:00
Chris Rebert 68c6deebda fix #10737 2013-09-20 11:49:32 -07:00
Chris Rebert d8ba5989cd Merge pull request #10743 from hnrch02/patch-1
Fix a silly typo
2013-09-20 10:49:13 -07:00
Heinrich Fenkart c938c4438f Fix a silly typo 2013-09-20 19:43:47 +02:00
Zlatan Vasović 2304ba6a25 Avoid LESS nesting if isn't needed 2013-09-20 18:06:48 +02:00
Mark Otto e148923f27 Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	dist/css/bootstrap.min.css
2013-09-19 22:57:11 -05:00
Mark Otto ef636bd62d Fixes #10694: Remove unnecessary content property from .caret 2013-09-19 22:56:17 -05:00
Mark Otto 22d308b2c1 Merge pull request #10724 from ZDroid/patch-1
white → #fff
2013-09-19 17:20:47 -07:00
Chris Rebert 607b802d2f fix #10732 2013-09-19 15:49:53 -07:00
Lipis c6eca2c9ca Same fix for the navbar example of sticky footer 2013-09-19 20:49:16 +02:00
Lipis 7823136a79 Removed the unnecessary override and the !important from .wrap
In the sticky footer example there were some weird stuff..
2013-09-19 20:48:16 +02:00
Zlatan Vasović 73403b78cc white → #fff 2013-09-19 16:41:06 +02:00
Chris Rebert abad169f4b Merge pull request #10710 from XhmikosR/patch-2
Patch 2
2013-09-18 23:44:56 -07:00
XhmikosR 0379c2056d Update jszip.js to the latest git. 2013-09-19 09:27:09 +03:00
XhmikosR b741608964 Show minification report for uglify-js. 2013-09-19 08:33:52 +03:00
Chris Rebert 5deee652f9 Merge pull request #10703 from XhmikosR/sort
Sort by name.
2013-09-18 13:15:18 -07:00
XhmikosR 3c0489102e Sort by name. 2013-09-18 20:36:17 +03:00
Chris Rebert 68099ec275 Merge pull request #10682 from gordonwoodhull/master
Suggest documenting changes to plugin classes
2013-09-18 09:54:41 -07:00
Chris Rebert 1882d15db8 Merge pull request #10680 from XhmikosR/master
Update normalize to v2.1.3.
2013-09-18 09:38:14 -07:00
Gordon Woodhull 40d3e4c48b merge plugin changes into main table 2013-09-18 07:44:56 -04:00
XhmikosR 45b6c6de46 Run grunt dist. 2013-09-18 08:14:39 +03:00
XhmikosR 60afea85b4 less/mixins.less: tabs to spaces. 2013-09-18 08:14:19 +03:00
XhmikosR 0cd6d35058 Update normalize to v2.1.3. 2013-09-18 08:05:34 +03:00
Frederico Carvalho 29f24f746c corrected caret colour when a nav dropdown is open 2013-09-18 14:45:56 +10:00
Frederico Carvalho b1208f380a fixed issue where caret wouldn't inherit "active" li style on nav-pills, which caused the caret to stay blue 2013-09-18 14:31:52 +10:00
Chris Rebert 0de96b8f35 include a copy of the CC-BY 3.0 License that the docs are under
downloaded from http://creativecommons.org/licenses/by/3.0/legalcode.txt
2013-09-17 18:58:15 -07:00
Chris Rebert 4e962c572e fix #10692 2013-09-17 17:41:58 -07:00
Gordon Woodhull abee1cdf9d a start at documenting plugin class changes 2013-09-17 12:03:02 -04:00
Mark Otto f2750dd6bc Merge pull request #10626 from buob/variablize-nav-pill-border-radius
Variablize nav pill border radius
2013-09-16 22:00:39 -07:00
Mark Otto 21486ffad8 Merge pull request #10641 from ggam/remove-accordion
Removed unneeded 'accordion-toggle' class from collapse examples
2013-09-16 21:53:27 -07:00
Mark Otto 02423caa85 Merge branch 'master' of github.com:twbs/bootstrap 2013-09-16 21:49:12 -07:00
Mark Otto bf47968d9c Merge pull request #10655 from Soben713/master
Remove unnecessary semicolons
2013-09-16 21:49:01 -07:00
Mark Otto 63d1d09ebd run grunt 2013-09-16 21:43:55 -07:00
Mark Otto 8f43820fff Merge branch 'master' of github.com:twbs/bootstrap 2013-09-16 21:42:43 -07:00
Mark Otto 515e11da32 Merge pull request #10663 from lipis/patch-1
Changed the border-color of .navbar-form to @navbar-default-border
2013-09-16 20:36:04 -07:00
Mark Otto c14fe7904a Merge branch 'master' of github.com:twbs/bootstrap 2013-09-16 18:59:06 -07:00
Mark Otto 776d3fd6a0 fixes #9908: add type attribute to customizer compile button to prevent accidental submissions 2013-09-16 18:58:52 -07:00
Chris Rebert 630bf13fb4 Merge pull request #10664 from ZDroid/patch-1
Fix package.json
2013-09-16 12:15:23 -07:00
Zlatan Vasović d7fb54e5fb Remove "js" keyword /cc @cvrebert 2013-09-16 20:40:12 +02:00
Chris Rebert 46bb8b4290 Merge pull request #10661 from Shotster/simplified-responsive-invisibility
Simplified CSS responsive-invisibility mixin
2013-09-16 10:59:22 -07:00
Zlatan Vasović 66abfe577e Fix package.json
* Add "js" keyword
* Fix homepage link
* Bump grunt-contrib-connect to newer version
2013-09-16 19:42:52 +02:00
Lipis a6e2a93feb Changed the border-color of .navbar-form to @navbar-default-border 2013-09-16 19:36:39 +02:00
Kevin Lisota cde1b9a178 add responsive CSS to hyperlinked images when thumbnail caption markup is used
When thumbnail caption markup is used in combination with a hyperlinked image, the image is not responsive. (non-hyperlinked images are fine, like the example in the docs) Adding a selector to apply responsiveness to hyperlinked images when thumbnail captions are used.
2013-09-16 08:21:09 -07:00
Steve S ae3a9169e0 Simplified CSS responsive-invisibility mixin 2013-09-16 09:16:53 -05:00
Soheil Behnezhad cc69911335 Derp, there were more 2013-09-16 16:37:03 +04:30
Soheil Behnezhad 0c39045222 Remove some more unnecessary semicolons 2013-09-16 16:25:53 +04:30
Chris Ziogas ab3d0a27b3 Dropdown in panel header does not inherit its colors
Fix for issue #10627
2013-09-16 12:38:26 +03:00
Soheil Behnezhad bff23ee1fe Remove unnecessary semicolons 2013-09-16 13:47:48 +04:30
Chris Rebert 559fcbfbd6 Merge pull request #10653 from homeyer/patch-1
remove duplicate text in documentation for popover
2013-09-15 20:11:56 -07:00
Andrew Homeyer 31f32e8485 remove duplicate text in documentation for popover 2013-09-15 21:07:15 -06:00
ggam 3a20ec410b Removed unneeded 'accordion-toggle' class. Fixes #10481 2013-09-14 19:15:42 +02:00
Jake Buob 2381ab088b Add nav-pills-border-radius variable 2013-09-13 15:57:10 -04:00
Jake Buob 4d4976fdcc Make nav pills border-radius border-radius-base 2013-09-13 15:56:30 -04:00
Mark Otto 6b97970d31 Merge pull request #10623 from jdorfman/jdorfman-maxcdn-link
getting-started - Replace NetDNA.com with MaxCDN.com
2013-09-13 11:49:11 -07:00
Justin Dorfman 6397ba1125 getting-started - Replace NetDNA.com with MaxCDN.com 2013-09-13 11:45:15 -07:00
Chris Rebert b896ce0270 Merge pull request #10619 from mathiasose/master
Further clarification about this step
2013-09-13 09:45:16 -07:00
Mathias Ose 03b1aed37b As a node.js noob, even with the previous clarification this was a bit unclear. This change should (hopefully) make it obvious. 2013-09-13 17:54:48 +02:00
Mark Otto 33a1852336 Merge pull request #10598 from ZDroid/patch-1
Linux users also love Chrome
2013-09-12 19:40:42 -07:00
Chris Rebert 4f20a29c32 rm irrelevant entries from .gitignore; fixes #10609 2013-09-12 11:29:26 -07:00
Zlatan Vasović 9a21fdaf6d Better? /cc @mdo 2013-09-12 18:35:33 +02:00
Mark Otto 370130669c Merge pull request #10602 from mikefrancis/patch-2
Added in list elements for dividers
2013-09-12 09:04:52 -07:00
Mike Francis 3c6229c435 Added in list elements for dividers 2013-09-12 12:46:03 +01:00
Zlatan Vasović 869238c071 We also use Chrome :P 2013-09-12 10:15:38 +02:00
Chris Rebert 129b85b70d Merge pull request #10597 from ZDroid/patch-1
@grid-float-breakpoint need to be @screen-sm-min
2013-09-12 00:57:27 -07:00
Zlatan Vasović 5caf780081 @grid-float-breakpoint need to be @screen-sm-min
😄
2013-09-12 09:52:33 +02:00
Mark Otto 88ae76536d Merge pull request #10573 from gribelu/tooltip-fix
Hardcoded Tooltip arrow positioning
2013-09-11 23:19:56 -07:00
Mark Otto dbcb05880f Merge branch 'master' of github.com:twbs/bootstrap 2013-09-11 23:13:28 -07:00
Mark Otto 28e5572bf4 Fixes #10492: Account for responsive tables in panels 2013-09-11 23:11:18 -07:00
Mark Otto 9c0d04d3e4 Merge pull request #10569 from ZDroid/patch-2
Change @screen-* to @screen-*-min
2013-09-11 23:07:47 -07:00
Mark Otto fc92931107 Merge pull request #10594 from twbs/navbar-form-labels-warning
add same accessibility warning from .form-inline to .navbar-form docs
2013-09-11 23:02:11 -07:00
Chris Rebert 851acf3f33 add same accessibility warning from .form-inline to .navbar-form docs 2013-09-11 22:58:07 -07:00
Mark Otto 682ee3ab1e Merge branch 'master' of github.com:twbs/bootstrap 2013-09-11 21:14:25 -07:00
Mark Otto 291a23aa4f Massive customizer audit and overhaul
I probably missed a few things and screwed up a few others, but this
takes the place of much of #9910. I haven't added many variables—that
should be reserved for v3.1—but I have rejiggered the layout, added
missing ones, corrected wrong values, etc.

/cc @cvrebert @juthilo @saas786
2013-09-11 21:14:10 -07:00
Mark Otto ba818bc4e3 Remove unneeded comment in layouts 2013-09-11 21:12:58 -07:00
Mark Otto ecc6978241 Merge pull request #10590 from twbs/doc-jquery-version
document jQuery version requirement; fixes #10355
2013-09-11 20:22:33 -07:00
Chris Rebert 0e54a49b9d Merge pull request #10591 from twbs/modal-remote-migration-doc
add modal 'remote' option semantics change to migration docs
2013-09-11 20:17:18 -07:00
Chris Rebert 306d850d3a add modal 'remote' option semantics change to migration docs; fixes #10585 2013-09-11 20:08:59 -07:00
Chris Rebert a1b0311597 document jQuery version requirement; fixes #10355 2013-09-11 19:53:32 -07:00
Mark Otto a1cdbbe55e scope customizer h4 change 2013-09-11 16:59:51 -07:00
Mark Otto d88e743b41 Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	dist/css/bootstrap.min.css
2013-09-11 16:35:27 -07:00
Mark Otto fddcadbc21 run grunt 2013-09-11 16:35:00 -07:00
Chris Rebert 725e2b9ccf re-fix typo in comment 2013-09-11 16:24:03 -07:00
Mark Otto cd7cf40aff Merge pull request #10584 from twbs/ie_viewports
Fixes #10497: Fix Windows 8 and Windows Phone 8 behavior and apply to docs
2013-09-11 16:19:12 -07:00
Mark Otto b0ea3a08cd Merge branch 'ie_viewports' of github.com:twbs/bootstrap into ie_viewports
Conflicts:
	getting-started.html
	less/responsive-utilities.less
2013-09-11 16:15:12 -07:00
Mark Otto 6519303549 fixes #10497: Fix Windows 8 and Windows Phone 8 behavior and apply it to the docs 2013-09-11 16:06:43 -07:00
Mark Otto 6e064894db remove unnecessary right and left properties on .modal-dialog 2013-09-11 14:56:02 -07:00
Mark Otto 2dc7ab4bbb fixes #10497: Fix Windows 8 and Windows Phone 8 behavior and apply it to the docs 2013-09-11 14:46:31 -07:00
Mark Otto 6ea2893af1 Merge pull request #10338 from twbs/readd-optin-notes
Fix #10324: Add opt-in note to tooltip docs
2013-09-11 12:49:24 -07:00
Mark Otto 37933a9e08 Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	dist/css/bootstrap.min.css
2013-09-11 12:31:21 -07:00
Mark Otto c69092a176 move to separate about page 2013-09-11 12:30:46 -07:00
Mark Otto 5d1707a25c Remove old and unused .prettyprint styles in code.less (per #10566) 2013-09-11 11:09:50 -07:00
Chris Rebert c62426daeb Merge pull request #10579 from roryokane/patch-1
Fix capitalization of “list groups” in middle of sentence
2013-09-11 10:29:19 -07:00
Rory O’Kane eebbee7c81 Fix capitalization of “list groups” in middle of sentence
When “list groups” is used in the middle of a sentence in http://getbootstrap.com/components/#list-group-basic, it is not capitalized.
2013-09-11 12:18:32 -04:00
gribelu d8202dd626 Fixed hardcoded tooltip arrow positioning
Tooltip Arrow positioning was hardcoded to 5px instead of using @tooltip-arrow-width.
2013-09-11 16:47:13 +03:00
Zlatan Vasović 50fcaba24f The last 2013-09-11 10:38:42 +02:00
Zlatan Vasović d9613268b0 Again? 2013-09-11 10:35:12 +02:00
Zlatan Vasović a0653ef018 Rumbo Jumbo 2013-09-11 10:33:30 +02:00
Zlatan Vasović e2e1c80d1a Another fixup 2013-09-11 10:32:08 +02:00
Zlatan Vasović b8a33eb1e0 Eagle eye 2013-09-11 10:29:15 +02:00
Chris Rebert 1497c21fe3 Merge pull request #10567 from ZDroid/patch-2
Use @screen-sm-min in forms
2013-09-11 01:14:36 -07:00
Zlatan Vasović c10238c95f Use @screen-sm-min in forms 2013-09-11 09:54:38 +02:00
Mark Otto 022e40404c Remove multiple touch icons and roll with a single one 2013-09-10 21:46:12 -07:00
Mark Otto b7e1103c32 Merge pull request #9989 from eins78/more-monospace-elements
code.less: also set default monospace font for `<kbd>` and `<samp>`
2013-09-10 21:38:24 -07:00
Mark Otto e645d51b62 Merge pull request #10565 from twbs/gruntfile-css-banner
generate CSS banners via Gruntfile; fixes #10101
2013-09-10 21:27:07 -07:00
Mark Otto 84567af1a8 Merge pull request #10560 from ZDroid/patch-1
Remove display: block from address
2013-09-10 21:25:31 -07:00
Chris Rebert 2b5d7d23d0 generate CSS banners via Gruntfile; fixes #10101 2013-09-10 19:22:20 -07:00
Chris Rebert 1f3a87a8a0 fix punctuation in author field of package.json 2013-09-10 19:12:47 -07:00
Chris Rebert 76d8757b0a rm period from licensing header so it's not mistaken as part of the URL 2013-09-10 19:01:40 -07:00
Chris Rebert a9335e94e1 run grunt dist 2013-09-10 18:59:09 -07:00
Chris Rebert cf09ec3c77 Merge pull request #10563 from lipis/patch-1
Updated the old btn-large in carousel example
2013-09-10 16:52:37 -07:00
Lipis a2a5be11a3 Updated the old btn-large in carousel example 2013-09-11 01:34:56 +02:00
Chris Rebert 52516eceba add missing comma in carousel.less; fixes #10562 2013-09-10 16:20:36 -07:00
Julian Thilo 1ebd282693 Rephrase text 2013-09-10 23:31:57 +02:00
Zlatan Vasović 886e7037f6 Remove display: block from address
<address> is already displayed as block in all browsers (UAs).
2013-09-10 23:27:04 +02:00
Julian Thilo 10a9601560 Fix #10556
Make media queries example in docs clearer
2013-09-10 18:00:58 +02:00
Mark Otto c8c3bf00b6 fixes #9985: update grid classes in grid example 2013-09-09 13:56:10 -07:00
Mark Otto cd98b10ea5 Merge pull request #10542 from twbs/controls-migration-docs
add .control* to migration docs; fixes #10532
2013-09-09 13:22:34 -07:00
Chris Rebert 6bc1a5cf6e add .control* to migration docs; fixes #10532 2013-09-09 12:34:53 -07:00
Mark Otto fb9c81f894 dat hash 2013-09-09 10:19:53 -07:00
Mark Otto ea99a0a6f1 dat @juthilo edit 2013-09-09 09:51:38 -07:00
Mark Otto 674e83aa01 Copy edits from @cvrebert and @juthilo 2013-09-09 08:34:21 -07:00
Topsitemakers 3d97454c09 adding required attribute for example signin form 2013-09-09 12:36:56 +02:00
Mark Otto 632e3c42d5 Merge branch 'master' into docs_welcome 2013-09-08 20:39:07 -07:00
Mark Otto fff5e540f5 fixes #10526: Remove custom background on responsive tables and set it in the docs where it should've been originally 2013-09-08 20:03:52 -07:00
Mark Otto d42591e6e5 use irc link 2013-09-08 19:56:11 -07:00
Mark Otto f00e6deb92 shorter avatar urls 2013-09-08 19:49:40 -07:00
Mark Otto 77549410d5 Add Welcome section to docs
* Fixes unrelated typo in readme
* Add new Welcome section with history, team, callouts, and community
subsections
* Redesigns callouts to be a bit lighterweight with colored headings
2013-09-08 18:37:39 -07:00
Mark Otto afb6cf1d01 Match order of vars to order of components; darken some alert borders 2013-09-08 16:58:56 -07:00
Mark Otto 16279056ae Merge branch 'master' of github.com:twbs/bootstrap 2013-09-08 08:04:19 -07:00
Mark Otto 3f158175ce fixes #10521: Only remove bottom-border from last row of cells in tbody and tfoot within responsive tables 2013-09-08 08:04:11 -07:00
Julian Thilo 601364418f Merge pull request #10523 from ZDroid/patch-1
Added missing semicolon
2013-09-08 06:47:14 -07:00
Zlatan Vasović f9fe6cd05f Added missing semicolon 2013-09-08 15:37:02 +02:00
Alexey 7ee2b6a976 changed attr('data-target') to data('target');
this will extend js interface, to be possible to setup targets for tabs as 
    var content=$('<div class="tab-pane">',{text: 'content'});
    var tab=('<li>',{html: $('<a>',{text: 'Main options'})}).addClass('active').data({target: $main,toggle: 'tab'}).appendTo(tabs);
2013-09-08 04:49:27 +03:00
Mark Otto d126d8c6f3 Run grunt to gen raw files 2013-09-06 09:57:25 -07:00
Mark Otto f80fd03542 Remove nav from jumbotron example (temp fix for #10228) 2013-09-06 09:57:19 -07:00
Mark Otto 8bea86e2ef fixes #10024: Use negative margin to fix the border between button and input in input groups 2013-09-06 09:50:38 -07:00
Mark Otto e5038a339c Merge pull request #9968 from thelukemcdonald/master
Apply gradient stripe @color parameter
2013-09-06 09:31:36 -07:00
Mark Otto 5c4c7eba54 Merge branch 'master' of https://github.com/nuttertag/bootstrap into nuttertag-master
Conflicts:
	dist/css/bootstrap.min.css
2013-09-06 09:23:49 -07:00
Mark Otto 532e4bab58 Merge branch 'master' of github.com:twbs/bootstrap 2013-09-06 09:22:34 -07:00
Mark Otto b24adeb82f fix broke width of containers in docs given change to use width over max-width 2013-09-06 09:22:19 -07:00
Mark Otto 72a39eb747 Merge pull request #10025 from barryvdh/patch-2
Add missing methods (rotateX/Y, perspective(-origin) and transform-origin)
2013-09-06 09:18:00 -07:00
Mark Otto 394161f281 Merge branch 'GSEdits7' of https://github.com/StevenBlack/bootstrap into StevenBlack-GSEdits7
Conflicts:
	getting-started.html
2013-09-06 09:11:26 -07:00
Mark Otto cec89e20a9 fixes #10491: new docs background base64 image 2013-09-06 09:03:50 -07:00
Mark Otto b51579241f account for last child bottom border; use 0 instead of none 2013-09-05 15:10:56 -07:00
Kevin O'Connor ac244040d1 Don't double border a bordered table within a panel 2013-09-05 15:54:18 -04:00
Steven Black 00673991af Fixed two more instances of [.]LESS in the text 2013-09-05 14:03:43 -04:00
Steven Black bdb9fd9a7c Removed the '.' from '.LESS' in two instances. 2013-09-05 13:43:04 -04:00
Chris Rebert 8651180ca7 Merge pull request #10471 from javiereguiluz/patch-4
[doc] fixed the horizontal form example
2013-09-05 10:25:06 -07:00
Steven Black e94b790e64 Standardizing on LESS (uppercase) and avoiding the word 'less' where that's easy and sensible. 2013-09-05 09:09:20 -04:00
Steven Black f1fba93c1e Better wording, avoiding 'invoke', and misc edits 2013-09-05 08:53:50 -04:00
Javier Eguiluz 6c0f20c446 [doc] fixed the horizontal form example 2013-09-05 11:57:23 +02:00
Mark Otto 31dfc3218e Merge pull request #10453 from ckundo/add-dropdown-button-text
Add visibly hidden button text for screen reader users.
2013-09-05 00:11:04 -07:00
Chris Rebert 121790c106 add <code> around ".less" in Getting Started docs 2013-09-04 21:28:04 -07:00
Steven Black 63b61eea7f Docs - Getting started: refactor 'Customizing Bootstrap' 2013-09-04 23:39:57 -04:00
Chris Rebert 0b0087f3a7 fix swapped angle brackets in docs; fixes part of #10456 2013-09-04 20:33:18 -07:00
Mark Otto 56c8826c77 Fixes #10452: Add note about deprecation of .nav-divider
Should have been dropped in v3, but ah well, we missed it. So, it gets
the deprecation.
2013-09-04 18:52:45 -07:00
Mark Otto 124c80b30a add docs callout to mention #9947 2013-09-04 17:58:01 -07:00
Mark Otto fc8e66d2cb Merge branch 'master' of github.com:twbs/bootstrap 2013-09-04 17:46:39 -07:00
Mark Otto 44fddf1c3e fixes #10449: use th with scope in table; add scope to th in thead 2013-09-04 17:46:25 -07:00
Cameron Cundiff fbd7f2e052 Add visibly hidden button text for screen reader users.
[Finishes #10448]
2013-09-04 16:53:37 -06:00
Chris Rebert a9b58181c6 clarify working directory requirement of npm install 2013-09-04 15:25:07 -07:00
Chris Rebert d10ed7ef5e bump minor/patch versions of other dependencies 2013-09-04 14:15:51 -07:00
Chris Rebert 07075456b7 bump grunt-recess to 0.4.0 2013-09-04 14:09:22 -07:00
Mark Otto 1c4bdb053b Fixes #10399: Add hover styles to text emphasis classes 2013-09-04 13:56:32 -07:00
Mark Otto c0f6d722b0 polish off #10227 with an inline comment 2013-09-04 12:16:46 -07:00
Mark Otto 4498e8f57b Merge branch 'master' of github.com:twbs/bootstrap 2013-09-04 12:16:14 -07:00
Mark Otto 88e1e20b95 Merge pull request #10227 from UTCWebDev/master
Fixes 10212 - Make custom max-width on row conform to Bootstrap convention
2013-09-04 12:15:45 -07:00
Mark Otto 6ce9b4d041 Fixes #10417: Document .hidden in the Helper classes *Screen reader content* section 2013-09-04 12:08:07 -07:00
Mark Otto 0d80320fa2 Merge pull request #10421 from StevenBlack/GSEdits6
Getting started docs - Migrating section: refactor the text for ...
2013-09-04 11:41:20 -07:00
Steven Black e3647c1320 fixed a </p> tag that was on its own line. 2013-09-04 14:40:32 -04:00
Steven Black 11c3ffe4fc Yet another manually wrapped text line consolidated 2013-09-04 12:22:51 -04:00
Steven Black a37b37169f Removed a trailing space at end of line. 2013-09-04 12:18:58 -04:00
Steven Black 43efd43717 Fixed to lowercase 'v' in 'v3.0' 2013-09-04 12:17:39 -04:00
Mark Otto d8dc805f9b Merge branch 'master' of github.com:twbs/bootstrap 2013-09-04 09:09:22 -07:00
Mark Otto 34f1487146 Fixes #10436: use screen-sm var instead of hardcoded pixel value 2013-09-04 09:08:52 -07:00
Steven Black ea734863c3 No manual line breaks in HTML text as per custom. 2013-09-04 11:29:51 -04:00
Steven Black a82d038f52 For consistency with the rest of the docs, removed manually line-wrapped HTML text. 2013-09-04 09:03:03 -04:00
Chris Rebert 5a6fac2d84 Merge pull request #10427 from liamzebedee/patch-1
Fixed error in documentation in mixins.less
2013-09-04 02:02:26 -07:00
Liam 12558bb504 Fixed error in documentation in mixins.less 2013-09-04 18:59:44 +10:00
Chris Rebert 4f7f1f6c6e Merge pull request #10423 from hustlzp/master
CSS docs - Grid section: two dots are missing before 'col-md-8'
2013-09-04 00:54:03 -07:00
Zhipeng Liu 7c7c0e6139 CSS docs - Grid section: two dots are missing before 'col-md-8'
Add the two missing docs
2013-09-04 15:45:10 +08:00
Steven Black 6ed44eded5 Getting started docs - Migrating section: refactor some of the text for clarity and easy reading.Also removed some rogue tab characters in the source that I introduced in prior commits. 2013-09-04 00:20:28 -04:00
Mark Otto 5773638329 Merge branch 'master' of github.com:twbs/bootstrap 2013-09-03 20:17:45 -07:00
Mark Otto 143403f3fd Fixes #10407: Add line-height to progress bar for proper text alignment within 2013-09-03 20:11:27 -07:00
Chris Rebert 95df76fc54 Merge pull request #10419 from twbs/doc-that-nav-lists-are-gone
add .nav-list & .nav-header to removals section of migration guide
2013-09-03 19:54:34 -07:00
Chris Rebert 6ac5a1e2dc add .nav-list & .nav-header to removals section of migration guide; fixes #9139 2013-09-03 19:52:25 -07:00
Mark Otto dcdafa4220 Merge branch 'master' into carousel-glyphicons-mainstream
Conflicts:
	javascript.html
2013-09-03 18:43:42 -07:00
Mark Otto 72b1f69bfc dat grunt 2013-09-03 18:31:02 -07:00
Mark Otto 894aa93a9f Merge branch 'master' of github.com:twbs/bootstrap 2013-09-03 18:21:28 -07:00
Mark Otto 2804d37429 Merge branch 'color-code-IE89-table' 2013-09-03 18:20:43 -07:00
Mark Otto e62a04a19b Color code IE8-9 table with text classes and Glyhpicons instead of table classes 2013-09-03 18:20:21 -07:00
Mark Otto e4514b4596 Merge pull request #10413 from twbs/carousel-transitions-no-fallback-note
address #10343 more directly: add note on carousel transitions in IE8+9
2013-09-03 18:09:49 -07:00
Chris Rebert 73e4b81790 make Glyphicons mainstream in Carousel examples 2013-09-03 17:46:35 -07:00
Chris Rebert 01361951e6 address #10343 more directly: add note on carousel transitions in IE8+9 2013-09-03 17:34:21 -07:00
Chris Rebert 19db69c902 we've got your back (sorta), Linux Firefox users 2013-09-03 17:01:21 -07:00
Chris Rebert 5dc65894c0 Color-code the "Internet Explorer 8 and 9" features table 2013-09-03 16:51:17 -07:00
Chris Rebert 3bb3680aac docs: fix typo in "Internet Explorer 8 and 9" features table
"placehoder" (sic)
2013-09-03 16:46:02 -07:00
Chris Rebert f3c644cb1b copyedit "Internet Explorer 8 and box-sizing" section 2013-09-03 16:36:13 -07:00
Mark Otto b150422335 Merge pull request #10408 from twbs/getting-started-minor-edits
CSS vs. LESS vs. styles terminology; "precompiled" terminology
2013-09-03 15:52:28 -07:00
Mark Otto 171fc396ac Merge branch 'master' of github.com:twbs/bootstrap 2013-09-03 15:50:44 -07:00
Mark Otto 0a78e7907d fixes #10406: Update grid to use width on .container instead of max-width as IE8 improperly computes width 2013-09-03 15:49:03 -07:00
Mark Otto 5eead87ed7 remove min-height from ads because ie8 2013-09-03 15:35:48 -07:00
Mark Otto 6fb81f155b more space below links on homepage 2013-09-03 15:33:36 -07:00
Chris Rebert 1113224e97 minor copyedit 2013-09-03 12:53:52 -07:00
Chris Rebert 7fbd8affe4 CSS vs. LESS vs. styles terminology; "precompiled" terminology 2013-09-03 12:32:24 -07:00
Chris Rebert 488b8dad2b slightly clarify button.active use in docs 2013-09-03 12:21:19 -07:00
Chris Rebert 82d19a41ba bump grunt-contrib-connect to 0.4.0
Thanks David.
2013-09-03 12:17:30 -07:00
Chris Rebert a1b3fb339e minor copyedit 2013-09-03 12:15:33 -07:00
Mark Otto 87df4784c1 Merge branch 'master' of github.com:twbs/bootstrap 2013-09-03 07:31:00 -07:00
Mark Otto c2a5334dee fixes #10396: mention table class change in migration docs 2013-09-03 07:30:46 -07:00
Mark Otto b080347106 Merge pull request #10375 from StevenBlack/GSEdits4
Refactoring the paragraph describing the 'Examples' section.
2013-09-03 02:28:01 -07:00
Mark Otto dd44123881 remove unused .panel-collapse ruleset 2013-09-03 01:04:17 -07:00
Mark Otto 352f5923d7 Merge branch 'master' of github.com:twbs/bootstrap 2013-09-03 00:55:29 -07:00
Mark Otto 36afdbcaac mo betta docs on box-sizing to build on e521ee8309 2013-09-03 00:49:59 -07:00
Mark Otto 49373b9b45 fixes #10372: two download buttons on homepage; also fixes broke button styles 2013-09-02 20:20:47 -07:00
Mark Otto a4897aed88 Merge pull request #10382 from StevenBlack/GSEdits5
'Disabling responsiveness' section of docs: simplification and focus
2013-09-02 20:13:57 -07:00
Mark Otto 54b75ffae3 Merge branch 'master' of github.com:twbs/bootstrap 2013-09-02 19:53:20 -07:00
Mark Otto e521ee8309 update box-sizing third party support section to include mention of google CSE and expand to include CSS and Less options 2013-09-02 19:52:59 -07:00
Steven Black 9361ebe4fd Getting Started page: Simplified and focused the text of the 'Disabling responsiveness' section. 2013-09-02 20:01:36 -04:00
Steven Black 259be69e25 Refactoring the paragraph describing the 'Examples' section. 2013-09-02 15:24:55 -04:00
Julian Thilo c6d51be2d8 Merge pull request #10374 from tagliala/patch-2
Fixed glyphicons count
2013-09-02 10:32:45 -07:00
Chris Rebert e7f8d0c957 Merge pull request #10366 from coliff/patch-2
Update index.html (change from 'hero unit' to 'jumbotron')
2013-09-02 10:31:55 -07:00
Christian 5d88943a52 Update index.html
Updated text in the jumbotron container to reflect the Bootstrap 3 change from 'hero unit' to 'jumbotron'.
2013-09-02 21:36:54 +09:00
Chris Rebert 93dc003a83 Merge pull request #10364 from wangsai/patch-1
Completion of parentheses
2013-09-02 02:50:45 -07:00
wangsai d132c48ec9 Completion of parentheses 2013-09-02 17:47:04 +08:00
Mark Otto a245c0d1cd derp, add on to #10153 with proper variable /cc @ggam 2013-09-01 20:52:23 -07:00
Aleksey V. Zapparov 626cef9fa4 Pass $element to offset top/bottom calc funcs
At the moment to make dynamic top offset calculator on multiple elements, one would write:

``` javascript
$('.my-affix').each(function () {
  var $el = $(this);
  $el.affix({
    offset: {
      top: function () { return $el.offset().top; }
    }
  });
})
```

This patch will allow to:

``` javascript
$('.my-affix').affix({
  offset: {
    top: function ($el) { return $el.offset().top; }
  }
});
```
2013-09-02 03:24:27 +02:00
Mark Otto 079fa16b9f Merge branch 'master' of github.com:twbs/bootstrap 2013-09-02 00:10:35 +02:00
Mark Otto 14b3a3542f fixes #10316: Document .active and :active for buttons 2013-09-02 00:09:49 +02:00
Mark Otto f69da1c2ef Merge pull request #10342 from twbs/affix-docs
minor improvements to affix docs
2013-09-01 14:59:34 -07:00
Mark Otto 741e0fc52c fixes #10344: Update IE8-9 support section with table of specific CSS3 and HTML5 features and their support in Bootstrap 2013-09-01 23:58:22 +02:00
Mark Otto 8df05b95df Remove links to navbar examples from example navbars in Theme example--nullifies #9894 2013-09-01 23:46:23 +02:00
Mark Otto de82c80784 update vars to use new component-active-color 2013-09-01 23:40:04 +02:00
Mark Otto 1fd9237840 fixes #9909: Add component active color variable to complement component active bg variable 2013-09-01 23:38:11 +02:00
Mark Otto bfda156bb9 alt fix to #10278: Change Google Maps compatibility warning to a general box-sizing warning 2013-09-01 23:32:35 +02:00
Mark Otto 26727bfefd Merge branch 'master' of github.com:twbs/bootstrap 2013-09-01 21:55:59 +02:00
Rodrigo Willrich 9d2491a808 Bower: Ignore development and documentation files on bower.json. Fix #10313.
I've kept only the files I consider relevant to bower installation:

- Files in dist directory;
- Files in js directory;
- Files in less directory;
- bower.json file;
- README.md file;
- LICENSE file.
2013-09-01 16:50:24 -03:00
Geremia Taglialatela f4fde25535 Fixed glyphicons count
Glyphicons are 200

refers to #9794
2013-09-01 14:36:32 +02:00
Chris Rebert 9369489883 fix straggler instance of "Tiny grid" terminology 2013-09-01 04:14:55 -07:00
Mark Otto b45c3ea647 fixes #10164: Document .center-block mixin and update CSS to include it as a class as well 2013-09-01 11:21:14 +02:00
Chris Rebert d2e1fef34a minor improvements to affix docs 2013-09-01 02:09:12 -07:00
Mark Otto 50bf4d47b1 reverse vars for backwards compatibility /cc @cvrebert 2013-09-01 11:06:33 +02:00
Mark Otto 25cc04c5ab Merge branch 'deprecate_screen_containers' 2013-09-01 11:05:14 +02:00
Mark Otto d28abc4bf1 fixes #10115: Default carousel controls and Glyphicon controls should behave the same on small devices and up 2013-09-01 11:03:19 +02:00
Mark Otto 62477653e7 fixes #10111: different colors for dropdown link hover and active states 2013-09-01 11:00:40 +02:00
Chris Rebert 604c3b2efc tweak #10336 to double up on the hyphen-minuses to better approximate a long dash 2013-09-01 01:46:18 -07:00
Chris Rebert 24d45f26eb Merge pull request #10336 from Shipow/master
Replace invalid US-ASCII character "\xE2")
2013-09-01 01:43:48 -07:00
Chris Rebert 5418a72243 tweak #10298 2013-09-01 01:35:56 -07:00
Mark Otto e8f7d4fcef fixes alignment and nav list in offcanvas example 2013-09-01 10:34:21 +02:00
Chris Rebert 2066ea50a2 Merge pull request #10298 from jhr007/patch-1
Note the change to the progress bar.
2013-09-01 01:34:15 -07:00
Mark Otto 129d8fcebc fixes #10282: Cross reference tabs and tabs plugin 2013-09-01 10:27:20 +02:00
Mark Otto e2c6d32997 fixes #10277: Mention removal of navbar vertical dividers in migration docs 2013-09-01 10:21:27 +02:00
Mark Otto 9616768659 remove unused link from navs section 2013-09-01 10:19:55 +02:00
Mark Otto 772e6e359e Merge branch 'master' of github.com:twbs/bootstrap 2013-09-01 10:18:54 +02:00
Mark Otto 58401daf1c finishes #10256 to add updated var to customizer; also fixes another old var 2013-09-01 10:15:39 +02:00
Mark Otto 9a32b21dc7 Merge branch 'master' into tagliala-patch-1 2013-09-01 10:13:47 +02:00
Mark Otto c9303c17ab Merge pull request #10249 from coliff/patch-1
Update index.html (update text from hero unit to jumbotron)
2013-09-01 01:09:55 -07:00
Chris Rebert a7863c112d restore "only" wording in docs regarding Recess/less.js
It was there for good reason.
We're not gonna deal with lessphp or dotless bugs.
2013-09-01 01:09:28 -07:00
Mark Otto dfda3dfe37 fixes #10246: Use correct variable for link hover color in Customizer 2013-09-01 10:07:15 +02:00
Mark Otto 7f6210cea4 Merge branch 'master' of github.com:twbs/bootstrap 2013-09-01 10:04:54 +02:00
Mark Otto 3a4ea1a7be better layout 2013-09-01 10:04:44 +02:00
Mark Otto e10bf3aa7f finishes #10245 by adding it the new var to the customizer 2013-09-01 10:04:03 +02:00
Mark Otto daa8330b41 Merge branch 'master' into dancek-breadcrumb-separator 2013-09-01 10:01:57 +02:00
Mark Otto 1e68143b39 Merge pull request #10232 from twbs/table-nesting
use direct-child selector more in table styles to better support nested tables
2013-09-01 00:59:55 -07:00
Mark Otto 560753da96 Merge branch 'master' into table-nesting
Conflicts:
	dist/css/bootstrap.min.css
2013-09-01 09:59:27 +02:00
Mark Otto 4b53ea52e9 fixes #10223: adds color to input addon 2013-09-01 09:53:41 +02:00
Mark Otto 794d784519 fixes #10153: restore headings-color variable 2013-09-01 09:49:28 +02:00
Mark Otto 9e541fc717 fixes #10136 2013-09-01 09:46:33 +02:00
Mark Otto f29ec45715 Merge branch 'master' into deprecate_screen_containers 2013-09-01 09:33:11 +02:00
Mark Otto e47ebf3686 Merge branch 'master' of github.com:twbs/bootstrap 2013-09-01 08:18:46 +02:00
Mark Otto 8f80a76bf3 Merge pull request #10299 from StevenBlack/GettingStartedEdits1
'Getting started' section: refactoring for succinctness, active voice, and consistency with button and link captions.
2013-08-31 23:17:54 -07:00
Mark Otto 5c3614d97c Merge pull request #10323 from StevenBlack/GSEdits3
Getting started docs: tweaks to the _Basic template_ section
2013-08-31 23:15:47 -07:00
Mark Otto 9ba64cc1a9 Merge branch 'patch-1' of https://github.com/tagliala/bootstrap into tagliala-patch-1 2013-09-01 08:13:51 +02:00
Mark Otto eb95574d80 Merge branch 'breadcrumb-separator' of https://github.com/dancek/bootstrap into dancek-breadcrumb-separator 2013-09-01 08:12:56 +02:00
Julian Thilo 95c796d61e Fix #10324: Add opt-in note to tooltip docs
* Re-added a note (now callout) about need to opt in to tooltip docs
* Converted same note in popover section to callout
2013-08-31 20:43:57 +02:00
Kevin Granger f849e65d56 Replace invalid US-ASCII character "\xE2")
Replace invalid US-ASCII character "\xE2") '—' => '-'
2013-08-31 17:50:14 +02:00
Mark Otto 3e62905f9d Merge branch 'master' of github.com:twbs/bootstrap 2013-08-31 09:04:17 +02:00
Mark Otto 644c227ae1 Merge pull request #10265 from twbs/fix-10252
fix #10252 by restricting Android Firefox reset to only .form-control & .btn
2013-08-30 23:31:30 -07:00
Roland Warmerdam ed1bd2b150 carousel: correctly reset when the slide event is prevented 2013-08-31 18:03:09 +12:00
Steven Black a18fefe9bc Getting started docs: tweaks to the _Basic template_ section 2013-08-31 00:03:14 -04:00
Chris Rebert 216df5bb46 Merge pull request #10315 from mokkabonna/phantom-cleanup
deleted files not used anymore after transition to grunt-contrib-qunit
2013-08-30 12:58:24 -07:00
Martin Hansen 6d3ad5ed7f deleted files not used anymore after transition to grunt-contrib-qunit 2013-08-30 21:39:48 +02:00
Chris Rebert e08f4ff762 Merge pull request #10312 from jleight/master
Fix broken link to alerts section of JS page.
2013-08-30 12:26:11 -07:00
Jonathon Leight ccb630e60f Fix broken link to alerts section of JS page.
Link was pointing to #js-alerts, but that section of the page does not exist. Changed to #alerts instead.
2013-08-30 15:01:07 -04:00
jhr007 0aa4eecee1 Moved "Major class changes" section; Added progress-bar-* 2013-08-30 00:14:21 -05:00
Steven Black 2e2fffe8f8 more refactoring of the 'Getting started' section towards more succinct and active wording. 2013-08-30 01:07:09 -04:00
Steven Black 36044b3a11 More concise 'fastest way' statement, and consistency with the text of the Download button 2013-08-30 00:38:48 -04:00
jhr007 f567646738 Add a change to the progress bar.
In v3 the inner progress bar should have .progress-bar not .bar
2013-08-29 23:21:07 -05:00
Chris Rebert 5b21768c05 fix #10292 2013-08-29 16:12:39 -07:00
Julian Thilo 0ce3d67f35 Merge pull request #10276 from javiereguiluz/patch-3
Correct comment in grid mixin example
2013-08-29 08:30:17 -07:00
Javier Eguiluz 83354ab156 [doc] minor fix in the LESS mixins example 2013-08-29 11:51:39 +02:00
Chris Rebert 2ef147b16b fix #10252 by restricting Android Firefox reset to only .form-control & .btn 2013-08-28 15:37:34 -07:00
Chris Rebert 5c7d339752 Revert "fix styling of alert-dismissable example"
This reverts commit b3a23fa33a.
2013-08-28 14:57:41 -07:00
UTCWebDev ee2e2ae0ae Prevent X-scroll on small screens
html overflow-x must be hidden to prevent accidental x-scroll on small screens. This is more apparent with touch screens, where the user often gestures diagonally instead of a true vertical gesture.
2013-08-28 15:55:45 -04:00
Geremia Taglialatela 86632a242b Base the navbar default brand hover color on default brand color
IMHO this default is better
2013-08-28 18:18:44 +02:00
Christian 32fbc882b9 Update index.html
Updated text in the jumbotron container to reflect the Bootstrap 3 change from hero unit to jumbotron. (Wasn't sure if it should be 'a Jumbotron' or just 'Jumbotron' though...
2013-08-28 20:09:17 +09:00
Hannu Hartikainen a19ff2f50f Parameterize @breadcrumb-separator 2013-08-28 12:17:46 +03:00
Chris Rebert 901da1b2b4 use direct-child selector more in table styles to better support nested tables; fixes #10231 2013-08-27 17:13:34 -07:00
UTCWebDev 5ce4b8c7ff Make custom max-width on row conform to Boostrap convention
Bootstrap break point for tablet portrait 768 keeps the row intact, so it's not appropriate to have off-canvas elements at that width. Custom off-canvas.css should be breakpoint 767px
2013-08-27 16:34:26 -04:00
Chris Rebert 73f10843a4 components.html: fix grammar 2013-08-27 11:18:10 -07:00
Chris Rebert b3a23fa33a fix styling of alert-dismissable example 2013-08-27 11:15:14 -07:00
Mark Otto 58408b0232 Fixes #10154: add .small 2013-08-27 09:21:09 -07:00
Mark Otto 32c03994ee Merge pull request #10222 from jodytate/upstream
a few wording tweaks
2013-08-27 09:15:30 -07:00
jody tate 1786aed71d a few wording tweaks
- Changed some existential constructions (yes, they're really called
existential http://en.wikipedia.org/wiki/Existential_clause). These
aren't innately evil, but rewordings of existential clauses often sound
more direct.
- Changed a "which" to a "that."
2013-08-27 09:11:33 -07:00
Mark Otto 4f28fdd227 Fixes #9928 and #9932: carousel example in IE10
* Use absolute positioning instead to remove navbar from flow of
document
* No more negative margin fu
* Flip around padding between container and navbar for proper display
in xs and sm viewports
2013-08-27 09:10:06 -07:00
Mark Otto c84374f9de fixes #9901 2013-08-27 08:53:48 -07:00
Mark Otto 2f2ce15e58 Fixes #10082: document .navbar-form
* Adds new section to navbar docs with example
* Updates example classes for all collapsing navbars so their numbers
increment as you scroll
2013-08-27 08:34:17 -07:00
Mark Otto 19c0d2ad94 Merge pull request #10131 from andyen/master
correct enable selector for button usage in docs
2013-08-27 08:23:40 -07:00
Mark Otto e4a2c35b84 Fixes #10088: Simpler nested headings section in accessibility docs
* Headings, not headers
* Simplifies content compared to #10088 which adds quite a lot
* Uses proper heading elements (`h1` - `h6`) and not `header`
* Collects links at bottom instead of mid-paragraph
2013-08-27 08:19:51 -07:00
Mark Otto 4b68858f90 Merge branch 'master' of github.com:twbs/bootstrap 2013-08-27 08:05:54 -07:00
Mark Otto 1445e09b5f Fixes #9991: Better docs for tabbable tabs and fade classes
* Adds full code snippets
* Adds snippet for `.fade`
* Adds callout for `.in` requirement on first fade-able tab
2013-08-27 08:05:26 -07:00
Mark Otto b2b91a0a34 Merge pull request #10215 from XhmikosR/master
Various
2013-08-27 07:58:49 -07:00
Mark Otto e97b8be2c4 Merge pull request #10208 from javiereguiluz/patch-2
[doc] tweaked the appearance of the last item of the file listings
2013-08-27 07:50:23 -07:00
Mark Otto 1f16e21e75 Merge pull request #10209 from clbn/master
Fixes #10207: alert-dismissable example requires contextual class
2013-08-27 07:43:17 -07:00
Julian Thilo 4d0b895db7 Merge pull request #10210 from acmetech/master
Update the example for components/#btn-groups-justified to match the "Element-specific usage" callout
2013-08-27 07:40:45 -07:00
XhmikosR 26728576f3 Add bugs property to package.json. 2013-08-27 17:21:15 +03:00
XhmikosR a586844c90 Update html5shiv.js to v3.6.2. 2013-08-27 17:05:41 +03:00
XhmikosR d98206bc06 Update Respond.js to v1.3.0. 2013-08-27 16:56:03 +03:00
XhmikosR 263d775777 Compress PNG files losslessly.
Use zopfli with 1000 iterations, pngout /r with various blocksizes and deflopt.

assets/ico/apple-touch-icon-114-precomposed.png | Bin 2939 -> 2931 bytes
assets/ico/apple-touch-icon-144-precomposed.png | Bin 3614 -> 3549 bytes
assets/ico/apple-touch-icon-57-precomposed.png  | Bin 1577 -> 1573 bytes
assets/ico/favicon.png                          | Bin 889 -> 887 bytes

Total difference: -79 bytes.
2013-08-27 16:56:03 +03:00
Tom Pietschker 77bee02c85 add role="button" 2013-08-27 09:46:10 -04:00
Tom Pietschker d1f60671c7 per the docs - use <a> instead of <button> 2013-08-27 09:45:38 -04:00
Alex Olshansky f8dc1858b0 Fixes #10207: alert-dismissable example requires contextual class 2013-08-27 05:20:14 -07:00
Javier Eguiluz 52c7bacd44 [doc] tweaked the appearance of the last item of the file listings 2013-08-27 13:24:46 +02:00
Chris Rebert f811c1b56c Merge pull request #10204 from premist/master
Add missing period on customize page.
2013-08-27 00:17:40 -07:00
Minku Lee c02f98a7bf Add missing period on customize page. 2013-08-27 15:41:50 +09:00
Mark Otto 2970653bdc Fixes #10016 and updates that rather badly formatted callout 2013-08-26 18:19:31 -07:00
Mark Otto 4ad2ecf975 Improve upon #9937: Link and put reset column stuff to action in the grid example 2013-08-26 17:58:15 -07:00
Mark Otto 7796e645c9 Add margin to thumbnails for proper spacing
Hadn't thought about this until fixes #10137, but it makes sense I
think to have margin on the bottom of thumbnails for spacing when
stacking (or using different grid tiers).
2013-08-26 17:48:32 -07:00
Mark Otto dd9980e8c9 Fixes #10137: correct classes on thumbnails 2013-08-26 17:47:56 -07:00
Mark Otto 4d23aa4ef5 Address #9873 and fix #9774
* Update styling of justified nav links to be more mobile friendly
(with all four rounded corners and some margin between items)
* Add note to docs to callout bogus WebKit rendering on component and
example
2013-08-26 17:37:52 -07:00
Lukasz Fiszer 0adb4e35f0 Fix hidden.bs.tooltip and shown.bs.tooltip events firing too early in tooltip.js
* events fire only after the CSS animation is completed
* this fixes also events in popover.js (as it inherits from tooltip.js)
2013-08-26 20:57:47 +02:00
Julian Thilo 8f83a6010a rm inverted navbar search styles 2013-08-26 18:42:03 +02:00
Chris Rebert d977c9902d Merge pull request #10146 from unwiredben/master
javascript.html: add data-ride note
2013-08-25 21:36:31 -07:00
Ben Combee 92bb465ba3 javascript.html: add data-ride note
carousel docs were missing mention of the data-ride attribute
used to automatically start the carousel at load time
2013-08-25 23:07:43 -05:00
Chris Rebert 90604bbcea Merge pull request #10148 from originell/patch-1
Correct Typo
2013-08-25 15:01:26 -07:00
Luis Nell 8401855f16 Correct Typo 2013-08-25 23:58:01 +02:00
Andreas Jendrzey 79efeec874 correct enable selector for button usage
following the given examples the correct selector to enable the buttons with javascript is ".btn-group".
2013-08-25 10:36:53 +02:00
Mark Otto 4c2b15d6f5 Merge pull request #10129 from pixelchutes/fix-3.0-migration-changes
Corrected 3.0 responsive utility class reference mapping when migrating ...
2013-08-25 00:36:03 -07:00
Mike Reid 62fde12c8a Corrected 3.0 responsive utility class reference mapping when migrating from 2.x (now accounting for new Large device support.) Also synchronized breakpoint values from Grid options > Media queries, for clarity. 2013-08-25 00:05:20 -06:00
Mark Otto bae1726509 Merge pull request #10128 from leoj3n/alert-block-remove
Fixes #9008: remove `alert-block` class from example
2013-08-24 21:23:38 -07:00
Joel Kuzmarski e63b6c0675 Fixes #9008: remove alert-block class from example 2013-08-24 23:01:08 -05:00
Mark Otto 86f28f0380 update raw files (should fix builds) 2013-08-24 14:47:58 -07:00
Mark Otto 00895977ff Merge branch 'master' of github.com:twbs/bootstrap 2013-08-24 14:40:36 -07:00
Mark Otto 7c8d9551cc fixes #9887: documents show and hide classes 2013-08-24 14:40:24 -07:00
Mark Otto 26eb9f3440 Merge pull request #10112 from kevinSuttle/button-roles
Add role="button" to <a> buttons
2013-08-24 14:31:33 -07:00
Mark Otto 5491d53b99 Deprecate container-{device} vars for container-{size} classes; updates customizer and grid to do the same 2013-08-24 14:00:52 -07:00
Mark Otto 4c794aaaef grunt dist on glyphicons width change 2013-08-24 13:59:03 -07:00
Mark Otto d67ce62f5d Merge pull request #9996 from jodytate/master
changed description of default button
2013-08-24 13:41:24 -07:00
Kevin Suttle dd9c15273c Add even more role="button" attributes
Missed the <a class="btw" in my regex search
2013-08-24 16:31:15 -04:00
Kevin Suttle 0add7700ad Add role="button" to <a> buttons
These should really be <button> elements, but until that gets squared away, this will suffice.
2013-08-24 16:29:35 -04:00
Mark Otto c0b00f22fe forgot a pair of buttons 2013-08-24 12:30:46 -07:00
Mark Otto 74a778a7e6 Merge branch 'master' of github.com:twbs/bootstrap 2013-08-24 12:29:45 -07:00
Mark Otto ab3e1762d4 turn some buttons into <button> elements where possible 2013-08-24 11:46:24 -07:00
Mark Otto a167a910d9 Merge pull request #10103 from hero-m/patch-1
Another case for Issue #10099
2013-08-24 01:33:04 -07:00
hero-m 54dcb4b699 Another case for Issue #10099
Another case for Issue #10099
2013-08-24 12:11:12 +04:30
Mark Otto d9e991fefe Merge pull request #10059 from felixhirschfeld/patch-1
Add mixin for transition-property
2013-08-24 00:19:37 -07:00
Mark Otto c7db8eadc2 Merge pull request #10022 from thomaswelton/proposal-glyphicon-block
Proposal - Fixed width for glypicons
2013-08-24 00:15:34 -07:00
Mark Otto 9733a998e2 fixes #9969: add support for output element 2013-08-24 00:14:09 -07:00
Mark Otto 802e5caf51 Merge branch 'master' of github.com:twbs/bootstrap 2013-08-23 23:59:11 -07:00
Mark Otto 700d7e7b2c Remove footnote links and inline them; link to contributing guidelines in readme 2013-08-23 23:58:38 -07:00
Mark Otto a6a97e1b27 Merge pull request #9964 from thomaswelton/patch-1
Bower - Added fonts to "main" files
2013-08-23 23:52:24 -07:00
Mark Otto fc0e7686fb Merge branch 'master' of https://github.com/charnog/bootstrap into charnog-master
Conflicts:
	dist/css/bootstrap.min.css
2013-08-23 23:40:12 -07:00
Mark Otto 705f7ba279 fixes #9876: avoid dropdowns in navbar examples to prevent overlap 2013-08-23 23:39:11 -07:00
Mark Otto ddd594c6e2 follow up to #9963 and #10005: update docs to use .screen-*-min vars, update customizer as well; run grunt to adjust raw files 2013-08-23 23:33:16 -07:00
Mark Otto adac269f95 grunt on previous ms scroll fix 2013-08-23 23:32:16 -07:00
Mark Otto d82030f482 Merge pull request #10057 from sambowler/patch-1
Fix responsive table scrolling on Windows Phone 8.
2013-08-23 23:19:05 -07:00
Mark Otto 0a2ec5545b Merge branch 'master' of https://github.com/apexskier/bootstrap into apexskier-master
Conflicts:
	dist/css/bootstrap.min.css
2013-08-23 23:16:37 -07:00
Mark Otto 99afaba2bf Merge pull request #10005 from twbs/deprecate-screen-device-vars
deprecate @screen-{phone,tablet,desktop} vars
2013-08-23 23:14:13 -07:00
Mark Otto b86cd3bc3d Merge branch 'master' into deprecate-screen-device-vars
Conflicts:
	less/variables.less
2013-08-23 22:56:23 -07:00
Mark Otto d5a2785545 more specific deprecation comment 2013-08-23 22:51:39 -07:00
Mark Otto 8a96616726 Merge pull request #9963 from twbs/min-breakpoint-naming
rename @screen-XX to @screen-XX-min for clarity+unambiguity
2013-08-23 22:50:41 -07:00
Chris Rebert a7e5bac2d7 Merge pull request #10100 from twbs/document_hide_text
Fixes #10076: Document hide text
2013-08-23 22:39:26 -07:00
Mark Otto 48d929d69e Use jekyll var for current version in docs; update banner in gruntfile to match .less banner 2013-08-23 22:38:51 -07:00
Mark Otto a66ccbc562 split mixin and grunt dist to be sure 2013-08-23 22:19:58 -07:00
Mark Otto 6de67c0ab6 Deprecate .hide-text mixin for .text-hide as mixin and class 2013-08-23 22:11:41 -07:00
Mark Otto e25ca1e7a9 Document .hide-text and .text-hide 2013-08-23 22:01:42 -07:00
Mark Otto 7a7149d2ee Rearrange helper classes docs section; add subnav list items to docs side nav 2013-08-23 22:00:54 -07:00
Mark Otto 7edd87dde9 Merge branch 'master' of github.com:twbs/bootstrap 2013-08-23 21:45:58 -07:00
Mark Otto c4f1591e70 fixes #10095: note about backwards incompatibility 2013-08-23 21:45:46 -07:00
Mark Otto c1ddb06de7 Merge pull request #10098 from wangsai/fix-form
fix form
2013-08-23 21:34:44 -07:00
Mark Otto b67e49367a Merge pull request #10097 from wangsai/complete-td
complete missed </td>
2013-08-23 21:34:25 -07:00
wangsai df56ecbdcb fix form 2013-08-24 11:39:34 +08:00
wangsai e3f9719096 complete missed </td> 2013-08-24 11:09:33 +08:00
Chris Rebert 1a1394dc62 Merge pull request #9931 from realityking/toolbar
Add role="toolbar" to elements with .btn-toolbar.
2013-08-23 16:19:30 -07:00
Chris Rebert 9b2ff3713e fix #10054; mention .muted -> .text-muted in migration docs 2013-08-23 16:12:24 -07:00
Mark Otto ae96cfd909 Merge pull request #9966 from twbs/header-font-size-vars
add variables for heading font sizes; fixes #9921
2013-08-23 14:26:40 -07:00
Mark Otto fab039f29b run grunt 2013-08-23 14:26:16 -07:00
Mark Otto 12a70cec88 Run grunt dist on theme for some reason 2013-08-23 14:23:13 -07:00
Mark Otto 2b37d2b533 Update and document use of small in headings 2013-08-23 14:22:51 -07:00
Mark Otto 310642d5ac Merge branch 'master' into header-font-size-vars 2013-08-23 14:00:28 -07:00
Mark Otto 7b0d035dd4 Merge branch 'master' of github.com:twbs/bootstrap 2013-08-23 13:46:40 -07:00
Mark Otto acb338766e fixes #10087: add version number to all docs pages in footer 2013-08-23 13:46:28 -07:00
Chris Rebert ec7fa0a254 fix data-api portion of #10084 2013-08-23 11:14:54 -07:00
Chris Rebert 0f669b6dcb repeat #10081 caveat for popovers too 2013-08-23 11:09:01 -07:00
Chris Rebert 3d72942384 tweak #10081 phrasing 2013-08-23 11:08:37 -07:00
Chris Rebert 34db002875 Merge pull request #10081 from bcarrell/master
docs: add explanation for adding tooltips to disabled elements
2013-08-23 11:02:46 -07:00
Mark Otto f8de960c38 Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	css.html
2013-08-23 10:47:36 -07:00
Mark Otto a0d0864bd7 fixes #9877: improve active state on nav list items in theme 2013-08-23 10:44:13 -07:00
Mark Otto 5bbbdb399b fixes #9879: add hover state to theme buttons 2013-08-23 10:36:37 -07:00
Chris Rebert 4912f960f4 fix #10070 by resyncing fieldset disabled live example & example code 2013-08-23 10:18:39 -07:00
bcarrell 5d39794287 docs: add explanation for adding tooltips to disabled elements, closes #10049 2013-08-23 12:10:52 -04:00
Cameron Little 9bdc841acc Added -webkit-overflow-scrolling: touch to responsive tables 2013-08-23 08:55:02 -07:00
Felix Hirschfeld c52e1b85ab Add mixin for transition-property
It's quite handy if a transition needs the same duration, timing-function or delay and only specific properties to animate.
2013-08-23 09:22:54 +02:00
Sam Bowler 343fd1bb1e Fix responsive table scrolling on Windows Phone 8. 2013-08-23 07:53:09 +01:00
Mark Otto c4c87fede5 fixes #9880: use correct grid classes on jumbotron example 2013-08-22 23:25:26 -07:00
Mark Otto 495768bbf5 Merge branch 'master' of github.com:twbs/bootstrap 2013-08-22 23:19:49 -07:00
Mark Otto 3318a98229 add blog link to homepage 2013-08-22 23:18:45 -07:00
Mark Otto 24f57bdf41 Merge pull request #10012 from twbs/david-badge
add David (david-dm.org) badge to monitor currentness of dependencies
2013-08-22 19:26:18 -07:00
Mark Otto 615ca89b1b Merge pull request #10040 from twbs/pull-navbar-docs
add cross-reference to .navbar-left/right in .pull-left/right docs
2013-08-22 19:23:21 -07:00
Chris Rebert 99b35150ee update outdated JSFiddle example 2013-08-22 16:51:57 -07:00
Chris Rebert f7d6b488e6 fix #10029 2013-08-22 12:30:32 -07:00
Chris Rebert 354e2ee4f9 add cross-reference to .navbar-left/right in .pull-left/right docs 2013-08-22 12:28:00 -07:00
Josh Dague f140084f2b Don't explicitly reference global jQuery
Removes `window.jQuery` in favor of `jQuery`, fixes #10038
2013-08-22 14:50:15 -04:00
Chris Rebert 0c0400633a Merge pull request #10034 from nschonni/use-published-version-for-grunt-html-validation
Use NPM version of grunt-html-validation
2013-08-22 10:10:13 -07:00
Nick Schonning ca63686fda Use NPM version of grunt-html-validation
The package is now published, so the direct git url is no longer
required
2013-08-22 12:20:56 -04:00
Barry vd. Heuvel c5cfc690dd Add missing methods (rotateX/Y, perspective(-origin) and transform-origin)
Added missing mixins:
rotateX
rotateY
perspective
perspective-origin
transform-origin
2013-08-22 13:05:06 +02:00
Thomas Welton 31ab249809 Removed glyphicon-block instead target :empty .glyphicons 2013-08-22 10:30:18 +01:00
Thomas Welton 8663b75c4d Added glyphicon-block class
Prevents elements moving around the page after the font file has loaded by setting a defined width on elements using the icon font.
2013-08-22 02:54:54 +01:00
Jason Nutter a40568a1e0 Fixing carousel control positioning
The left control should be positioned from the left, while the right
control should be positioning from the right. Positioning both from the
left results in the right carousel control being incorrectly positioned
(most noticeable with a larger than normal font size).
2013-08-21 15:51:24 -07:00
Chris Rebert 1bcf9f126d Merge pull request #10011 from nschonni/patch-1
Update Grunt instruction links and wording
2013-08-21 15:42:58 -07:00
Mark Otto bc2e97756f Always wrap form examples in .bs-example; add some missing role='form' 2013-08-21 15:12:55 -07:00
Chris Rebert 31641d3d6d add David (david-dm.org) badge to monitor currentness of dependencies 2013-08-21 15:11:56 -07:00
Nick Schonning b32cfa2cf2 Update Grunt instruction links and wording 2013-08-21 18:11:33 -04:00
Mark Otto 6fc988613a Merge branch 'master' of github.com:twbs/bootstrap 2013-08-21 14:30:27 -07:00
Mark Otto aea1d8839f Merge pull request #10006 from jodytate/master
remove .btn-group
2013-08-21 14:25:49 -07:00
jody tate e4bf27b223 remove .btn-group
Removing this class--it's not used in the example and using it causes "bad things to happen." 

http://jsfiddle.net/josephtate/Jn6H4/
2013-08-21 13:31:17 -07:00
jody tate cb2e11ece4 remove .btn-group
The example doesn't use .btn-group and adding the class causes "bad things to happen," as the saying goes.

http://jsfiddle.net/josephtate/g6AWF
2013-08-21 13:06:46 -07:00
Chris Rebert 22ce649910 deprecate @screen-{phone,tablet,desktop} vars 2013-08-21 12:26:20 -07:00
Chris Rebert c429fd1a3c Merge pull request #9999 from sqrt4/fix-9974
Fixes #9974
2013-08-21 11:36:02 -07:00
James Lawrence 2cb1626907 Fixes #9974
Added th selector in .table-row-variant mixin
2013-08-21 17:56:36 +01:00
Chris Rebert fee05d1f3e Merge pull request #9987 from wangsai/fix-typo
change `else if` to `else`
2013-08-21 09:23:31 -07:00
jody tate 68b7998c05 removed extraneous space 2013-08-21 08:46:13 -07:00
jody tate 3d366038d7 removed reference to button color and gradient
Changed the wording to reflect the default button's new look since it's no longer grey and doesn't have a gradient. I'd say this new wording isn't ideal and needs something a bit more, well, descriptive.
2013-08-21 08:44:54 -07:00
Max F. Albrecht 27d92f45a5 code.less: also set default monospace font for <kbd> and <samp> 2013-08-21 14:08:43 +02:00
wangsai 004f2a2b2f change else if to else 2013-08-21 19:36:33 +08:00
Denis Gonchar 4284fc0a5e fix #9941 2013-08-21 15:57:48 +06:00
Chris Rebert e143c35472 Merge pull request #9973 from coliff/patch-6
Update justified-nav.css (Removed unnecessary ms-linear-gradient prefix)
2013-08-21 00:35:15 -07:00
Christian c76b7a53a4 Update justified-nav.css
Removed unnecessary ms-linear-gradient prefix. There was never a stable release of IE that supported -ms- prefixed gradients, those were only in preview versions (stable IE10 supports both prefixed and unprefixed gradients). (source: http://lea.verou.me/2013/04/can-we-get-rid-of-gradient-prefixes/)
2013-08-21 16:30:12 +09:00
Thomas Welton 56f1ff6ca7 Added fonts to "main" files
When using bower the "main" property is used to specify the files that should be consumed by applications including the package as a dependency.
Without including the fonts in this array the glyphicons do not work correctly as the relative font paths do not work after the "main" files are copied into my projects public dir using tools like https://github.com/yatskevich/grunt-bower-task

For now I have manually copied the fonts dir in the location needed for my project. But by accepting this pull request this will not be necessary for me or for other people that use bower.
2013-08-21 08:08:56 +01:00
Chris Rebert a3a02f9e6e rename @screen-XX to @screen-XX-min for clarity+unambiguity 2013-08-20 23:25:13 -07:00
Luke McDonald c8402e6e2a Remove progress bar striped @color parameters; use default transparent white.
* If the @color parameter is not removed, the stripes are the same color as the element background color. In this case, the stripes do not appear.
2013-08-20 22:46:01 -05:00
Luke McDonald e965ef0df3 Apply @color argument to striped gradient
The @color argument is currently not being used for the striped gradient.
2013-08-20 22:13:03 -05:00
Chris Rebert bbc32f7e79 add header font size vars to customizer page 2013-08-20 18:47:04 -07:00
Chris Rebert 631e200da3 regenerate customizer's raw-files.js 2013-08-20 18:46:20 -07:00
Chris Rebert 9a4fbde461 add variables for heading font sizes; fixes #9921 2013-08-20 17:49:23 -07:00
Chris Rebert 924e9e7450 update copyright year 2013-08-20 16:34:57 -07:00
Chris Rebert d666a89621 fix #9915 2013-08-20 16:21:18 -07:00
Chris Rebert 7c88db5c42 master branch is no longer stationary, so don't imply otherwise 2013-08-20 14:18:30 -07:00
Chris Rebert 295fef252e links to a release instead of master, so rephrase description accordingly 2013-08-20 14:16:31 -07:00
Chris Rebert 55088bbff8 point release download link to an actual release instead of master 2013-08-20 14:00:48 -07:00
Chris Rebert 63f8c8caab CONTRIBUTING: reflect move away from *-wip branch style of development
Per http://blog.getbootstrap.com/2012/12/10/bootstrap-3-plans/ :
> * Drop the `*-wip` branch style of development.
2013-08-20 13:45:52 -07:00
Chris Rebert 6735dc8c16 fix #9917 2013-08-20 13:36:22 -07:00
Chris Rebert d924bca6f6 fix #9924 2013-08-20 12:41:41 -07:00
Chris Rebert 0759dc4119 Merge pull request #9930 from tagliala/whitespaces-fix
Removed trailing whitespaces in responsive-utilities.less
2013-08-20 10:35:00 -07:00
Chris Rebert 94599259e1 Merge pull request #9918 from lamby/master
Correct "Aligninment" -> "Alignment" typo.
2013-08-20 09:36:00 -07:00
Rouven Weßling a9d1f901c5 Add role="toolbar" to elements with .btn-toolbar. 2013-08-20 15:07:43 +02:00
Geremia Taglialatela db7cce42f2 Removing whitespaces 2013-08-20 14:56:10 +02:00
Chris Lamb 3515964578 Correct "Aligninment" -> "Alignment" typo.
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2013-08-20 11:18:23 +01:00
Mark Otto 0886fee103 quick fix for docs mention 2013-08-19 15:12:25 -07:00
Chris Rebert af75dca908 update grunt-html-validation output file ignores 2013-08-19 14:23:07 -07:00
fat e8a1df5f06 remove dumb validation reports 2013-08-19 14:18:20 -07:00
fat b6ddaf63d6 fix customizer 2013-08-19 14:16:52 -07:00
Mark Otto f95ab89fb1 really do the raw liquid tag 2013-08-19 13:58:29 -07:00
Mark Otto fadf016043 wrap generated customizer code in raw liquid tag for proper jekyll serve 2013-08-19 13:49:58 -07:00
Mark Otto 1a8f1e68ef fix broken panels in js example 2013-08-19 13:27:45 -07:00
Mark Otto ee5f030770 run grunt to generate customizer 2013-08-19 13:17:16 -07:00
Mark Otto 6248b71183 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-19 13:16:39 -07:00
Mark Otto 3f87bf46e4 fixes #9855: account for modal overflow on body hiding scrollbar 2013-08-19 13:16:32 -07:00
fat c2d5861232 update gruntfile not to run validation + remove validation status 2013-08-19 12:22:42 -07:00
fat c64a8cfc72 add glyphicons to customizer 2013-08-19 12:19:00 -07:00
Mark Otto c15b259f43 run grunt dist for #9864 2013-08-19 10:43:58 -07:00
Mark Otto 3d5ccc6c6f Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-19 10:43:45 -07:00
Mark Otto 723b9b89d7 Merge pull request #9864 from boomsb/3.0.0-wip
Update tables.less
2013-08-19 10:43:26 -07:00
Mark Otto 48cddf9633 fix 144 apple icon 2013-08-19 09:54:16 -07:00
Mark Otto 16976cc494 Fixes secondary issue in #9798 2013-08-19 09:36:56 -07:00
Mark Otto 7bc845abfa Add default navbar z-index to fix #9844
iOS doesn't pick up the z-indexing properly on the dropdowns unless you
specify one for the parent navbar.
2013-08-19 09:31:16 -07:00
boomsb bfe2dc4109 Update tables.less
Fixed Table cell sizing with multiple classes by using *= instead of ^=
2013-08-19 11:30:38 -05:00
Mark Otto b569836126 Comment out grid cols var until we get mixins back in v3.1 2013-08-19 09:17:49 -07:00
Mark Otto dacfb354ba Generate customizer stuff 2013-08-19 09:12:34 -07:00
Mark Otto 72fb2caf00 Update thumbnails col classes 2013-08-19 09:10:19 -07:00
Mark Otto 01f7bc4d86 run grunt dist on #9847 2013-08-19 08:59:12 -07:00
Mark Otto d195d5989f Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-19 08:58:59 -07:00
Mark Otto 50674b16d3 Merge pull request #9847 from wangsai/remove-duplicate-code
`.table` style is duplicate in `List groups in panels` and `Tables in panels`
2013-08-19 08:58:47 -07:00
Mark Otto 55b7b1494f Update jsbin example 2013-08-19 08:56:08 -07:00
Mark Otto f497b5e1f5 move dropdown change from navbar to dropdowns to fix customizer compiling 2013-08-19 08:54:40 -07:00
Mark Otto a9297c7ad2 save and recompile for that last commit 2013-08-19 08:51:25 -07:00
Chris Rebert 73a85d6eb3 Merge pull request #9851 from liuyl/typo
fix typo
2013-08-19 08:47:35 -07:00
Mark Otto 7e82ceb533 fix #9832 somewhat: more vars for jumbotron 2013-08-19 08:46:49 -07:00
Yulong Liu e82e8321f2 fix typo 2013-08-19 23:02:03 +08:00
saiwang fabbb9e4ba .table style is duplicate in List groups in panels and Tables in panels 2013-08-19 22:08:06 +08:00
Mark Otto 285393fb77 Re-enable glyphicons in carousel controls and then remove redundant CSS from example 2013-08-19 00:58:29 -07:00
Mark Otto dbd749c226 Merge pull request #9828 from cmdoptesc/3.0.0-wip
Add background-color to carousel.
2013-08-19 00:56:04 -07:00
al // @idest eb43c26855 Fix vertical alignment of carousel navigation arrows.
Navigation arrows were aligned to the top of page. Vertically centered them in this fix.
2013-08-19 00:54:54 -07:00
Mark Otto 4fd861a704 Fix the customizer.js; Update alert styles for pre blocks 2013-08-19 00:54:53 -07:00
al // @idest 8b24c47788 Add background-color to carousel.
Set a background color for the carousel example so that white text is now legible. Also fixed typo on line 97.
2013-08-19 00:49:28 -07:00
Mark Otto ea3fa72f1d Clarify responsive tables and tuck margin 2013-08-19 00:45:20 -07:00
Mark Otto 08d19af710 Fix remainder of panel default examples and reorder nav links 2013-08-19 00:43:22 -07:00
Mark Otto 7481aa7398 Add subnav link for panels with tables 2013-08-19 00:42:39 -07:00
Mark Otto 2a3018a9a6 Fix broken tables in panel groups example 2013-08-19 00:42:12 -07:00
Mark Otto 20fed789f9 More legible examples for progress bars 2013-08-19 00:41:03 -07:00
Mark Otto 38009ec8ef Double quotes not single quotes 2013-08-19 00:39:00 -07:00
Mark Otto 17c1388f23 Consistent alert link examples (adds warning and reorders) 2013-08-19 00:38:20 -07:00
Mark Otto 07cecc88bc Nuke top margin on pager examples 2013-08-19 00:36:45 -07:00
Mark Otto d8128fca94 Change up label padding to equalize top and bottom 2013-08-19 00:36:39 -07:00
Mark Otto 14c4484ec4 Nuke margin for last child navbar text 2013-08-19 00:34:31 -07:00
Mark Otto efa8b40ce8 Run grunt dist on responsive changes 2013-08-19 00:34:16 -07:00
Mark Otto 5b2e3dd769 Doh! Really undo that navbar thing 2013-08-19 00:33:27 -07:00
Mark Otto 515d7caa94 remove redundant docs section 2013-08-19 00:31:38 -07:00
Mark Otto 5639287d5d Copy edits, fix classes for demo, add subnav links 2013-08-19 00:16:51 -07:00
Mark Otto 3260288df8 Merge branch '3.0.0-wip' of https://github.com/eratzlaff/bootstrap into eratzlaff-3.0.0-wip 2013-08-19 00:15:47 -07:00
Elvis Ratzlaff 7818c5e186 Add Test case to documentation 2013-08-19 03:14:38 -04:00
Mark Otto 6262230d0f update grid options max container width in docs to reflect latest changes 2013-08-19 00:06:26 -07:00
Mark Otto 0682af9ee4 use n/a not - 2013-08-19 00:05:03 -07:00
Mark Otto 0730c22e21 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-19 00:03:35 -07:00
Mark Otto c77bae308a more copy edits 2013-08-19 00:03:28 -07:00
Mark Otto de7cc0c17f don't repeat ourselves in the disabled responsiveness stuff 2013-08-18 23:58:31 -07:00
Chris Rebert c6a1a493c7 Merge pull request #9826 from phillipalexander/patch-1
Remove unnecessary trailing comma in Gruntfile.js
2013-08-18 23:57:43 -07:00
Mark Otto 2275277be4 no linenos 2013-08-18 23:54:42 -07:00
Phillip Alexander 39bc5198ae Remove extra trailing comma in Gruntfile.js
validation: {
      options: {
        reset: true
      },
2013-08-18 23:54:25 -07:00
Mark Otto 35092a7cfd no lead on that paragraph 2013-08-18 23:54:18 -07:00
Mark Otto f7a7cb479f Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Conflicts:
	getting-started.html
2013-08-18 23:52:22 -07:00
Mark Otto 7dcfc44426 Nuke the repeated blog stuff and just point people to the upcoming post 2013-08-18 23:51:24 -07:00
Mark Otto 0e61e8783b Undo jank jump to docs section via side nav thing for all but h1s
While it worked, it overlaps content and makes links unclickable,
elements unselectable, etc. Le sad.
2013-08-18 23:51:09 -07:00
Mark Otto 7eddb94fa6 simpler customizer files section; adds glyphicons.less 2013-08-18 23:36:36 -07:00
Chris Rebert c0f477a107 update version number in anticipation of final release 2013-08-18 23:27:46 -07:00
Chris Rebert 4ab4678f0f let's avoid calling it that 2013-08-18 23:24:31 -07:00
Chris Rebert c9b4f7254b This-Is-SPARTA! Or rather, HTML. Not Markdown. 2013-08-18 23:18:58 -07:00
Mark Otto 2234f0e333 janky not ghetto <3 2013-08-18 23:09:09 -07:00
Mark Otto 2e962e6599 give some more space on that janky docs navbar fix 2013-08-18 23:08:57 -07:00
Mark Otto 1b97f2a16e update template in getting started docs to reflect shim and respond.js in examples 2013-08-18 23:07:36 -07:00
Mark Otto 0853ece4c8 Merge branch '3.0.0-wip' into bs3_homepage 2013-08-18 22:47:09 -07:00
Mark Otto 831d3215c6 more accurate dist contents 2013-08-18 22:45:30 -07:00
Mark Otto 73f56a9036 more migration guide work 2013-08-18 22:43:29 -07:00
Mark Otto e3e408bb78 Merge pull request #9822 from gdi2290/patch-1
fix file structure in "What's included"
2013-08-18 22:35:19 -07:00
PatrickJS 2a2a8e9e20 fix file structure in What's included 2013-08-18 22:27:30 -07:00
Mark Otto 87924abdc2 Super ghetto fix for preventing navbar overlap when clicking side nav links /cc @fat 2013-08-18 22:19:56 -07:00
Mark Otto 869a163e67 Fix broken link and wrong label 2013-08-18 22:19:16 -07:00
Mark Otto 2f2232cc3f screw it, errbody gets a single map base64 image 2013-08-18 22:04:51 -07:00
Mark Otto 8daa8a8dbd create smaller map pattern so ios picks it up 2013-08-18 21:59:23 -07:00
Mark Otto e293873484 smaller h1 and h2 2013-08-18 21:49:05 -07:00
Elvis Ratzlaff 988c03d462 Variable name fix 2013-08-19 00:46:09 -04:00
Mark Otto 140f6d3bdc Merge branch '3.0.0-wip' into bs3_homepage 2013-08-18 21:43:58 -07:00
Chris Rebert 74ae8ecc80 customize.html: fix typo 2013-08-18 21:43:14 -07:00
Mark Otto e989acfc79 Add responsive tables with help of .table-responsive wrapper 2013-08-18 21:43:05 -07:00
Chris Rebert 2c2311c318 fix spelling of "Togglable" 2013-08-18 21:34:17 -07:00
Jacob Thornton 1aa0eb32e3 catch a view data-vars 2013-08-18 21:29:46 -07:00
Elvis Ratzlaff 5b3e6eb563 make visible/hidden classes mixable 2013-08-19 00:23:53 -04:00
Mark Otto 1a8d1b7586 docs cleanup around alignment on homepage and footers 2013-08-18 21:15:07 -07:00
Mark Otto 2713a75156 larger download btn on customizer 2013-08-18 21:04:46 -07:00
Mark Otto b360a97f5c mo betta btn classes in docs 2013-08-18 21:02:52 -07:00
Mark Otto a9378a9267 Merge branch '3.0.0-wip' into bs3_homepage
Conflicts:
	customize.html
	dist/css/bootstrap.min.css
2013-08-18 20:15:45 -07:00
Mark Otto f584500211 Merge pull request #9819 from twbs/bs3_panel_base_class
BS3: Refactor panels to require default class
2013-08-18 20:11:36 -07:00
Mark Otto a1db2d7a5e Merge branch '3.0.0-wip' into bs3_panel_base_class
Conflicts:
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.min.css
2013-08-18 20:11:04 -07:00
Mark Otto 2e91843661 Merge pull request #9818 from twbs/bs3_alert_base_class
BS3: Refactor alerts to require a modifier class
2013-08-18 20:10:14 -07:00
Mark Otto 0615142834 update customizer to latest vars 2013-08-18 20:08:03 -07:00
Mark Otto e6ff75bcea Update var in theme 2013-08-18 19:57:25 -07:00
Mark Otto 03ba9ed9ed update theme to match 2013-08-18 19:53:28 -07:00
Mark Otto 108d10a920 Refactor alerts to have a base class, but no default class, thus requiring a modifier class at all times 2013-08-18 19:50:53 -07:00
Mark Otto bab51d27ac Refactor panels to have a base class for improved flexibility when customizing (and no overriding to start, too) 2013-08-18 19:40:57 -07:00
Jacob Thornton 93887f4bd0 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-18 19:40:56 -07:00
Jacob Thornton ea383804ec fixes #9807 2013-08-18 19:40:26 -07:00
Mark Otto d5cd040f57 improve dependencies for image thumbnails and thumbnail component 2013-08-18 19:24:10 -07:00
Mark Otto cf09e6a6b5 better alignment of glyphicons vertically 2013-08-18 19:05:48 -07:00
Mark Otto 841dac58ca move glyphicons styles to docs css 2013-08-18 19:04:30 -07:00
Mark Otto 9dcae610e9 Merge branch '3.0.0-wip' into bs3_homepage
Conflicts:
	customize.html
	examples/justified-nav/justified-nav.css
2013-08-18 19:02:42 -07:00
Mark Otto 5bd2d7ed7e fixes #9815: proper alignment of navbar nav if first child 2013-08-18 18:49:07 -07:00
Mark Otto 87a1d7e5a0 update non responsive example 2013-08-18 18:47:05 -07:00
Mark Otto 1bc13c659f don't include other navbar links in non responsive docs; use generic links 2013-08-18 18:44:40 -07:00
Mark Otto 7241d7beb7 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-18 18:16:14 -07:00
Mark Otto 35ad599df6 prevent navbar from collapsing in non responsive example (fixes #9812) 2013-08-18 18:16:01 -07:00
Chris Rebert ed3e870da8 tweak formatting of additional migration notes 2013-08-18 16:39:08 -07:00
Chris Rebert 2ca46ff97e add angle brackets 2013-08-18 16:36:49 -07:00
Mark Otto 9c12d670ed clarify inline block mention in docs 2013-08-18 16:27:20 -07:00
Mark Otto f4b744e697 Merge pull request #9791 from pereorga/pere-optimize-images
Optimize images using lossless compression
2013-08-18 15:52:24 -07:00
Mark Otto c240460f0b Merge branch '3.0.0-wip' into glyphicons-LESS-fixes
Conflicts:
	dist/css/bootstrap.min.css
2013-08-18 15:47:29 -07:00
Mark Otto 638db635d7 fix broken button 2013-08-18 15:45:56 -07:00
Mark Otto 7b4e2a9a4a Merge branch '3.0.0-navbar-default' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-navbar-default
Conflicts:
	dist/css/bootstrap.min.css
2013-08-18 15:43:27 -07:00
Mark Otto fe767a18d3 fixes #9798: update spacing on checkboxes and radios for horizontal 2013-08-18 15:41:24 -07:00
Chris Rebert fa7cc6cafd account for 9fa0a5d127 in the docs 2013-08-18 15:37:07 -07:00
Chris Rebert c338f2782d regenerate Glyphicons listing/demo section of docs 2013-08-18 15:36:24 -07:00
Julian Thilo ef68cf8ebd Add new navbar-default class to examples 2013-08-19 00:35:40 +02:00
Mark Otto 5746979aad Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-18 15:30:02 -07:00
Chris Rebert 0501d83f8b regenerate CSS 2013-08-18 15:20:16 -07:00
Chris Rebert 9fa0a5d127 tweak some of the Glyphicon class names to match Bootstrap conventions 2013-08-18 15:19:13 -07:00
Mark Otto 43271f1ab6 Merge pull request #9804 from twbs/redundant-ampersands
rm redundant ampersands from button-groups LESS
2013-08-18 15:15:53 -07:00
Chris Rebert 7b0d93f79e regenerate Glyphicons LESS from their website; fixes some wrong codepoint numbers 2013-08-18 15:15:33 -07:00
Mark Otto 8d8d165ee7 Merge pull request #9800 from ZDroid/patch-1
Nesting for link styles
2013-08-18 15:10:48 -07:00
Mark Otto 9b61b7a722 fixes #9803: label and input alignment in horizontal forms 2013-08-18 15:10:28 -07:00
Chris Rebert fa3959a1e1 rm redundant ampersands from button-groups LESS 2013-08-18 15:05:42 -07:00
Julian Thilo 546b2cc614 Fix some forgotten things for navbar-default
New variable names were missing here and there.
2013-08-18 23:30:40 +02:00
Zlatan Vasović 743fc9ac7e Nesting for link styles 2013-08-18 23:28:55 +02:00
Julian Thilo abca00870f Add a .navbar-default class for default colors
* Extract color styles from .navbar { } and put them into
.navbar-default { }
* Change variable names
* Change the docs accordingly (i.e., add the .navbar-default class to
all default navbars)
* Change customizer accordingly
2013-08-18 23:05:56 +02:00
Chris Rebert 518488cb40 make Recess part of the Grunt test task to guard against bad LESS 2013-08-18 13:47:16 -07:00
Chris Rebert b5d87fc42b rename HTML5 validation Grunt task since it checks the examples too 2013-08-18 13:43:53 -07:00
Chris Rebert af9fd02638 Merge pull request #9796 from twbs/fix-glyphicons-btns-docs
fix wrong closing tags on Glyphicons-in-buttons examples
2013-08-18 13:41:21 -07:00
Chris Rebert 1b49b42683 fix wrong closing tag on Glyphicons-in-buttons examples 2013-08-18 13:40:39 -07:00
Chris Rebert 896bd327c7 Merge pull request #9793 from vsn4ik/fix_examples_url
Fix examples url in _layouts/home.html
2013-08-18 13:18:55 -07:00
vsn4ik d721c61d99 Fix examples url in _layouts/home.html 2013-08-18 23:06:56 +04:00
Pere Orga 0665b67760 Optimize images using lossless compression 2013-08-18 19:50:33 +01:00
Mark Otto 9b66e6b0f4 fixes #9790: nullify right padding in container-ed navbars when last element in collapse is a right aligned navbar nav 2013-08-18 11:17:28 -07:00
Mark Otto 776fb435c5 update nav for getting started migration 2013-08-18 11:13:56 -07:00
Mark Otto 26067d3d7d fixes #9768: unbold buttons 2013-08-18 11:11:31 -07:00
Mark Otto b5ac1b065e Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-18 11:08:29 -07:00
Mark Otto ef4590dfb4 fixes #9786: enable tables in panels 2013-08-18 11:08:20 -07:00
Chris Rebert 0cbffb3bcb Delete glphyicons.less
File is empty and has misspelled name.
Fixes #9787
2013-08-18 11:00:27 -07:00
Mark Otto 3c1d951d29 fixes #9787: remove derp file 2013-08-18 11:00:04 -07:00
Chris Rebert 40a1bcea7d Merge pull request #9789 from thgh/patch-2
Fix well class names in migration section of getting-started.html
2013-08-18 10:57:23 -07:00
Chris Rebert 25d9b2ad49 Merge pull request #9788 from brunoamaral/3.0.0-wip
fixes two type-o's in glyphicons
2013-08-18 10:55:22 -07:00
thgh 5e2569f15b Fix well class names in migration section of getting-started.html 2013-08-18 19:54:28 +02:00
Bruno Amaral 0989babe5d fixes two type-os in glyphicons 2013-08-18 18:47:40 +01:00
Mark Otto d7eee9bd6e Merge pull request #9767 from twbs/bs3_restore_glyphicons
BS3: Restore Glyphicons
2013-08-18 10:35:26 -07:00
Mark Otto f8b65b41ab Merge branch '3.0.0-wip' into bs3_restore_glyphicons
Conflicts:
	dist/css/bootstrap.min.css
2013-08-18 10:28:32 -07:00
Mark Otto 92d8989553 Merge pull request #9785 from mikepage/patch-1
Update mixins.less to fix error .button-variant is undefined in Grunt
2013-08-18 10:27:53 -07:00
Mark Otto 6496ffb7d4 reformat all the things 2013-08-18 10:26:50 -07:00
Mike Pagé 2488f2ae68 Update mixins.less 2013-08-18 19:23:42 +02:00
Mark Otto a5ac0b7498 Merge branch '3.0.0-wip' of https://github.com/iatek/bootstrap into iatek-3.0.0-wip 2013-08-18 10:12:33 -07:00
Mark Otto 73a1a4133c combine and simplify caret border widths 2013-08-18 10:08:18 -07:00
Mark Otto a9e741bffc Merge branch 'fixcaret' of https://github.com/liuyl/bootstrap into liuyl-fixcaret 2013-08-18 10:07:34 -07:00
Mark Otto 0c9bf6bcce remove padding from justified nav masthead and footer 2013-08-18 10:02:32 -07:00
Mark Otto 8ae9736ead Merge branch 'remove-body-content' of https://github.com/lipis/bootstrap into lipis-remove-body-content 2013-08-18 10:00:30 -07:00
Mark Otto 78701778d0 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-18 10:00:20 -07:00
Mark Otto 4246f6a01f fixes #9769: use navbar border radius var in theme 2013-08-18 09:58:21 -07:00
Chris Rebert db5aee54df Merge pull request #9782 from minddust/3.0.0-wip
Update progressbar docs
2013-08-18 09:01:41 -07:00
Stephan Groß 142ada4219 Update progressbar
there is no gradient in 3.x
2013-08-18 17:17:07 +02:00
liuyl ce410dc36e fixed caret 2013-08-18 20:13:48 +08:00
iatek 863b03cf38 updates to migration 2013-08-18 07:20:56 -04:00
iatek d1519400f2 updates to migration 2013-08-18 07:19:53 -04:00
Panayiotis Lipiridis e6e8499ab8 Got rid of body-content from examples 2013-08-18 12:25:23 +02:00
Mark Otto 6b24297c5b update urls 2013-08-18 02:11:57 -07:00
Mark Otto fd97c2fce4 bad copypasta 2013-08-18 02:04:39 -07:00
Mark Otto c7e5fa15e0 Merge branch '3.0.0-wip' into bs3_restore_glyphicons 2013-08-18 02:04:10 -07:00
Mark Otto 72a3819f6c remove carousel icons include 2013-08-18 01:55:47 -07:00
Mark Otto e13ca6d384 Upgrade to latest glyphicons 2013-08-18 01:46:26 -07:00
Mark Otto b09fcc019c remove old glyphicons mention 2013-08-18 01:32:33 -07:00
Mark Otto f2e35bf702 docs layout and alignment refinement 2013-08-18 01:23:45 -07:00
Mark Otto 1e0453f825 Restore glyphicons 2013-08-18 00:36:51 -07:00
fat b790bbbafc Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-18 00:29:15 -07:00
fat 57f5872467 bunch of updates to customizer 2013-08-18 00:28:52 -07:00
Mark Otto 09d80fab99 Merge pull request #9761 from wangsai/fix-eamples-respondjs
add IE's Conditional comments for respondjs and html5shiv
2013-08-17 23:55:05 -07:00
Mark Otto 578a14e14a Rearrange the docs CSS 2013-08-17 23:53:27 -07:00
saiwang 0c094efe28 add IE's Conditional comments for respondjs and html5shiv 2013-08-18 14:28:52 +08:00
Mark Otto d13c4e5e5b Update URLs in config to what I think they need to be; add theme CDN url 2013-08-17 23:07:15 -07:00
Mark Otto c729f16282 it's levi-OH-sa, not levi-oh-SAR 2013-08-17 22:51:00 -07:00
Mark Otto 40cbfb69d2 undo old change to navbar brand from this branch 2013-08-17 22:44:59 -07:00
Mark Otto 6b74b871df clean up padding and alignment and stuff 2013-08-17 22:43:15 -07:00
Mark Otto 18766db634 Merge branch '3.0.0-wip' into bs3_homepage
Conflicts:
	dist/css/bootstrap.min.css
2013-08-17 22:39:07 -07:00
Mark Otto 04a73ebe42 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-17 22:11:27 -07:00
Mark Otto 3e02b0f5d0 Update docs text a bit 2013-08-17 22:11:21 -07:00
fat 95732b429f add dependency support to customizer 2013-08-17 21:50:01 -07:00
Mark Otto f891f91bac Reorder bootstrap.less to match docs oder 2013-08-17 21:18:00 -07:00
Mark Otto 811120ffa2 Add data-dependency to less and js files in customizer 2013-08-17 21:17:35 -07:00
Mark Otto 8d59d8def7 sub headings for modals and mobile devices on browser support 2013-08-17 21:01:58 -07:00
Mark Otto 9533a1339f Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-17 21:00:20 -07:00
Mark Otto 5539db5237 Navbar update
Addresses a few different cases where the navbar has and doesn't have a
container, and accordingly adjusts the padding and margin of key
elements.
2013-08-17 21:00:13 -07:00
Mark Otto b413aff045 Favicon in navbar example 2013-08-17 20:35:31 -07:00
Mark Otto d713f8341c Update jumbotron
* Defaults to no rounded corners and full width in the viewport
* When in a container, the jumbotron has extra padding and will have
rounded corners
* Updates default jumbotron example to show the full width default
display

Fixes #9759.
2013-08-17 20:33:52 -07:00
fat 47fcb322eb Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-17 20:29:36 -07:00
fat 734b6acf13 add small fix for tooltip consistency + fix customizer syntax issue 2013-08-17 20:28:58 -07:00
Mark Otto d9e38312d2 copy edit 2013-08-17 20:11:18 -07:00
Mark Otto f6c151aa20 Merge pull request #9756 from twbs/bs3_theme
BS3: Add optional theme (fixes #8706)
2013-08-17 19:17:25 -07:00
Mark Otto 9a66906d3d generic comment 2013-08-17 19:14:13 -07:00
Mark Otto 761b80c391 Merge branch '3.0.0-wip' into bs3_theme 2013-08-17 19:09:33 -07:00
fat 06c3d87973 use correct arg name 2013-08-17 19:07:59 -07:00
fat 9828aa5b4d Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-17 19:04:58 -07:00
fat 00d2986858 add logging 2013-08-17 19:04:41 -07:00
Mark Otto b31ce3204d Merge branch '3.0.0-wip' into bs3_theme 2013-08-17 19:00:35 -07:00
Mark Otto 0098c358c8 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-17 19:00:22 -07:00
Mark Otto 3780edd956 update examples to use new .btn-lg class 2013-08-17 19:00:14 -07:00
Mark Otto c56a749323 Finish first pass at and docment Bootstrap v2-ish theme
* Adds new "theme" example
* Adds new theme.less file to provide all the overrides and additional
styles for the theme
* theme.less compiles, via Grunt, to two new files to `dist/css`,
bootstrap-theme.css and bootstrap-theme.min.css
2013-08-17 18:59:50 -07:00
fat a39cb4be90 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-17 18:41:51 -07:00
fat 29bf254fc3 move customizer onto gists 2013-08-17 18:41:36 -07:00
Chris Rebert 405df13044 fix typo in JS docs 2013-08-17 17:44:42 -07:00
Chris Rebert cc3077ac17 improve grammar in "Disabling responsiveness" docs 2013-08-17 17:41:47 -07:00
Chris Rebert 50b9c7339a comma & <code> in "Modals and mobile devices" docs 2013-08-17 17:38:53 -07:00
Mark Otto ba20e512ce Merge branch '3.0.0-wip' into bs3_theme
Conflicts:
	dist/css/bootstrap.min.css
2013-08-17 17:31:58 -07:00
Mark Otto e29c23afab Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-17 17:27:05 -07:00
Chris Rebert 27424ee422 improve grammar in "Alternate customization methods" docs 2013-08-17 17:26:54 -07:00
Mark Otto e587219958 Fix navbar brand alignment by removing header padding when above 768px 2013-08-17 17:26:52 -07:00
Mark Otto 90d5e48f5f Add alert for customizer errors 2013-08-17 17:26:36 -07:00
Mark Otto b3e06aea01 Delete the customizer layout (again?) 2013-08-17 17:26:05 -07:00
fat 5d84e02c1c add the customizer builder to the default grunt task 2013-08-17 16:44:54 -07:00
fat 2dbf02b129 rebuild 2013-08-17 16:19:09 -07:00
fat 4696565044 fixes #9745 2013-08-17 16:18:26 -07:00
fat 63ac9e354f fixes #9674 2013-08-17 16:13:48 -07:00
fat 70f1cac841 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-17 16:11:41 -07:00
fat c0eabdda9f fixes #9543 2013-08-17 16:11:05 -07:00
Mark Otto 0b96015dc9 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-17 16:10:35 -07:00
Mark Otto c8b51e1cd8 Update description in composer 2013-08-17 15:58:04 -07:00
fat d754e6564d add some crap 2013-08-17 15:54:42 -07:00
fat 8b5314096f Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-17 15:49:27 -07:00
fat 1d53dd31f5 add role=menu to html 2013-08-17 15:48:29 -07:00
Mark Otto 6636734388 Fixes #9752: clear floats in .panel-body 2013-08-17 15:46:42 -07:00
Mark Otto 3fbc1fc555 Fixes #9749: provide js bin link in readme for easier bug reports 2013-08-17 15:43:54 -07:00
Mark Otto 665559a450 smaller example screenshots, fixes #9748 2013-08-17 15:35:15 -07:00
Mark Otto 61caed21e2 More consistent naming with screen size variables using xs, sm, md, and lg 2013-08-17 15:21:38 -07:00
Mark Otto 5ba19dc884 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-17 15:08:02 -07:00
Mark Otto 4f97df8aa4 update non-responsive docs and example to really disable it 2013-08-17 15:07:53 -07:00
fat a01b1dd71a fixes #9585 2013-08-17 15:07:26 -07:00
fat f4c7629592 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-17 15:06:29 -07:00
fat a10ec62f63 fixes #9579 2013-08-17 15:05:59 -07:00
Mark Otto 6c765ac821 add nonresponsive template to examples 2013-08-17 15:02:38 -07:00
Mark Otto fdb7121f41 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-17 14:49:58 -07:00
Mark Otto 3bcadfc2c5 brand, not title, in navbar examples 2013-08-17 14:42:55 -07:00
fat 484d51ce48 add doc comment for #9517 2013-08-17 14:42:44 -07:00
Mark Otto 3cb38197f2 more specific panel titles and docs notes 2013-08-17 14:27:21 -07:00
fat 2d875c8d5e Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-17 14:25:16 -07:00
fat 33f448f605 rebuild 2013-08-17 14:25:04 -07:00
Mark Otto 5e31478a91 base64 map bg 2013-08-17 14:24:48 -07:00
fat 712b89ed4e fixes #9362 2013-08-17 14:24:38 -07:00
Mark Otto 214835c6b2 tweak ads styling 2013-08-17 14:21:58 -07:00
Mark Otto 441e04c84a Merge branch '3.0.0-wip' into bs3_homepage
Conflicts:
	dist/css/bootstrap.min.css
	getting-started.html
2013-08-17 14:16:40 -07:00
Mark Otto 1b814ddd0a Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-17 14:15:43 -07:00
Mark Otto 6ca32589b5 2px border on thead th elements for just a tad more separation 2013-08-17 14:15:33 -07:00
Mark Otto 903e92a327 Update helper classes to reflect changes and mention mixins 2013-08-17 14:15:14 -07:00
Mark Otto 6fe1264a80 mo betta heading examples labels 2013-08-17 14:11:05 -07:00
Mark Otto 2a4bd786ed more accurate grid classes in examples 2013-08-17 14:09:35 -07:00
fat 728a5e17d6 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Conflicts:
	dist/css/bootstrap.min.css
2013-08-17 13:43:58 -07:00
fat 53c80ed9cb add comment addressing #9023 2013-08-17 13:40:28 -07:00
Mark Otto 0c70744ea2 fixes #9538: prevent Firefox rendering bug via some border-fu 2013-08-17 13:33:53 -07:00
Mark Otto 0e39f94574 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-17 13:18:19 -07:00
Mark Otto 82f6f08f89 Fixes #9552: Downsize and use whole numbers for panel title to prevent odd 1px bug 2013-08-17 13:18:10 -07:00
fat 5e89f71ab2 fix for #8768 2013-08-17 13:14:19 -07:00
Mark Otto ab700d753c fix #9743: pager hover background should be light gray 2013-08-17 13:07:21 -07:00
Mark Otto 3505606d34 add respond.js to all examples (fixes #9731) 2013-08-17 12:32:11 -07:00
Mark Otto e279ffab14 Merge pull request #9737 from ZDroid/patch-1
Removed blank .hidden-print
2013-08-17 11:58:19 -07:00
Mark Otto fc9c7a9189 Merge pull request #9726 from twbs/calculate-it-son
un-hardcode @grid-gutter-width in @container-* LESS vars
2013-08-17 11:52:38 -07:00
Zlatan Vasović 0555d11665 Removed blank .hidden-print
Blank .hidden-print class doesn't have sense.
2013-08-17 15:24:37 +02:00
Chris Rebert e12d6208b6 un-hardcode @grid-gutter-width in @container-* LESS vars 2013-08-17 00:02:17 -07:00
Mark Otto 6a8cc191b5 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into bs3_row_margins 2013-08-16 22:37:11 -07:00
Mark Otto cd0df1d21a fixes #9436 more: put padding on containers, not the body because full width elements 2013-08-16 22:37:02 -07:00
Mark Otto 16d5e1bae8 Merge pull request #9718 from twbs/bs3_row_margins
BS3: Simpler row margins
2013-08-16 15:32:18 -07:00
Mark Otto e4bb388bc9 Make negative margins on rows the default, not just in containers, and add padding to body to compensate 2013-08-16 15:16:03 -07:00
Mark Otto f459d76e38 fixes #9475 2013-08-16 15:07:45 -07:00
Chris Rebert 60d150dfd7 Merge pull request #9717 from twbs/carousel-html-compliance
Fix carousel example to pass HTML5 validator
2013-08-16 14:51:43 -07:00
Chris Rebert 07d15c4927 carousel example: add alt text to images 2013-08-16 14:50:46 -07:00
Chris Rebert de39c2f896 carousel example: add dummy 'src' attributes to <img>s 2013-08-16 14:43:39 -07:00
Mark Otto 62083a45b7 fixes #9701: fix up offcanvas example 2013-08-16 14:12:18 -07:00
Mark Otto d2e2ec0985 increase spacing on homepage links and social buttons (fixes #9706) 2013-08-16 14:04:11 -07:00
Mark Otto e6f185acad Justified nav now responsive; example updated accordingly (fixes #9708) 2013-08-16 14:01:32 -07:00
Mark Otto af7b072a74 basic cleanup on carousel example (fixes #9709 and #9700) 2013-08-16 13:50:17 -07:00
Mark Otto 3c880e681d finish up second pass through docs nav, headings, organization, naming, etc (another run through at #9710) 2013-08-16 13:30:33 -07:00
Mark Otto 551c561ee2 docs cleanup on naming to fix #9710 2013-08-16 12:43:54 -07:00
Mark Otto c13772d5f7 switch to margin on navbar-nav to avoid stacking negative space reported in #9705 2013-08-16 12:38:41 -07:00
Mark Otto 4d36992180 Fixed up examples more
* sticky footer side scrolling
* static and fixed navbar more similar
* min-height on static and fixed navbar examples to illustrate
differences

last two items fix #9702
2013-08-16 11:35:19 -07:00
Mark Otto e5f38207e0 fixed navbar static top borders 2013-08-16 11:34:30 -07:00
Mark Otto ed4316d9b2 fixes #9642: open dropdown nav items get proper styling 2013-08-16 11:16:32 -07:00
Mark Otto 6965c12e30 fixes #9697 2013-08-16 11:10:35 -07:00
Mark Otto 771ac3207e xs button is xs-er (fixes #9695) 2013-08-16 11:08:29 -07:00
Mark Otto 4684e0c09b Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-16 11:04:16 -07:00
Mark Otto 1974aa6967 fix up sticky footer example (fixes #9680) and add favicons to all examples 2013-08-16 11:03:52 -07:00
Chris Rebert 9464489720 fix Examples link on docs homepages; fixes #9693 2013-08-16 11:03:28 -07:00
Mark Otto 29fe7ed684 fix up justified nav example 2013-08-16 10:58:28 -07:00
Mark Otto ffbec23c98 Docs cleanup for v3 prep 2013-08-16 00:54:19 -07:00
Mark Otto 3bb5644c72 Fix alignment of navbar header in fixed navbars 2013-08-16 00:54:12 -07:00
Mark Otto afdaa0e6f0 Merge branch '3.0.0-wip' into bs3_homepage 2013-08-16 00:36:46 -07:00
Mark Otto 031703190c Merge pull request #9670 from saiwang/fix-examples-link
fix links in examples
2013-08-15 22:48:00 -07:00
saiwang a9268c01c9 fix links in examples 2013-08-16 13:42:43 +08:00
Mark Otto 2fa0975956 don't scope width on .make-xs-column mixin 2013-08-15 21:51:41 -07:00
Mark Otto e04590babb remove grid examples callout 2013-08-15 21:39:40 -07:00
Mark Otto 45e2d73e93 use getbootstrap for tweet button 2013-08-15 21:29:44 -07:00
Mark Otto b2f6268372 more docs updates for new examples 2013-08-15 21:09:25 -07:00
Mark Otto c4b59fc1ca fixes #9663: third part, document the resets 2013-08-15 20:43:55 -07:00
Mark Otto 111bdc4e93 fixes #9663: second part, reset pushes and pulls in md and lg grid tiers 2013-08-15 20:31:11 -07:00
Mark Otto 0c582f722b More responsive customizer layout 2013-08-15 20:25:43 -07:00
Mark Otto b0a66e60c1 Fixes #9663: Add offset overrides for medium and large grid tiers 2013-08-15 20:25:20 -07:00
Mark Otto fc88bcf0d1 fixes #9655: scrope list group styles in panels to immediate children only 2013-08-15 18:58:02 -07:00
Mark Otto 7960845f50 new screenshot images and docs section 2013-08-15 18:55:20 -07:00
Mark Otto 024e320e5c hella examples fixing, mostly navbars and lots of work on grids example 2013-08-15 17:39:37 -07:00
Mark Otto 05ebd5ebf9 Merge pull request #9653 from twbs/bs3_restore_examples
BS3: Restore examples back to main repo
2013-08-15 16:44:48 -07:00
Mark Otto 3d99a4c15e move to examples dir 2013-08-15 16:40:39 -07:00
Mark Otto 54670ab64a Merge branch 'bs-ex' into bs3_restore_examples
Conflicts:
	.editorconfig
	.gitignore
2013-08-15 16:38:12 -07:00
Mark Otto cfab4b1e9e nuke bootstrap dependencies 2013-08-15 16:32:36 -07:00
Mark Otto e47b0e5c9a nuke assets pre-move 2013-08-15 16:30:09 -07:00
Mark Otto 33f8c43eef Merge pull request #40 from huyouare/carousel-example
Added glyphicons to index.html
2013-08-15 16:23:40 -07:00
Mark Otto 6b5a199559 Merge pull request #42 from huyouare/navbar-paths
Paths to navbar, navbar-fixed-top and navbar-static-top fixed in the navbar.
2013-08-15 16:23:33 -07:00
Mark Otto 0bc2a69fc9 Merge pull request #46 from ggam/revamp-offcanvas
Simplified Off Canvas example
2013-08-15 16:23:24 -07:00
Mark Otto 7cd35f0cb6 nuke bg image on active/open for buttons for when we add gradients 2013-08-15 16:17:44 -07:00
Mark Otto 7ab52272d7 better well content labels 2013-08-15 15:27:37 -07:00
Mark Otto 16d7265c9b fixes #9647: ensure open dropdown toggles get .active styles 2013-08-15 15:16:46 -07:00
Mark Otto c389c9e8f4 fixes #9648 2013-08-15 14:57:55 -07:00
Mark Otto e0c6a5a32f fixes #9644: update scrollspy navbar to use latest code 2013-08-15 14:46:28 -07:00
Mark Otto e3c6a1fc4f form control state ordering 2013-08-15 14:35:15 -07:00
Mark Otto 5349075f36 update customizer vars 2013-08-15 13:58:23 -07:00
Mark Otto bf17721308 fixes #9587: add var for nav link padding 2013-08-15 13:58:16 -07:00
Mark Otto 2dbf2bb8fb fixes #9629 2013-08-15 13:54:47 -07:00
Mark Otto 25e11903e3 clear up rounded corners and nuke min-height 2013-08-15 13:52:46 -07:00
Mark Otto 61a395338d improve the navbar top display in example--fixes #9635 2013-08-15 13:48:47 -07:00
Mark Otto 418ca6c09b fixes #9622: reset to inline-block for img-thumbnail, but keep block for .thumbnail > img 2013-08-15 13:40:21 -07:00
Mark Otto 0664b3f0da fixes #9634: turn off overflow-y when the navbar is re-expanded into horizontal mode 2013-08-15 13:29:45 -07:00
Mark Otto 98368c0cca fixes #9632: button spacing in narrow viewports 2013-08-15 13:24:48 -07:00
Mark Otto c0c72a64b4 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-15 13:17:11 -07:00
Mark Otto f9d2f9b6cd improve pagination's active state so it looks less like the active state and more like active nav items 2013-08-15 13:16:06 -07:00
Mark Otto 3d37833134 reorder alerts 2013-08-15 13:06:51 -07:00
Mark Otto dd4d618717 remove unused submenu css in docs 2013-08-15 13:06:25 -07:00
Mark Otto 4da7cad021 reorder and cleanup progress bar display 2013-08-15 13:06:01 -07:00
Mark Otto 8211b12c0f improve table classes' snippets and ordering 2013-08-15 13:00:34 -07:00
Mark Otto 69a7c16705 fix spacing between examples and highlights again (my bad yo) 2013-08-15 13:00:06 -07:00
Chris Rebert a3cbdfab06 docs.css: rm duplicate semicolon 2013-08-15 12:55:43 -07:00
Mark Otto 834cbce9b7 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-15 12:35:46 -07:00
Mark Otto 33edb95b98 drop legend from docs example per #9626 2013-08-15 12:35:22 -07:00
Chris Rebert bc89c06b6c Merge pull request #9625 from twbs/fix-9513-more
more fixes for #9513
2013-08-15 12:27:42 -07:00
Chris Rebert 5f311790b9 more fixes for #9513 2013-08-15 12:26:37 -07:00
Chris Rebert 5a4401ac91 copyediting tweaks to "Disabling responsiveness" docs 2013-08-15 12:01:53 -07:00
Mark Otto 4b350f8b79 delete comments 2013-08-15 11:56:07 -07:00
Mark Otto 2690a3dc31 Add to #9578 and fix #9614: use cursor not-allowed on radios and checkboxes 2013-08-15 11:52:22 -07:00
Mark Otto 5a0ba42a7b fix up inverse navbar form styles 2013-08-15 11:47:56 -07:00
Mark Otto 49e95f2bcf add clearfix mention to another grid example and clear up examples 2013-08-15 11:47:45 -07:00
Mark Otto 3a7ddae39e fixes #9600 2013-08-15 11:37:35 -07:00
Mark Otto 06e6da0918 fixes #9596: proper dropup caret colors 2013-08-15 11:36:08 -07:00
Mark Otto 209d3af301 Fixes #9617: consistent variation order, add .label-primary 2013-08-15 11:31:26 -07:00
Mark Otto a5cb6c7a15 fixes #9613: update docs css to prevent misaligned buttons example 2013-08-15 11:13:57 -07:00
Mark Otto da6a7827d2 fixes #9616 2013-08-15 11:09:13 -07:00
Mark Otto 4002ac7e65 update to include nav link and mo betta docs on that last commit 2013-08-15 10:54:32 -07:00
Mark Otto e550e113a0 fixes #9586: add documentaton on how to disable the responsiveness of BS3 2013-08-15 10:50:58 -07:00
Mark Otto f681c9712d Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-15 10:30:47 -07:00
Mark Otto 51f2c907e7 fixes #9607: restore bottom border on hover of nav tabs for proper display 2013-08-15 10:30:37 -07:00
Mark Otto 18be4e880c Merge pull request #9591 from BBosman/9523
Doc fixes related to #9523
2013-08-15 10:01:14 -07:00
Mark Otto b9052a74bb Merge pull request #9598 from coliff/patch-5
Change input type for the email input examples
2013-08-15 09:59:19 -07:00
Christian 6b612ae3fe Update css.html
I know the form code are only examples, but it'd be good to encourage usage of the proper input type for the email inputs by changing the type from "text" to "email".
2013-08-15 21:57:24 +09:00
Bas Bosman 1619122603 Doc fixes related to #9523 2013-08-15 11:40:39 +02:00
Mark Otto fee3f1e733 fixes #9582: restore img-responsive as a class and move it's mixin to mixins.less 2013-08-15 00:46:18 -07:00
Mark Otto 1b6a5bbca2 fixes #9507: remove padding on navbar-collapse as any padding on an animated object screws it up; instead use some padding on the navbar nav 2013-08-15 00:08:21 -07:00
Mark Otto 7f4e05fcce Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-14 23:53:21 -07:00
Mark Otto f058a6a3ea fixes #9522 2013-08-14 23:52:57 -07:00
Chris Rebert c84d34b5f1 fix inaccurate comment in media query docs 2013-08-14 23:31:21 -07:00
Mark Otto 6e26f846cd fix #9454: add grid docs about responsive column clearing 2013-08-14 23:11:38 -07:00
Mark Otto 622fe05ff4 fixes #9445: make img responsive mixin use display block, but provide option to pass custom value to it 2013-08-14 23:06:37 -07:00
Mark Otto 0456e5e4b3 fixes #9508: use navbar align mixin for buttons to get correct top/bottom spacing 2013-08-14 23:02:58 -07:00
Mark Otto c5ca743cb7 Merge branch 'navbar-brand-margin' of https://github.com/Luis-TP/bootstrap into Luis-TP-navbar-brand-margin
Conflicts:
	dist/css/bootstrap.min.css
2013-08-14 22:59:02 -07:00
Mark Otto 70b0fb445e fixes #9523: more accurate grid table breakpoint numbers 2013-08-14 22:57:59 -07:00
Mark Otto 083b7c0981 fixes #9563: add callout about browser zooming to browser support section 2013-08-14 22:52:07 -07:00
Mark Otto 039966a0fc add call out to fix #9569 2013-08-14 22:48:04 -07:00
Mark Otto dff88d66e2 reaffix the docs sidenav at all times--screw this height business; fix space between code snippet and example 2013-08-14 22:45:26 -07:00
Mark Otto 9de788134f refactor navbar file to better nest css and restore navbar-color to navbar text (fixes #9500) 2013-08-14 21:32:23 -07:00
Mark Otto 2e8a146b61 remove gradients from dropdown menu items on hover/active (fixes #9473) 2013-08-14 21:24:48 -07:00
Chris Rebert 3a67054536 fix copypasta-o to fully fix #9295 2013-08-14 19:07:14 -07:00
Mark Otto a58bf08360 Merge pull request #9578 from twbs/cursor-not-allowed-disabled-btn-checkbox-radio
fixes #9511; set cursor:not-allowed for disabled buttons,checkboxes,radios
2013-08-14 18:32:15 -07:00
Chris Rebert e684758b55 fixes #9511; set cursor:not-allowed for disabled buttons,checkboxes,radios 2013-08-14 18:20:28 -07:00
Mark Otto a9d6b7ee0b Merge branch '3.0.0-wip' into reset-FF-Android-default-background-image
Conflicts:
	dist/css/bootstrap.min.css
2013-08-14 16:24:39 -07:00
Chris Rebert 4d527ec316 fixes #8702 until Normalize.css starts handling this 2013-08-14 16:08:24 -07:00
Mark Otto 8e8fe8de93 fixes #9509: add margin around buttons so they don't shit the bed when wrapping 2013-08-14 15:39:21 -07:00
Mark Otto db684a1a61 remove unused docs css 2013-08-14 15:37:21 -07:00
Mark Otto 0086761660 Merge branch '3.0.0-wip' of https://github.com/lerks/bootstrap into lerks-3.0.0-wip
Conflicts:
	dist/css/bootstrap.min.css
2013-08-14 15:33:38 -07:00
Mark Otto c8c9274728 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-14 15:33:06 -07:00
Mark Otto 60a281507a Merge pull request #9498 from ggam/panel-variant-fix
Made panel-variant apply styles only to first child
2013-08-14 15:32:21 -07:00
Mark Otto 057a87ed65 Merge pull request #9521 from Luis-TP/fix-javascript-docs
Javascript Docs: Add .navbar-header, and correct .nav-collapse
2013-08-14 15:27:41 -07:00
Mark Otto 5381ed085c really fix the pres in scrollable tables 2013-08-14 15:26:01 -07:00
Mark Otto 4b0590b0e7 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-14 15:20:21 -07:00
Mark Otto 48bcf81646 Merge branch '3.0.0-wip' of https://github.com/jharbert/bootstrap into jharbert-3.0.0-wip
Conflicts:
	dist/css/bootstrap.min.css
2013-08-14 15:19:57 -07:00
Mark Otto 4bf9fc3d02 Merge pull request #9544 from gabrielecirulli/3.0.0-wip
Add information on how to disable zoom on mobile devices to the docs
2013-08-14 15:17:34 -07:00
Mark Otto 2002045b7f fuck aside and main elements, use divs so IE8 doesn't shit the bed 2013-08-14 14:59:08 -07:00
Gabriele Cirulli fb71f40245 tweak note about zoom disabled on mobile 2013-08-14 23:51:26 +02:00
Mark Otto 8d3dbe78c6 fixes overflowing table due to pre 2013-08-14 14:30:00 -07:00
Mark Otto b02e80c6fb fixes #9557: set tooltip demo to use body as container 2013-08-14 14:29:53 -07:00
Gabriele Cirulli a3b279c556 improve the "zoom disabled" documentation 2013-08-14 23:26:34 +02:00
Mark Otto e5e1270e57 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-14 14:24:06 -07:00
Mark Otto 49932d60b4 fixes #9556 2013-08-14 14:24:00 -07:00
Mark Otto f7c8612f39 Merge pull request #9540 from ggam/table-variant
Added table-row-variant mixin
2013-08-14 14:21:51 -07:00
Guillermo González de Agüero 537910d484 Removed commented lines 2013-08-14 23:12:47 +02:00
Chris Rebert a9972c5d20 Add missing close-parens in docs sentence; fixes #9512 2013-08-14 13:45:20 -07:00
Gabriele Cirulli fb6bd757df add information on how to disable mobile zoom to the docs 2013-08-14 22:08:17 +02:00
ggam 72a2efb3db Added table-row-variant mixin 2013-08-14 21:16:45 +02:00
Luis Aleman b0aef6cde0 Removed containers, and moved brand to after the navbar-toggle 2013-08-14 14:30:35 -04:00
Chris Rebert 3890ab3987 Merge pull request #9531 from ggam/docs-indentation
Fixed inconsistencies in JavaScript examples
2013-08-14 11:10:24 -07:00
ggam 2be8a5a245 Removed trailing semicolons from examples 2013-08-14 19:57:54 +02:00
ggam cde39f7b78 Fixed indentation in JavaScript example 2013-08-14 19:53:37 +02:00
Luis Aleman 80ff4bf870 Add .navbar-header, and correct .nav-collapse 2013-08-14 13:31:29 -04:00
Luis Aleman ef60b0e5fb Get rid of navbar-brand margin-right 2013-08-14 13:03:00 -04:00
Mark Otto b9620a1d5e Merge pull request #9489 from BBosman/ol-breadcrumb
OL breadcrumbs
2013-08-14 09:44:18 -07:00
Mark Otto 518c32423e Merge pull request #9493 from brenoc/3.0.0-wip
Reference only not minified files in Bower
2013-08-14 09:40:29 -07:00
Mark Otto 4ff48c9c3c Merge pull request #9496 from BBosman/accordion-border-color
Remove old accordion remnant
2013-08-14 09:39:55 -07:00
Mark Otto 6f7c3e2d5b Merge pull request #9499 from ggam/docs-print
Added hidden-print class to docs sidebar
2013-08-14 09:38:23 -07:00
Mark Otto 99a5f16db6 Merge pull request #9502 from Luis-TP/navbar-padding
Remove .navbar-collapse padding when not in mobile context
2013-08-14 09:37:50 -07:00
Luis Aleman 1b3896fabf Remove .navbar-collapse padding when not in mobile context 2013-08-14 11:39:38 -04:00
ggam 72785644bd Added hidden-print class to docs sidebar 2013-08-14 17:09:13 +02:00
ggam 80d1b6b117 Made panel-variant apply styles only to first child 2013-08-14 16:40:26 +02:00
Bas Bosman 09464b5d41 Remove old accordion remnant 2013-08-14 16:33:35 +02:00
Breno Calazans 48c1add83b Reference only not minified files in Bower
Fixes #8985
2013-08-14 11:10:48 -03:00
Bas Bosman c4568e4c3b Ordered breadcrumbs 2013-08-14 15:16:30 +02:00
Luca Wehrstedt 1e1b5c737b fixes #9406: proper border for justified btn-groups inside tables 2013-08-14 12:37:48 +02:00
Chris Rebert 1fd51b0fa3 Merge pull request #9463 from PMPP/css-ex-fix
CSS Grid old classes in use
2013-08-14 02:14:59 -07:00
Pedro Pereira 1800edc07c CSS Grid old classes in use 2013-08-14 17:02:57 +08:00
Chris Rebert aa2c152d85 rm action attr from highlighted example code too
fixup to e61c71e077
2013-08-14 00:09:42 -07:00
Chris Rebert 13d2616631 tweak punctuation in sentence of docs 2013-08-13 21:32:49 -07:00
Mark Otto 9d82a8ba1f Merge pull request #9451 from Luis-TP/3.0.0-wip
Fix .navbar-right > .dropdown-menu alignment
2013-08-13 20:47:58 -07:00
Luis Aleman c79fa6ad04 Apply mixin to correct class 2013-08-13 22:53:23 -04:00
Jason Harbert 09e1f69d3e fixes issue after navbar is collapsed, dropdown-menus on uncollapsed menu are no longer visible 2013-08-13 19:40:12 -07:00
Luis Aleman e29c2d0c24 Fix .navbar-right > .dropdown-menu alignment 2013-08-13 22:30:02 -04:00
Chris Rebert 66122fa153 Merge pull request #9443 from mattleff/patch-1
Tiny typo in class prefix
2013-08-13 17:04:34 -07:00
Matthew Leffler a380e80cd7 Typo 2013-08-13 17:56:12 -06:00
Mark Otto d1e18e55ac remove accordion from customizer; shorten min height for affix 2013-08-13 16:00:05 -07:00
Mark Otto 5b4fe08f42 fixes #9439: use overflow: auto on navbar collapse 2013-08-13 15:22:05 -07:00
Mark Otto fa330f308a Overhaul navbar alignment (.pull-) utilities (fixes #9440)
Now navbars have their own float utility classes, mixin-ed versions of
`.pull-left` and `.pull-right`.

* Removed chained `.navbar-nav.pull-right`
* Added `.navbar-left` and `.navbar-right` as mixins of the default
float utilities, but only above the `@grid-float-breakpoint` to match
the new navbar behavior
* Updated components docs to match the new changeas
* Added callout about component alignment here to explain the new
classes
2013-08-13 15:19:59 -07:00
Mark Otto 8d2948c0d6 grunt dist on prev forms change 2013-08-13 14:56:58 -07:00
Mark Otto 3da3f7e474 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-13 14:56:33 -07:00
Mark Otto bb059f28de only affix the sidenav in the docs if the viewport is >800px tall (fixes #8704 and avoids #8721) 2013-08-13 14:56:22 -07:00
Mark Otto 2bc67b334d nuke the box-shadow on uncollapsed navbar-collapse 2013-08-13 14:46:34 -07:00
Mark Otto 78da4975e6 Merge pull request #9437 from ggam/patch-1
Swapped input-lg and input-sm
2013-08-13 14:32:36 -07:00
Guillermo González de Agüero f0ee3aaac0 Swapped input-lg and input-sm
Fixing my own error. Thanks to @kyleledbetter for reporting.
2013-08-13 23:31:33 +02:00
Mark Otto a2475f0145 better rc2 download action 2013-08-13 14:23:17 -07:00
Mark Otto e61c71e077 fix up broken tests by removing empty attr 2013-08-13 14:23:10 -07:00
Mark Otto 51f692f686 fix navbar border in docs 2013-08-13 14:12:11 -07:00
Mark Otto 9482a5f812 Merge pull request #9403 from twbs/bs3_navbar_overhaul
BS3: Navbar overhaul
2013-08-13 13:53:27 -07:00
Mark Otto bd93ed2cb6 Merge branch '3.0.0-wip' into bs3_navbar_overhaul
Conflicts:
	dist/css/bootstrap.min.css
2013-08-13 13:48:33 -07:00
Mark Otto 3c772b1ceb lighter default navbar, add borders to navbars, tweak padding and alignments 2013-08-13 13:39:21 -07:00
Mark Otto a8769b8cab Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-13 13:17:01 -07:00
Mark Otto 270af4dda3 fixes #9431: specify font-size in dropdown menus to avoid inheritance issues 2013-08-13 13:16:56 -07:00
Mark Otto e7d6bd94b7 Merge pull request #9427 from saiwang/fix-example-snippet
fix mixin code example
2013-08-13 13:13:57 -07:00
saiwang 84b1ef5048 fix mixin code example 2013-08-14 02:23:44 +08:00
Mark Otto 9a3aa9f1de Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-13 11:15:46 -07:00
Mark Otto d482b712e7 fixes #9425: focused input in docs gets actual focus styles 2013-08-13 11:15:36 -07:00
Mark Otto 729854fa5f Merge pull request #9404 from twbs/bs3_drop_accordion_for_panel
BS3: Drop the accordion for the panel (fixes #8648)
2013-08-13 10:44:43 -07:00
Mark Otto 33a88c9a94 Merge branch '3.0.0-wip' into bs3_drop_accordion_for_panel
Conflicts:
	dist/css/bootstrap.min.css
2013-08-13 10:36:38 -07:00
Mark Otto 3e373a844c Merge pull request #9410 from ggam/pagination-size
Added pagination-size mixin
2013-08-13 10:35:24 -07:00
Mark Otto ce77f10ce5 Merge pull request #9421 from ggam/input-size
Added input-size mixin
2013-08-13 10:35:04 -07:00
Mark Otto d4b14cbf44 Merge pull request #9424 from twbs/bs3_btn_groups
BS3: `.btn-group`s for your `.btn-group`s
2013-08-13 10:31:29 -07:00
Mark Otto 69a3e9b4d0 enable button groups in vertical button groups 2013-08-13 10:24:18 -07:00
ggam 6ec0fd7d43 Added input-size mixin 2013-08-13 19:06:02 +02:00
Mark Otto f15f259876 derp 2013-08-13 09:59:38 -07:00
Mark Otto 99312d2d83 Merge pull request #9418 from BBosman/fix-9415
Fixes #9415
2013-08-13 09:57:18 -07:00
Chris Rebert e5263fb6ad Merge pull request #9420 from saiwang/patch-highlight-hint
patch highlighting hint
2013-08-13 09:42:35 -07:00
saiwang 21a7de7a18 patch highlighting hint 2013-08-14 00:21:07 +08:00
Bas Bosman 052edcd8de Fixes #9415 2013-08-13 18:10:57 +02:00
Guillermo González de Agüero e74ac0723b Fixed errors 2013-08-13 14:25:05 +02:00
ggam ea04fa538e Added pagination-size mixin 2013-08-13 13:27:45 +02:00
Mark Otto 36c4223b1d fixes #8985: only specify minified dist files for bower 2013-08-13 00:04:58 -07:00
Mark Otto b0ab806dcc fix negative indenting in button group for nested button groups 2013-08-12 23:44:50 -07:00
Mark Otto 09b2a153fc copy 2013-08-12 23:38:52 -07:00
Mark Otto 237640c706 Drop the accordion for the panel
* Deletes the accordion.less file
* Extends the panel to be collapsible with our JS plugin
* Supports panel color variations
2013-08-12 23:36:25 -07:00
Mark Otto 54a3e4b780 mention fubared state of overflow hidden on body in android and iOS to fix #8975 and #9315 2013-08-12 22:47:19 -07:00
Mark Otto f25a4805ed Merge pull request #9389 from twbs/emphasize-git-HEAD
Emphasize git HEAD downloads
2013-08-12 22:29:25 -07:00
Mark Otto 48e7468e3a invert dropdown styles in navbar for inverse variation 2013-08-12 21:43:59 -07:00
Mark Otto 80eb09cc1b Merge branch '3.0.0-wip' into bs3_navbar_overhaul
Conflicts:
	components.html
	dist/css/bootstrap.min.css
2013-08-12 21:34:55 -07:00
Mark Otto 8aecfb4e3f Merge pull request #9396 from twbs/docs-html-validation
add HTML5 validation of docs pages to the build
2013-08-12 21:30:57 -07:00
Mark Otto 49576704ea finish fixing #9295: add button group buttons to new input group sizing 2013-08-12 21:27:15 -07:00
Mark Otto 40723c8716 fixes #9400: add box-sizing to pseudo elements as well 2013-08-12 21:26:43 -07:00
Mark Otto 0b338b0dc7 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-12 21:23:53 -07:00
Mark Otto 8bb7def26c Navbar refactor
* Now responsive by default (fits better with mobile-first approach)
* Requires `.nav-header` to group `.navbar-brand` and `.navbar-toggle`
for proper mobile display.
* Changed `.nav-collapse` to `.navbar-collapse`
* Simplified examples in docs
2013-08-12 21:23:28 -07:00
Chris Rebert f111c3e763 Components docs: Dropdowns section: add .sr-only toggle buttons so aria-labelledby validates 2013-08-12 19:47:18 -07:00
Chris Rebert df7c9a6d96 add alt text to <img>s in javascript.html 2013-08-12 19:47:05 -07:00
Chris Rebert f2cea2dc47 add alt text to <img>s in components.html 2013-08-12 19:46:34 -07:00
Chris Rebert b33989a977 add src attribute to holder.js-powered <img>s so that they validate
use `data:` URL of empty invalid PNG: src="data:image/png;base64,"
2013-08-12 18:59:59 -07:00
Chris Rebert 3ec7930720 add ARIA roles to Dropdown examples in Components docs 2013-08-12 18:09:25 -07:00
Chris Rebert bb5be0a2f9 add HTML5 validation of docs pages to the build 2013-08-12 17:49:01 -07:00
Chris Rebert 715e924217 Merge pull request #9399 from twbs/make-docs-html-more-valid
Make docs HTML more valid
2013-08-12 17:48:11 -07:00
Mark Otto f4bb660974 drop iframe attributes for CSS styling 2013-08-12 17:46:02 -07:00
Chris Rebert 8a1fc99f50 give navbar forms non-empty actions 2013-08-12 17:43:38 -07:00
Chris Rebert a13fe0a4a0 use unique IDs in Forms examples in docs 2013-08-12 17:43:38 -07:00
Chris Rebert 10356f9d67 rm unnecessary blank id attribute 2013-08-12 17:43:38 -07:00
Chris Rebert 81ab8ffae0 Headings docs: use put <hN>s within <td>s instead of <th>s 2013-08-12 17:43:38 -07:00
Chris Rebert 520bc8cf37 add alt text to <img>s in Images section of CSS docs 2013-08-12 17:28:53 -07:00
Chris Rebert 598f811fa0 add alt text to media object <img>s 2013-08-12 17:28:53 -07:00
Chris Rebert 5b9717ef67 add alt text to thumbnail <img>s 2013-08-12 17:28:53 -07:00
Chris Rebert df59ecc9c4 add alt text to carousel <img>s 2013-08-12 17:28:53 -07:00
Chris Rebert 4876a3a716 Validation states docs: fix closing tag 2013-08-12 17:06:02 -07:00
Chris Rebert 9391f4de4b Merge pull request #9398 from twbs/minor-docs-fix
fix ID of <select> in fieldset[disabled] example
2013-08-12 16:55:47 -07:00
Chris Rebert 1c64c8f43b fix ID of <select> in fieldset[disabled] example 2013-08-12 16:54:58 -07:00
Mark Otto eac61de138 fix navbar form alignment of inputs by restoring inline-block 2013-08-12 16:09:21 -07:00
Mark Otto c558c035d7 fixes #9258: no more float bug with full-width grid columns by removing float on all .col-*-12 classes 2013-08-12 16:02:27 -07:00
Mark Otto fb8ae7e514 drop the class on the button group toggles CSS (alt fix to #9297) 2013-08-12 15:46:11 -07:00
Mark Otto 55c36f86d0 safari not webkit 2013-08-12 15:44:01 -07:00
Chris Rebert 3d6efcf250 fix typo; fix caps 2013-08-12 15:25:41 -07:00
Mark Otto 3f2408f9e8 mention #9282 in docs browser section 2013-08-12 15:13:38 -07:00
Mark Otto 89346410c7 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-12 15:02:21 -07:00
Mark Otto 394f698056 undo the grid max-width boundary because it makes offsets kinda borked (you'd have to set twice, for medium and large, in most cases--and that sucks) 2013-08-12 15:02:09 -07:00
Mark Otto 888e14d64e Merge pull request #9395 from twbs/valid-github-btn-html
social-buttons.html: drop 'px' from height+width attrs per HTML5
2013-08-12 14:53:53 -07:00
Mark Otto 8a669bea2e Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-12 14:52:54 -07:00
Mark Otto eb1565681f fixes #9392: no need for width auto on inline/navbar form controls given inline-block on parent form group 2013-08-12 14:52:49 -07:00
Chris Rebert e6e60d325c social-buttons.html: drop 'px' from height+width attrs per HTML5 2013-08-12 14:48:46 -07:00
Chris Rebert 7c7c447d85 Merge pull request #9394 from twbs/valid-github-btn-html
_includes/social-buttons.html: escape ampersands in URLs so HTML validates
2013-08-12 14:40:07 -07:00
Chris Rebert 7f8f1ca65e _includes/social-buttons.html: escape ampersands in URLs to fix HTML validation error 2013-08-12 14:30:28 -07:00
Chris Rebert e245bffe8c fix spelling 2013-08-12 14:25:15 -07:00
Mark Otto c02269a9f0 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-12 14:05:42 -07:00
Mark Otto a78c8d9c04 Newfangled input and button group sizing (fixes #9295)
Instead of applying `.btn-` or `.input-` to individual elements in
button and input groups, we now have new sizing classes to keep your
markup a little leaner.

* Add `.input-group-sm` or `.input-group-lg` to your `.input-group` to
replicate `.input-sm` and `.input-lg`, respectively.
* Add `.btn-group-xs`, `.btn-group-sm`, or `.btn-group-lg` to your
`.btn-group` to replicate `.btn-xs`, `.btn-sm`, and `. btn-lg`,
respectively.

Both sets of new sizing classes simply use the existing individual
sizing classes as mixins, so customization of them is automatically
inherited when compiling.
2013-08-12 14:03:57 -07:00
Chris Rebert 38d6e7179a don't show download_dist in favor of site.download; addresses #9138 & its many dupes 2013-08-12 13:35:53 -07:00
Chris Rebert af2ea581b2 update CDN links to point to continuously-updated build; addresses #9138 & its many dupes 2013-08-12 12:13:15 -07:00
Chris Rebert 461b05f5b1 update download_dist for RC 2 2013-08-12 12:09:52 -07:00
Mark Otto c3c0218379 Merge pull request #9388 from johvik/patch-1
Javascript > Alert should use danger not error
2013-08-12 12:04:39 -07:00
Mark Otto abedd38c5b update grid xs mixin and update docs to match new mixins 2013-08-12 11:52:51 -07:00
johvik 7eb0793223 Javascript > Alert should use danger not error 2013-08-12 20:52:25 +02:00
Mark Otto a09531a40e update to rename rc2 2013-08-12 11:48:35 -07:00
Mark Otto 1462fe2c81 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-12 11:34:44 -07:00
Mark Otto 9564c356d3 inherit font-size in code when inside pre 2013-08-12 11:34:28 -07:00
Chris Rebert f5b1499776 copyedit media queries docs added in aefed0ada9 2013-08-12 11:31:45 -07:00
Mark Otto a74d6cfe73 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-12 11:09:07 -07:00
Mark Otto f662dff6e9 fixes #9382: inline forms now require use of .form-group for proper alignment of all form controls 2013-08-12 11:07:23 -07:00
Mark Otto ddd13dc100 Merge pull request #9373 from ggam/button-sizes
Added button-size mixin
2013-08-12 10:40:56 -07:00
Mark Otto 3d11e6dedf Merge pull request #9371 from ggam/buttons-consistency
Renamed btn-pseudo-states mixin to btn-variant for consistency
2013-08-12 10:06:34 -07:00
Mark Otto a9a27d3794 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-12 10:01:22 -07:00
Mark Otto 55cfa8d38f Drop background-clip and background-size mixins since they have no prefixes anyway 2013-08-12 10:01:13 -07:00
Mark Otto 1f745176d4 Merge pull request #9384 from BBosman/aria-hidden
Add missing aria-hidden attribs to close buttons
2013-08-12 09:55:46 -07:00
Mark Otto 657c19f943 Merge pull request #9383 from BBosman/aria-search
Aria role search instead of form
2013-08-12 09:55:24 -07:00
Mark Otto 0c879d3ece Merge pull request #9381 from ggam/dropdown-events
Added Dropdown JS plugin events to docs
2013-08-12 09:53:24 -07:00
Mark Otto 3ce2b645c7 Merge pull request #9374 from ggam/carousel-glyphicons
Removed remaining Glyphicons mentions in carousel.less
2013-08-12 09:52:38 -07:00
Bas Bosman 8dd45053ce Add missing aria-hidden attribs to close buttons 2013-08-12 17:56:10 +02:00
Bas Bosman 38b2083f3c Aria role search instead of form 2013-08-12 17:38:20 +02:00
ggam 587a001dcc Added Dropdown JS plugin events (fixed #9375) 2013-08-12 17:05:15 +02:00
ggam d80d9251ef Removed remaining Glyphicons mentions in carousel.less 2013-08-12 14:20:17 +02:00
ggam 6993db1840 Added button-size mixin 2013-08-12 14:07:19 +02:00
ggam 83293516b6 Renamed btn-pseudo-states mixin to btn-variant for consistency 2013-08-12 13:55:09 +02:00
Mark Otto 175a112548 fix #9239 by restoring old ie8 responsive img foo 2013-08-12 01:56:38 -07:00
Mark Otto 5e73cc90d9 fixes #9266 manually on account of list group file reorganization 2013-08-12 01:39:43 -07:00
Mark Otto acdbe73851 fixes #8835: make it so active list group items aren't dependent on an <a> tag 2013-08-12 01:38:06 -07:00
Mark Otto 6dbf588237 fixes #9310: alerts aren't dismissable by default, now requires .alert-dismissable if you need a close button 2013-08-12 01:20:22 -07:00
Mark Otto aefed0ada9 fixes #9317: document media queries 2013-08-12 00:48:36 -07:00
Mark Otto 86fd07f93c update docs affix for large desktop given latest grid changes 2013-08-12 00:40:36 -07:00
Mark Otto efe62a7ef4 rename and refactor a smidge to add medium grid mixins 2013-08-12 00:36:22 -07:00
Mark Otto f50aea30c4 Merge branch 'patch-12' of https://github.com/ggam/bootstrap into ggam-patch-12 2013-08-12 00:31:28 -07:00
Mark Otto a2b9988eb9 Media query (grid and responsive utilities) overhaul
Grid classes have been changed to account for a fourth set of classes,
meaning we now have XS, S, M, and L options. Specifically, we made the
following changes:

* Renames `.col-` to `.col-xs-`
* Adds `.col-md-` for devices 992px wide and up
* Remaps `.col-lg-` for devices 1200px wide and up

Alongside that, we've updated our media queries to better handle
advanced grid layouts:

* All column classes now kick in when they hit a `min-width`, undoing
the #9128 fix in
https://github.com/twbs/bootstrap/commit/db45a60cc86190a060f0baf0b3961cb
c690f3a65
* All column offsets, pushes, and pulls are scoped to an appropriate
range, meaning a `min-width` and `max-width` (thanks for the idea,
@eratzlaff)

We've also modified the widths of our grid containers for the small
device grid (now a max 720px instead of 728px) and large device grid
(now a max 1140px instead of 1170px) to avoid horizontal scrollbar
problems in Firefox (likely due to box-sizing, which is why we didn't
see it in 2.x).

Similarly, we've updated the responsive ultility classes to match the
new four media query approach of the grid system. That means we've:

* Added new `.visible-xs` and `.hidden-xs` classes
* Reassigns visible and hidden classes for small, medium, and large to
matching grid system media queries
* Updates docs examples to match grid system and account for fourth
utility range

-----

Fixes the following:

* #9135: fourth grid tier
* #9302: undoes previous range change for small grid system, so no need
to update any docs here
* #8755: consistent grid and responsive utilities schemas)
* #9195, #9216, and #9227: no more horizontal scrollbars
2013-08-12 00:28:50 -07:00
Mark Otto 95affa32e6 simplify padding in list groups and margins on badges within 2013-08-11 21:17:49 -07:00
Mark Otto a0f301995c Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-11 20:46:22 -07:00
Mark Otto ac74655998 add another var 2013-08-11 20:45:51 -07:00
Mark Otto c52a3508c6 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Conflicts:
	dist/css/bootstrap.min.css
2013-08-11 20:45:42 -07:00
Mark Otto 9e316beba1 Merge pull request #9355 from kevinSuttle/aside
Map 'role="complementary"' to proper HTML5 aside element
2013-08-11 20:43:18 -07:00
Kevin Suttle 9d5473255b Map 'role="complementary"' to proper aside element
http://blog.paciellogroup.com/2013/02/using-wai-aria-landmarks-2013/#tablex

http://www.w3.org/TR/wai-aria/roles#complementary
2013-08-11 23:40:22 -04:00
Mark Otto 2a8e5765b9 Merge pull request #9353 from kevinSuttle/contentinfo
Map "contentinfo" role to HTML5 footer element
2013-08-11 20:34:58 -07:00
Mark Otto 2ae8be3b31 Customizer field updates for variables 2013-08-11 20:33:58 -07:00
Mark Otto 0819cfc450 addressing #9189 manually, part 7: thumbnails vars 2013-08-11 19:32:16 -07:00
Kevin Suttle 1355c58cf2 Map "contentinfo" role to HTML5 footer element
http://blog.paciellogroup.com/2013/02/using-wai-aria-landmarks-2013/#tablex

http://www.w3.org/TR/wai-aria/roles#contentinfo
2013-08-11 22:26:40 -04:00
Mark Otto bf4900072d Drop the font-weight on panel labels since heading elements already get it 2013-08-11 19:20:23 -07:00
Mark Otto fca5c812c5 Restore prior docs spacing 2013-08-11 19:19:56 -07:00
Mark Otto 85ec6e741d Follow up commit: fix collapse clearing and navbar brand/nav spacing 2013-08-11 19:19:44 -07:00
Mark Otto f47a1905e2 Merge pull request #9352 from kevinSuttle/aria-forms
Give forms and search fields proper ARIA roles
2013-08-11 19:18:36 -07:00
Mark Otto ba8026e00f Refactor navbars to simplify things
* `.navbar-brand` is no longer centered, thus removing need for
max-width and a few lines of code
* Clear floats of `.navbar-brand` in the `.nav-collapse` like we did in
2.x, thus simplifying some clearing and other things.
* Restyle the `.navbar-toggle` button to align it's bars up with the
text and flow of the document.
* Restyle the `.navbar-brand` to not use padding on left/right as to
avoid negative margin and other fuckery. This limits the ability to put
a bg color on the brand, but I think that's fine for now.
2013-08-11 19:06:26 -07:00
Kevin Suttle a86f5d24f8 Give forms and search fields proper ARIA roles
http://blog.paciellogroup.com/2013/02/using-wai-aria-landmarks-2013/#tablex

http://www.w3.org/TR/wai-aria/roles#form

http://www.w3.org/TR/wai-aria/roles#search
2013-08-11 21:45:50 -04:00
fat 63425cd804 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-11 18:42:34 -07:00
fat 8bdffecf8f rebuild + first bit of customizer urls 2013-08-11 18:42:13 -07:00
Mark Otto c2cfd3153b addressing #9189 manually, part 6: add a navbar margin var, but avoid the navbar-nav var because that should really be customizable 2013-08-11 18:32:52 -07:00
Mark Otto e9650f51bf addressing #9189 manually, part 5: don't bother with a .label font-weight var and let's just use bold because windows hates 500 2013-08-11 18:10:42 -07:00
Mark Otto a66cdb0c30 addressing #9189 manually, part 4: input group background var 2013-08-11 18:09:56 -07:00
Mark Otto 83f1a75e7a addressing #9189 manually, part 3: forms 2013-08-11 18:06:26 -07:00
Chris Rebert 12b9058df9 Merge pull request #9351 from vsn4ik/quotes_in_nav_main
Move quotes in nav-main.html
2013-08-11 17:59:27 -07:00
Mark Otto 286636755a spacing 2013-08-11 17:47:53 -07:00
Mark Otto 58b90dae15 addressing #9189 manually, part 2: dropdown header and disabled link colors (and refactor commenting styles) 2013-08-11 17:47:30 -07:00
vsn4ik 06da490707 Move quotes in nav-main.html 2013-08-12 04:46:07 +04:00
Mark Otto 8b76e0d0f0 addressing #9189 manually, part 1: code and pre vars 2013-08-11 17:23:19 -07:00
Mark Otto 32f6cbf9d0 Merge pull request #9211 from zacwasielewski/responsive-visibility-utilities-as-less-mixins
Make visibility utility classes responsive when used as LESS mixins
2013-08-11 17:03:24 -07:00
Mark Otto 83c236f570 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-11 16:07:57 -07:00
Mark Otto 1ff1dfb2bd fixes #9348 by ditching a comment 2013-08-11 16:07:45 -07:00
Jacob Thornton 92c2ad98e7 fixes #8983 2013-08-11 15:41:06 -07:00
Jacob Thornton b8ed111a18 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-11 15:17:30 -07:00
Jacob Thornton 89b3cb0dac fixes #9318 2013-08-11 15:17:04 -07:00
Mark Otto 9b07b999d2 Merge pull request #9286 from neilhem/3.0.0-wip
set img-circle class in percents
2013-08-11 15:15:53 -07:00
Jacob Thornton c49ecc5f21 refresh scrollspy after page 'loads' 2013-08-11 15:03:48 -07:00
Mark Otto 39899e46cd Merge pull request #9229 from ggam/patch-13
Removed Glyphicons mention from carousel.less
2013-08-11 15:02:07 -07:00
Mark Otto 0561cfec6b fixes #8900: nuke empty space between panel heading and list group 2013-08-11 15:01:16 -07:00
Jacob Thornton 31ab07b32a Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-11 14:59:57 -07:00
Jacob Thornton bf2ab457ea fix comment in tooltip 2013-08-11 14:59:39 -07:00
Mark Otto a88888aaeb fix broken components page, also likely from @kevinsuttle's #9332 2013-08-11 14:49:50 -07:00
Mark Otto da75d0d30b Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-11 14:44:39 -07:00
Mark Otto 65c0f847e9 fix borked js docs layout, likely from @kevinsuttle's latest PR 2013-08-11 14:44:32 -07:00
Jacob Thornton 5c6b995971 add event prefixes 2013-08-11 14:39:11 -07:00
Jacob Thornton 6393a78bf0 fixes #9279 2013-08-11 14:32:32 -07:00
Mark Otto b4081e6cd4 Merge pull request #9347 from kevinSuttle/header
Ensure proper use and location of role="banner"
2013-08-11 14:09:46 -07:00
Kevin Suttle f38241d77e Ensure proper use and location of role="banner"
http://blog.paciellogroup.com/2013/02/using-wai-aria-landmarks-2013/#tablex

http://www.w3.org/TR/wai-aria/roles#banner
2013-08-11 16:34:48 -04:00
Mark Otto 0b9efa9565 fix indentation 2013-08-11 13:20:24 -07:00
Mark Otto a19ed6dcc1 Merge branch 'aria-nav' of https://github.com/kevinSuttle/bootstrap into kevinSuttle-aria-nav 2013-08-11 13:15:52 -07:00
Mark Otto 6b6241feaa fixes #9241: enable collapsing for labels, in addition to badges, when empty 2013-08-11 12:43:43 -07:00
Kevin Suttle aa454134ec Use nav for proper HTML5 ARIA role mapping
http://www.w3.org/html/wg/drafts/html/master/sections.html#the-nav-element

http://dev.w3.org/html5/spec/sections.html#the-nav-element

http://blog.paciellogroup.com/2013/02/using-wai-aria-landmarks-2013/#tablex
2013-08-10 22:33:53 -04:00
Mark Otto d5290c61d8 fixes #9217 manually--use main element instead of div in home and default layouts 2013-08-10 16:11:34 -07:00
Mark Otto 308d40a729 remove customize layout now that we're bringing it back for rc2 2013-08-10 16:11:10 -07:00
Mark Otto 5eac5dab5d Merge pull request #9245 from jlaswell/patch-1
Update components.html
2013-08-10 15:39:28 -07:00
Mark Otto 1b04535f69 Merge pull request #9230 from ggam/patch-14
Changed "Standard pagination" to "Default pagination"
2013-08-10 15:30:00 -07:00
Jacob Thornton 1abb7947c2 fixes #9222 2013-08-10 14:09:05 -07:00
Jacob Thornton 7998c45570 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-10 13:35:48 -07:00
Jacob Thornton a4f0e8d37a fixes #9111 2013-08-10 13:35:20 -07:00
ggam 6e8ace4b2b Simplified Off Canvas example:
- Removed unneeded media queries to be more consistent with the rest of Bootstrap.
- Fixed unworking grid on latest 3.0 builds (BS version on this repo is outdated)
- Inluded needed bootstrap.js
2013-08-10 13:36:05 +02:00
Chris Rebert da417c3e7e Use protocol-relative URL in example 2013-08-09 18:01:11 -07:00
Chris Rebert d48387aa4d Fixes #9260 2013-08-09 17:55:12 -07:00
Chris Rebert b2b44a53b7 getting-started docs: rephrase to avoid "helpful...help" 2013-08-09 17:48:29 -07:00
Rakhat Jabagin c07717ce47 set img-circle class in percents 2013-08-09 17:57:49 +06:00
Chris Rebert d0ac0f30b4 Merge pull request #9273 from liuyl/navbars
navbar.less
2013-08-09 00:59:43 -07:00
liuyl d557fa2839 navbar.less 2013-08-09 15:44:10 +08:00
Chris Rebert 32369b2f78 Merge pull request #9271 from liuyl/panels
refactor panels.less
2013-08-09 00:28:08 -07:00
liuyl ee62c37f17 panels 2013-08-09 15:24:38 +08:00
Jacob Thornton dbed9da774 fixes #6159 2013-08-09 00:16:47 -07:00
Jacob Thornton e46708f7ce Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-08 23:08:40 -07:00
Jacob Thornton dec00eeeaf add loading class for mdo to style on customizer 2013-08-08 23:07:14 -07:00
Chris Rebert f86f6ee955 fix 'Calcuated' typo & run grunt; thanks @FagnerMartinsBrack
fixes typo introduced in 2b6ec38987
2013-08-08 13:31:22 -07:00
Chris Rebert d3a26a5afe Fix Find/Replace-o; good catch, @FagnerMartinsBrack!
Problem introduced in 6b23a66c29
2013-08-08 12:07:27 -07:00
jlaswell 64888ce0b0 Update components.html
Keeping bs-examples consistent with code provided.
2013-08-08 12:31:48 -04:00
Guillermo González de Agüero 5c98288122 Changed "Standard pagination" to "Default pagination" 2013-08-08 12:26:06 +02:00
Guillermo González de Agüero f69833f9a9 Removed Glyphicons mention from carousel.less 2013-08-08 12:21:27 +02:00
Jacob d22bd3a660 Merge pull request #9089 from jdiamond/3.0.0-wip
accordion's data-parent can't contain dots
2013-08-07 23:37:05 -07:00
Jacob Thornton d320123374 zip js as well … 2013-08-07 23:15:03 -07:00
Jacob Thornton 89b69ed770 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Conflicts:
	_layouts/customize.html
2013-08-07 23:10:11 -07:00
Jacob Thornton b35b65d0b3 first prototype of new customizer 2013-08-07 23:06:29 -07:00
Mark Otto f3104a3e3b Merge pull request #9200 from geedmo/3.0.0-wip
Update to use @list-group-border-radius
2013-08-07 18:11:15 -07:00
Mark Otto 8cc00901a0 Merge pull request #9201 from ggam/patch-11
Added panel-variant mixin
2013-08-07 18:10:52 -07:00
Zac Wasielewski 407c966736 Make visibility utility classes responsive when used as LESS mixins 2013-08-07 16:47:49 -04:00
Chris Rebert c587114f99 Merge pull request #9210 from twbs/browserstack-travis-pr-fix-take-2
apparently PRs against twbs/bootstrap have the same Travis slug
2013-08-07 13:32:45 -07:00
Chris Rebert 887125d9f5 apparently PRs against twbs/bootstrap have the same Travis slug 2013-08-07 13:30:00 -07:00
Guillermo González de Agüero 001e5d3da9 Added missing grid make-column mixins and fixed some inconsistencies
make-column() was still been use to generate "medium size" columns (col-sm), while make-small-column was creating the default columns (col).
I also changed @grid-float-breakpoint to @screen-small, as it was used in make-row() and I think it makes more sense here than the other.
2013-08-07 21:15:01 +02:00
Guillermo González de Agüero f90ac58410 Updated panels.less to use variant-panel mixin 2013-08-07 20:19:12 +02:00
Guillermo González de Agüero a24bc28de8 Added panel-variant mixin 2013-08-07 20:15:12 +02:00
geedmo 2f786aa0c1 Update to use @list-group-border-radius 2013-08-07 14:47:47 -03:00
Mark Otto d490c35af3 Merge pull request #9198 from bwhitty/3.0.0-wip
Fixed #9196 - malformed HTML in doc
2013-08-07 08:34:33 -07:00
Mark Otto 554a476546 Merge pull request #9191 from ggam/patch-10
Fixed link to JavaScript buttons plugin
2013-08-07 08:25:42 -07:00
Braden Whitten a4638259a5 Fixed #9196 - malformed HTML in doc
Stray <h3> was being closed by an </h2>. Updated to valid HTML. Fixes #9196
2013-08-07 09:18:12 -04:00
Guillermo González de Agüero 50d5a6d17a Fixed link to JavaScript buttons plugin 2013-08-07 12:42:46 +02:00
Mark Otto 03258683ed property order 2013-08-07 00:28:44 -07:00
Mark Otto fef413f997 copy changes 2013-08-07 00:28:23 -07:00
adamjacobbecker a8d95d4721 Improve accessibility (Section 508, WCAG)
This PR significantly improves Bootstrap's accessibility for users of assistive technology, such as screen readers. Some of the these changes add additional markup to the source examples, but we believe that the sacrifice in readability is worth achieving more widespread usage of accessibility best-practices.

What was done
- Added lots of [WAI-ARIA attributes](http://www.w3.org/WAI/intro/aria)
- Added `.sr-only` helper class, that is only readable by screen readers (and invisible for all other users). This lets us - make progress bars and paginations accessible to screen reading users.
- Advised users to always use label elements. For inline forms, they can hide them with `.sr-only`
- Added 'Skip navigation' link
- Added "Accessibility" section to getting-started.html.

What *wasn't* done
- Contrast issues (twbs#3572)
- Tooltips (twbs#8469)
- Documentation re: usage of icons, since they now live in a separate repo

Major props to all that contributed: @bensheldon, @jasonlally, @criscristina, and @louh. Feel free to chime in, guys, if I've left anything out.
2013-08-06 21:58:09 -07:00
Mark Otto d1e712d848 fixes #8959: only negative indent rows within .container (prevents horizontal scroll on full-width pages) 2013-08-06 21:11:16 -07:00
Mark Otto 18a4082553 fixes #8935: add gutter width param to grid mixins 2013-08-06 21:00:12 -07:00
Chris Rebert e100817740 Merge pull request #9183 from twbs/fix-other-peoples-travis-builds
disable BrowserStack for folks w/o their own key who are making PRs
2013-08-06 20:19:59 -07:00
Chris Rebert fd3c4cab73 disable BrowserStack for folks w/o their own key who are making PRs 2013-08-06 20:14:36 -07:00
Mark Otto 2af9cf10ce more twerks to the theme 2013-08-06 18:42:10 -07:00
Mark Otto 402dbfb617 Merge branch '3.0.0-wip' into bs3_theme
Conflicts:
	dist/css/bootstrap.min.css
2013-08-06 18:29:54 -07:00
Mark Otto 41bdd1a482 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-06 18:29:24 -07:00
Mark Otto 75b0e92bc4 little better spacing between major sections in le docs for jump to nav 2013-08-06 18:29:18 -07:00
Mark Otto d89b364260 Merge pull request #9120 from FLOKER/patch-2
fix scrollSpy instructions for JS call
2013-08-06 18:09:49 -07:00
Mark Otto 000f89829e Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-06 18:06:36 -07:00
Mark Otto 3f3dfc54e7 update use of mixins and add bg-colors where necessary 2013-08-06 18:05:37 -07:00
Mark Otto 076ec90d0b Merge branch '3.0.0-wip' of https://github.com/archanl/bootstrap into archanl-3.0.0-wip
Conflicts:
	less/mixins.less
2013-08-06 18:05:24 -07:00
Chris Rebert fe5580e4fc Temporarily disable IE BrowserStack testing, to fix the build
Per @mdo's request.
Can re-enable IE after @fat figures out wassup w/ the unittest failures.
2013-08-06 17:56:20 -07:00
Mark Otto acc9f5d88a Merge pull request #9175 from twbs/bs3_third_party_support_docs
BS3: Add third party support docs
2013-08-06 17:51:31 -07:00
Mark Otto dbde90ec0d some copy editing 2013-08-06 17:46:40 -07:00
Mark Otto ab79b4ac2d Merge branch '3.0.0-wip' into bs3_third_party_support_docs 2013-08-06 17:40:33 -07:00
Mark Otto 167753273a Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-06 17:29:52 -07:00
Mark Otto 443ff0cc32 Pull from GitHub downloads for latest v3-wip on homepage
/cc @cv
2013-08-06 17:29:41 -07:00
Mark Otto c3ac95333d Fixes #8749: prevent navbar nav from overlapping navbar toggle 2013-08-06 17:28:02 -07:00
Mark Otto 85f0abf837 Merge pull request #9171 from twbs/bs3_winph8_ie10_bug_town_usa_omgwtfbbq
Fixes #9162: add mention of Windows Phone 8 and IE10 bugs with responsive foo
2013-08-06 16:45:16 -07:00
Mark Otto 223e032150 Fix #9174: pad bottom of navbar collapsed content and clear floated contents 2013-08-06 16:39:18 -07:00
Mark Otto f3bf32ffc5 add third party support section to the docs 2013-08-06 16:30:28 -07:00
Mark Otto 6da346527b grunt dist on previous commit 2013-08-06 16:02:07 -07:00
Mark Otto 726bc02885 For @cvrebert 2013-08-06 15:52:06 -07:00
Mark Otto 7ae7aa6676 Merge pull request #8731 from nrw/patch-1
Format multiple badges in list-group-item
2013-08-06 15:41:50 -07:00
Mark Otto 287fdf8381 fixes #9162: add mention of Windows Phone 8 and IE10 bugs with responsive foo 2013-08-06 15:21:26 -07:00
Mark Otto 06949d6a18 grunt dist on spacing change 2013-08-06 14:57:14 -07:00
Chris Rebert 187e6641a8 Merge pull request #9169 from bwhitty/3.0.0-wip
Fix spacing after '=' in popover.js
2013-08-06 14:25:17 -07:00
Braden Whitten f816a18f79 Fix spacing after '='
Just added a space after a function definition to tidy up the code.
2013-08-06 17:02:57 -04:00
Chris Rebert 521f852744 update phantomjs link 2013-08-06 14:01:10 -07:00
Chris Rebert 8b8bf91825 Merge pull request #9165 from twbs/browserstack
Browserstack testing integration (rebased, squashed, tweaked)
2013-08-06 13:17:20 -07:00
Chris Rebert cdc92e8139 only run browserstack tests in Travis 2013-08-06 12:25:26 -07:00
Rohan Jain 093cda244a Integrate testing with browserstack 2013-08-06 12:24:14 -07:00
Chris Rebert b976956432 Fix #9132, but in the correct branch
People, don't PR against `gh-pages` please!
2013-08-06 12:09:44 -07:00
Mark Otto c731961f9d fixes #9140: use correct var in tables 2013-08-06 11:40:02 -07:00
Mark Otto 2f1fcca6c5 Fixes #9145: Fix tooltip opacity
Update tooltips to not use RGBa colors so IE8 can have tooltips, too
(means we're now using `opacity`).
2013-08-06 11:18:53 -07:00
Mark Otto f266595092 Fixes #9150: Hide popover titles in IE8
Properly hides popover titles in IE8 because apparently it doesn't
accept the `:empty` selector. /cc @fat @cvrebert
2013-08-06 11:18:12 -07:00
Mark Otto 440d8f5318 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-06 09:46:58 -07:00
Chris Rebert 4350c66253 Merge pull request #9157 from alienlebarge/3.0.0-wip
Add links to Recess, Uglify-js & PhantomJS in README
2013-08-06 09:28:04 -07:00
Cédric Aellen 4599eb69a4 Link to phantomjs 2013-08-06 15:06:25 +02:00
Cédric Aellen 3fb41d2400 link to Uglify-js repo 2013-08-06 15:04:52 +02:00
Cédric Aellen 3e3e6f13aa links to Recess repo 2013-08-06 14:57:34 +02:00
Florian Weber e70d146b20 Update javascript.html 2013-08-06 11:44:55 +02:00
Jesse Hu a24319eb44 Added url paths to navbar navbar-static-top and navbar-fixed-top 2013-08-06 03:00:40 -04:00
Jesse Hu da249b55c4 Changed nav-header to dropdown-header in navbar navbar-fixed-top and navbar-static-top as mentioned in Docs 2013-08-06 02:47:58 -04:00
Jesse Hu 6739522d6c Added jquery.js and bootstrap.js tags to navbar and navbar-fixed top 2013-08-06 02:46:08 -04:00
Jesse Hu 97a5c3613c Added glyphicons to index.html 2013-08-06 02:34:36 -04:00
Mark Otto db45a60cc8 Scope tablet classes to tablets range only
Fixes #9128
2013-08-05 20:55:30 -07:00
Chris Rebert 5db9a10138 Merge pull request #9134 from neilhem/3.0.0-wip
remove repeated 'pagination' class in code example
2013-08-05 20:32:07 -07:00
Rakhat Jabagin b29b8acd28 remove repeated 'pagination' class in code example 2013-08-06 09:19:07 +06:00
Mark Otto 1d1e21aff6 Merge pull request #9123 from twbs/bs3_alerts_default_class
Update labels to include a base class (fixes #8752)
2013-08-05 20:01:45 -07:00
Mark Otto 219f0fe7c5 Merge branch '3.0.0-wip' into bs3_alerts_default_class
Conflicts:
	dist/css/bootstrap.min.css
2013-08-05 20:00:23 -07:00
Mark Otto ac3cb6974a Merge pull request #9130 from twbs/straight-up-wrong
Fix pixel values in Responsive Utilities docs to match the actual code
2013-08-05 19:36:19 -07:00
Chris Rebert 668bc5f458 Fix pixel values in Responsive Utilities docs to match the actual code 2013-08-05 17:43:29 -07:00
Mark Otto f3bd6dbf03 fixes #8647: remove focus outline on :focus of buttons in button groups 2013-08-05 16:16:58 -07:00
Mark Otto ab090a29fb Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-05 16:15:43 -07:00
Mark Otto 98df9495cc remove dupe border-box 2013-08-05 16:15:36 -07:00
Mark Otto 2354cd1ae8 Merge pull request #9124 from geedmo/3.0.0-wip
Fix Issue #8175 - .input-group-addon broken in Firefox
2013-08-05 16:14:48 -07:00
Mark Otto 04dc221037 Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip
Conflicts:
	customize.html
	less/alerts.less
	less/badges.less
	less/button-groups.less
	less/buttons.less
	less/carousel.less
2013-08-05 16:03:10 -07:00
geedmo c2737771b4 Fix Issue #8175 - remove lh for input-lg|sm 2013-08-05 19:58:38 -03:00
geedmo 7bc817bcba Fix Issue #8175 2013-08-05 19:43:39 -03:00
Mark Otto 9bbe8a020a Merge pull request #9121 from Flydiverny/alerts
Added padding variable for alerts and changed customize.html
2013-08-05 15:40:22 -07:00
Mark Otto 0faf42b4bc Remove dupe hover background color 2013-08-05 15:35:16 -07:00
Mark Otto c4281f3919 Update labels to include a base class
* Builds on the new button styles by requiring a `.btn-default` for the
regular, gray labels
* Updates components examples to show new stuff
2013-08-05 15:30:28 -07:00
Markus Maga 9123163b8f Comma for clarification 2013-08-06 00:29:19 +02:00
Markus Maga 9108ab9fb8 Added padding variable for alerts and changed customize.html Warning state (which doesn't exist anymore) 2013-08-06 00:06:57 +02:00
Mark Otto 844df9e001 Fixes #8732: unfucks disabled fieldset form example with form groups 2013-08-05 14:45:00 -07:00
Florian Weber f3fd67772e fix scrollSpy instructions for JS call
Don't really know if this is correct, but at least it only worked for me that way...
2013-08-05 23:37:08 +02:00
Mark Otto bfe76273a0 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-05 14:20:46 -07:00
Mark Otto c15f5a89a0 Enable scrollable responsive nav bar
Fixes #9007 in a hopefully decent way
2013-08-05 14:19:32 -07:00
Chris Rebert c321adf289 carousel.less: copyedit explanatory comment 2013-08-05 13:13:54 -07:00
Mark Otto 96136dbb56 Merge branch 'pullright' of https://github.com/liuyl/bootstrap into liuyl-pullright
Conflicts:
	dist/css/bootstrap.min.css
2013-08-05 12:20:52 -07:00
Mark Otto e23906faca Fixes #8150: add .static-form-control for vertical alignment of static form text
- Also fixes the vertical alignment of labels in horizontal layouts on
account of the recent button and input padding changes
- Also changes the vertical alignment of the checkboxes and radios in
horizontal forms
2013-08-05 12:17:09 -07:00
Mark Otto bac9e80a46 Fixes #8872: widen the carousel indicators to prevent wrapping 2013-08-05 11:59:32 -07:00
Mark Otto a82ca0f9e1 Fixes #8795, a reoccurence of #1969 2013-08-05 11:47:12 -07:00
Mark Otto d0d8ab8364 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-05 11:30:59 -07:00
Mark Otto 01c46bfc0f More button updates
- Fixes #9113 (caret colors in dropdown buttons)
- Darken borders around buttons for contrast in button groups
2013-08-05 11:30:50 -07:00
Chris Rebert 7fe1c1d78d Merge pull request #9110 from chrisseaton/help-block-fix
Update css.html
2013-08-05 10:50:23 -07:00
Chris Seaton ea17069f6e Update css.html
.help-block talks about being 'longer', but with .help-inline gone, it's not longer than anything and the comparison is confusing.
2013-08-05 18:48:51 +01:00
Mark Otto 6af693d160 Fixes #8770: mobile-first (stacked by default) horizontal dls 2013-08-05 09:10:52 -07:00
Mark Otto 41eef69e6f Fixes #8786 (part 2): new default button styles
Also relevant: http://www.youtube.com/watch?v=Ldyx3KHOFXw
2013-08-05 09:02:59 -07:00
Mark Otto 2ee9bea890 Fixes #8786 (part 1): darken hover states on buttons 2013-08-05 08:52:22 -07:00
Mark Otto e85b8f315f Fixes #9049: switch order of gradient mixin params to avoid problems for upgraders 2013-08-05 08:45:51 -07:00
Mark Otto 550493a87e Fixes #9073: add note to homepage about download differences 2013-08-05 08:33:15 -07:00
Mark Otto 38a0eb6f77 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-05 08:23:39 -07:00
Mark Otto e92518aec2 more docs changes 2013-08-05 08:17:41 -07:00
Mark Otto 233eef6861 update modals demo code 2013-08-05 08:13:44 -07:00
Mark Otto d6ed590e83 Clean up mixins, fix #9100 (no ms-keyframes)
- Spacing tweaks in the general mixins
- Add comments to transform mixins about IE support
- Remove `-ms-keyframes` because only IE10+ supports it, and without
prefix
2013-08-05 08:11:13 -07:00
Mark Otto 7a98af5ec8 typo 2013-08-05 08:01:33 -07:00
Chris Rebert 2dcc9db6a3 Merge pull request #9097 from trevorah/patch-1
fixed small typo
2013-08-05 03:02:34 -07:00
Andy Trevorah 5e9af6578c fixed small typo
its => belonging to it
it's => it is / it has
2013-08-05 10:50:31 +01:00
Chris Rebert 39e1261de1 Merge pull request #9091 from liuyl/docs
remove image description from docs
2013-08-05 02:41:45 -07:00
liuyl e444baa22f remove image description 2013-08-05 17:01:44 +08:00
Mark Otto d2389ec7c4 fixes #8832 and #8823: remove max-width from .navbar-brand when not mobile 2013-08-05 00:50:40 -07:00
Mark Otto 11e46845b2 fixes #9063: add var for navbar border radius 2013-08-05 00:47:23 -07:00
Mark Otto 52266cfdcd run grunt dist 2013-08-05 00:39:03 -07:00
Mark Otto 42e78c322b update docs nav to use new stuff 2013-08-05 00:38:18 -07:00
Mark Otto 2a2acb6bf2 Merge branch 'patch-1' of https://github.com/jholl/bootstrap into jholl-patch-1 2013-08-05 00:07:19 -07:00
Mark Otto 7f632ef5b4 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-05 00:03:24 -07:00
Jason Diamond fb57eda268 use quotes to allow dots in data-parent 2013-08-04 23:59:57 -07:00
Jason Diamond 700e742a9c failing test for dot in data-parent 2013-08-04 23:59:30 -07:00
Chris Rebert 88652f745f Merge pull request #9087 from eratzlaff/3.0.0-wip
Update documentation on offset for small medium and large devices.
2013-08-04 23:45:03 -07:00
Mark Otto a2823d0f5e Fixes #9061: Panel titles should inherit color when linked 2013-08-04 23:44:02 -07:00
Mark Otto d95ff9da81 fixes #8805: ensure .active buttons in button groups behave like :active buttons 2013-08-04 23:27:15 -07:00
Mark Otto f62ea2afe2 fixes #8793: remove padding-right from inputs with state changes 2013-08-04 23:20:55 -07:00
Elvis Ratzlaff 9c14fe6044 Update documentation on offset for small medium and large devices. "Grid options" 2013-08-05 02:19:14 -04:00
Mark Otto 222ea8cb71 Merge pull request #9081 from vsn4ik/rem_type_attr
Remove type attribute of tag "script".
2013-08-04 23:16:06 -07:00
Mark Otto 73c048578d Enable input focus state customization
- Add new mixin to generate and customize focus state as needed
- Adds variable to set default color
- Include clear disclaimer about customizing this—it's about users', so
don't go making everything bright red and expect them not to be
confused or alarmed.

Relevant issues: #2742, #4185, #7942, #8171, #8610, #9044
2013-08-04 23:05:54 -07:00
Mark Otto 2641fed73f Fixes #8723: allow modals to not need the .fade class /cc @fat 2013-08-04 22:30:09 -07:00
Mark Otto 5e637313b7 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-04 22:25:58 -07:00
Mark Otto 6bebecfb28 Merge pull request #9079 from liuyl/buttongroups
Fix #7108: btn group styling
2013-08-04 22:16:41 -07:00
Mark Otto 300a9e7b5a run grunt dist 2013-08-04 21:09:05 -07:00
vsn4ik efc7514f9f Remove type attribute of tag "script".
In HTML5 in tag script, the type attribute is no longer required. The default value is "text/javascript".
http://www.w3.org/TR/html5/scripting-1.html#attr-script-type
2013-08-05 05:40:25 +04:00
Chris Rebert 180034a4b4 tooltip.js: add missing space 2013-08-04 17:36:08 -07:00
liuyl 584759eac0 btngroups 2013-08-05 08:29:01 +08:00
fat 2b6ec38987 fixes #8880 2013-08-04 17:22:49 -07:00
fat f22a077f6e Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-04 15:45:51 -07:00
fat b1d21731ad remove js anchor interference 2013-08-04 15:45:27 -07:00
Chris Rebert b6390d298a trivial docs grammar improvements 2013-08-04 00:06:56 -07:00
Chris Rebert 509ffe110e Merge pull request #9059 from twbs/nested-btn-groups-docs
adjust description & give source for nested `.btn-group`s example
2013-08-03 23:45:08 -07:00
Chris Rebert 19e8342c7a adjust description & give source for nested .btn-groups example 2013-08-03 23:34:27 -07:00
Chris Rebert a84e07b272 components.html: rm disconnected sentence fragment 2013-08-03 23:23:40 -07:00
Chris Rebert 899c147cd5 streamline $().dropdown('toggle') description 2013-08-03 23:16:09 -07:00
Chris Rebert eed4844fd2 JS docs: capitalize Bootstrap 2013-08-03 23:01:05 -07:00
Mark Otto c45edbe6b5 Merge pull request #9056 from twbs/large-to-lg-etc
Greater standardization of sizing terminology
2013-08-03 22:44:44 -07:00
Chris Rebert cabcd36019 add missing ref to .btn-xs in button sizes docs 2013-08-03 21:59:30 -07:00
Chris Rebert b9c572184f add .btn-xs to .btn-group example 2013-08-03 21:59:01 -07:00
Chris Rebert 7a04e95b71 rm stray space in components.html 2013-08-03 21:58:31 -07:00
Chris Rebert 23ef8c0c20 Greater standardization of sizing terminology
In class names:
* large => lg
* small => sm
* mini => xs ("Extra small")

In screen size categories:
* Tiny => Extra small
2013-08-03 21:39:57 -07:00
Mark Otto 30a01e0a33 Merge pull request #9052 from liuyl/inputgroups
fix #9051
2013-08-03 20:44:41 -07:00
liuyl 4bbbf774a4 add line-height 2013-08-04 09:27:23 +08:00
Mark Otto 4582eb704f Merge pull request #9036 from eratzlaff/3.0.0-wip
Change value with variables for btn-large, btn-small and pagination
2013-08-03 16:50:08 -07:00
Mark Otto 5fb0d69ee2 Merge pull request #9050 from jonschlinkert/3.0.0-wip
organizes the Gruntfile a bit and makes better use of Grunt conventions
2013-08-03 16:25:12 -07:00
Jon Schlinkert 55df26ae20 This pull request organizes the Gruntfile, makes better use of Grunt conventions and placates my OCD.
Changes in the Gruntfile:

* Use two spaces for consistency with the rest of the codebase.
* Tasks are now organize based on task type. since lodash templates are used across tasks/targets, this makes it easier to follow.
* Use `src-dest` files format when only src-dest pairing is necessary. This saves a line over the files-object format, but more importantly it allows use the src or dest in lodash templates (e.g. `<%= concat.bootstrap.src %>`), which isn't possible in the files-object or files-array formats.
* Make the explicit order of the javascript files more obvious in concat task , maybe just a tiny bit more usable and easier to customize - but really just OCD
* Use `<%= pkg.name %>` variable for dest CSS, both for consistency with how javascript targets are defined, and to make it just little easier for devs to customize bootstrap.

ran the build to test, everything seems good.
2013-08-03 19:03:38 -04:00
Mark Otto 98b50abed3 Merge pull request #9045 from naneau/3.0.0-wip
using @line-height-computed in .navbar-nav link
2013-08-03 16:01:52 -07:00
Maurice Fonk bf0f3c7c1c using @line-height-computed in .navbar-nav link
When a user changed the @line-height-base/@line-height-computed var, the
nav-bar items would not scale appropriately.
2013-08-03 15:09:56 -04:00
James Holland 744b79a666 Update .navbar-toggle to match other navbar el
In place of commit #9040, fix #8844
And sizing .navbar-toggle more like .btn elem
+ change `position:absolute` to `position:relative`
+ remove `right: 10px` in favor of `float:right`
+ change to `height: 34px`
+ remove `top:` in favor of `.navbar-vertical-align` basis new height
+ change `padding:` to match `.btn` el
2013-08-03 10:28:17 -04:00
Chris Rebert fce2e89b7d JS docs: put transitionEnd within <code> 2013-08-03 02:24:31 -07:00
Chris Rebert 364fdf7fa1 JavaScript docs: fix caps of "JS" 2013-08-03 02:22:55 -07:00
Chris Rebert 3a96ff9a0a JS docs: fix caps of "CSS" acronym 2013-08-03 02:21:29 -07:00
Elvis Ratzlaff e06b6ba7ba Merge remote-tracking branch 'upstream/3.0.0-wip' into 3.0.0-wip 2013-08-03 04:52:09 -04:00
Chris Rebert 5b66a1608e Merge pull request #9037 from ChrisRiddell/horizontal-form-fix
Fix Horizontal form docs
2013-08-03 01:27:20 -07:00
ChrisRiddell 602e0c0ba0 fix Horizontal form docs 2013-08-03 17:48:15 +09:30
Elvis Ratzlaff 777ae911b6 Change value for padding on pagination to variables 2013-08-03 03:59:37 -04:00
Elvis Ratzlaff 2fd8689b08 Change line-height value with variable for btn-large and btn-small 2013-08-03 03:56:06 -04:00
Mark Otto 4bac2c567a Merge branch 'btngroup' of https://github.com/liuyl/bootstrap into liuyl-btngroup
Conflicts:
	dist/css/bootstrap.min.css
2013-08-02 20:19:20 -07:00
Mark Otto a0c44329e3 Merge pull request #8939 from frabrunelle/3.0.0-wip
add nav to media object and thumbnails
2013-08-02 19:58:17 -07:00
Mark Otto a3be713f8f Merge branch 'navtext' of https://github.com/liuyl/bootstrap into liuyl-navtext
Conflicts:
	dist/css/bootstrap.min.css
2013-08-02 19:30:03 -07:00
Mark Otto e8145ac939 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-02 19:05:49 -07:00
Mark Otto b5dcbf5045 Merge pull request #8934 from twbs/generalize-horiz-form-example
use separate `form-group`s in horiz form example for greater generality
2013-08-02 18:59:06 -07:00
Mark Otto 9435991ff0 move form layouts from input groups back to forms (messed this up in b281ad6409) 2013-08-02 18:48:44 -07:00
Mark Otto 6b850132d0 Remove requirement of .list-group-flush when list groups are in panels
Fixes #8900
2013-08-02 17:57:19 -07:00
Mark Otto 0a7b185224 Merge pull request #36 from ggam/patch-1
Included required JavaScript in navbar-static-top
2013-08-02 17:17:28 -07:00
Chris Rebert 0fefbbe659 fix typo in comment 2013-08-02 16:36:54 -07:00
fat f6cec812a6 fixes #8957 2013-08-02 15:13:12 -07:00
fat e969d2ff18 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-02 15:10:47 -07:00
fat 69f9920132 fixes #8955 2013-08-02 15:10:14 -07:00
Mark Otto 173dac4e54 Tighten up buttons and form controls
* Smaller padding on buttons and large buttons
* Same with inputs and large inputs
* Remove about 10px from height of large inputs/buttons and 4px from
regular ones

Fixes #8707 and #8700.

(Also relevant: #8711)
2013-08-02 15:09:48 -07:00
Mark Otto 7cd54e52f2 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-02 14:08:58 -07:00
Mark Otto d46e645a0f fixes #9015: bold links not semibold in alerts 2013-08-02 14:07:26 -07:00
Mark Otto b86cac65b6 Merge pull request #9018 from adamwoodbeck/3.0.0-wip
Added ".col-sm-*" to the grid example per the description above the
2013-08-02 14:04:16 -07:00
Mark Otto 83eea13e63 Merge branch '3.0.0-wip-fixed-grid-push-pull-offset' of https://github.com/jtickle/fp-bootstrap into jtickle-3.0.0-wip-fixed-grid-push-pull-offset
Conflicts:
	dist/css/bootstrap.min.css
2013-08-02 13:58:06 -07:00
Adam Woodbeck cfacd228eb Added ".col-sm-*" to the grid example per the description above the
example.
2013-08-02 16:30:13 -04:00
Mark Otto e23b7ec20e Merge pull request #9017 from jonschlinkert/3.0.0-wip
updates mixins to consistently use semicolons as argument separator.
2013-08-02 12:48:39 -07:00
Jon Schlinkert c017e19ed2 Resolves https://github.com/twbs/bootstrap/issues/9014. updates mixins to consistently use semicolons as argument separator. Rebuild to confirm, no diff in compiled CSS. 2013-08-02 15:33:03 -04:00
Mark Otto 08ce3ef9e1 run grunt dist for #8967 2013-08-02 10:11:39 -07:00
Mark Otto dfd6c23527 Merge pull request #8967 from bassjobsen/patch-2
Update input-groups.less
2013-08-02 10:11:06 -07:00
Mark Otto e4b113934d Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-02 10:02:46 -07:00
Mark Otto 696e619fd9 Merge pull request #8979 from ggam/patch-6
Add dropdown class
2013-08-02 09:44:32 -07:00
Mark Otto 048e19b892 Fixes #8996: shift placement of justified CSS for nav component 2013-08-02 09:42:50 -07:00
Mark Otto 34e5c7542b whitespace in js file? 2013-08-02 09:33:12 -07:00
Mark Otto d0b94ead9a Fix #9008: consolidate .alert-block styles into .alert 2013-08-02 09:32:58 -07:00
Mark Otto 21be3efad3 Merge pull request #9011 from Rycul/patch-1
Added short instruction for obtaining respond.js in example HTML code (see description).
2013-08-02 09:27:03 -07:00
Mark Otto 6467009572 Merge pull request #8980 from ggam/patch-7
Removed data-toggle class when it wasn't been applied
2013-08-02 09:26:19 -07:00
Bryan Keiren f4b983ed11 Added short instruction for obtaining respond.js
The Getting-Started page only lists the actual instructions for respond.js (its purpose and source) *after* listing a piece of example HTML code for the user to copy and paste. It would probably be more clear if that piece of HTML code actually lists where the user can obtain respond.js. Otherwise the user has to scroll down and read 1 specific line on the rest of the page (under the 'IE 8 and 9' compatibility section), in order to know that respond.js can be obtained from a GitHub page (and that it is in fact NOT part of the downloadable Bootstrap file that's provided earlier on the page, even though the use of response.js in the example HTML code seems to suggest that it *is* part of the Bootstrap download).

It's a minor issue but this fix should make it just a little bit more clear to a user how the example HTML code works (lest they copy/paste it and find out the browser can't find respond.js).
2013-08-02 18:07:31 +02:00
Guillermo González de Agüero ee6db98136 Included required JavaScript in navbar-static-top 2013-08-02 11:53:25 +02:00
Chris Rebert 9546fc9cf0 fix typo in CSS docs; fixes #8992
"from" => "form"
2013-08-01 17:05:23 -07:00
Guillermo González de Agüero 655e84c532 Removed data-toggle class when it wasn't been applied 2013-08-01 20:13:08 +02:00
Guillermo González de Agüero 824d5d5de4 Fix #8944 2013-08-01 20:07:34 +02:00
Chris Rebert cbd0b7a505 Merge pull request #8965 from leonardovcid/patch-1
Correct comment which is showing a wrong mixin call example (mixins.less)
2013-08-01 09:33:09 -07:00
Jeff Tickle 1583dd55e9 Added classes for lg-pull, lg-push, lg-offset, sm-pull, sm-push, sm-offset 2013-08-01 12:16:20 -04:00
Bass Jobsen a5641b0cca Update input-groups.less
align inline radio and checkbox groups with their label for horizontal forms, see http://stackoverflow.com/q/17990310/1596547 (Question 2)
2013-08-01 16:05:07 +02:00
leonardovcid 15b98a0bb1 Correct comment which is showing a wrong mixin call example (mixins.less)
I was copy-pasting the example and it wasn't working. Then I found that the example in the comment was a typo.
Thanks
2013-08-01 14:39:28 +01:00
Jacob Thornton 7a3c61ee33 fixes #8892 2013-07-31 22:57:00 -07:00
Jacob Thornton ccd4c9d7b5 fixes #8864 2013-07-31 22:28:05 -07:00
liuyl 56aedcb713 add table-layout 2013-08-01 11:26:12 +08:00
Francis Brunelle 521ff5c8a7 add nav to media object and thumbnails 2013-07-31 22:37:36 -04:00
Mark Otto e9413315b5 fixes #8937: align the dropdown menus in input groups 2013-07-31 18:06:20 -07:00
Mark Otto 3cdb07fab3 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-07-31 18:02:49 -07:00
Mark Otto 7e19b6b02c add the theme file derp 2013-07-31 18:02:41 -07:00
Mark Otto 3c39bc0d96 start on navbar 2013-07-31 18:02:12 -07:00
Mark Otto 60e1f5e0e8 start with buttons 2013-07-31 17:48:22 -07:00
Mark Otto 4c27f3ce80 Run make on prev work 2013-07-31 17:07:55 -07:00
Mark Otto afef74d03d Updated homepage more 2013-07-31 17:05:06 -07:00
Chris Rebert e660963689 use separate form-groups in horiz form example for greater generality; fixes #8925 2013-07-31 16:47:22 -07:00
Chris Rebert f62fb27b04 Merge pull request #8911 from codejet/patch-1
title attr, not tag, in tooltip/popover docs
2013-07-31 12:18:09 -07:00
Oliver Schmidt f5f171f0ed Update javascript.html 2013-07-31 20:51:37 +02:00
Mark Otto f43fa23ae0 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-07-31 10:27:52 -07:00
Mark Otto 29b36bf962 dat purple homepage--http://www.youtube.com/watch?v=k2C5TjS2sh4 2013-07-31 10:27:43 -07:00
Mark Otto d7d0f226f9 Merge pull request #8915 from diowa/whitespaces-tabs-etc
Removed trailing whitespaces and hard tabs
2013-07-31 10:24:20 -07:00
Mark Otto ba05b7a63c Merge pull request #8908 from bbeng89/3.0.0-wip
Small fix to justified button groups docs
2013-07-31 09:48:33 -07:00
Mark Otto daed9378ca Merge pull request #8899 from englishtown/twbs-pullrequest
Miss one 'div' close tag under components page
2013-07-31 09:44:27 -07:00
Cesidio Di Landa 3696530aaf Removed trailing whitespaces
Changed hard tabs to soft tabs
2013-07-31 18:11:11 +02:00
Oliver Schmidt 034fb3bc87 Update javascript.html 2013-07-31 16:14:27 +02:00
Blake Bengtson 2433faa528 Small fix to justified button groups docs 2013-07-31 08:39:07 -05:00
faceach a538c8dfb3 miss one 'div' close tag under components page 2013-07-31 18:57:39 +08:00
Chris Rebert 55e1fcef60 Merge pull request #8885 from mikefrancis/patch-1
Added attribute whitespace
2013-07-31 01:33:18 -07:00
Mike Francis 873f884327 Added attribute whitespace 2013-07-31 09:26:45 +01:00
Archan Luhar b9f59428f9 Removed background color from #gradient mixins to support transparent gradients 2013-07-30 19:30:24 -07:00
Mark Otto 031ed98c8b Merge pull request #22 from Dev-Ad/patch-1
.navbar-wrapper need higher z-index to be on top of the carousel
2013-07-30 17:43:55 -07:00
Mark Otto 2a4aacc037 Merge pull request #9 from ssorallen/carousel-img-height-js-path
Carousel image height and JS path
2013-07-30 17:43:39 -07:00
Mark Otto 26053b94e5 Merge pull request #7 from sprice/update_scripts
Update scripts
2013-07-30 17:43:18 -07:00
Mark Otto 1edaabb250 Merge pull request #18 from p8952/local-jquery
use the local copy of jquery
2013-07-30 17:42:46 -07:00
Mark Otto aa90811fb0 Merge pull request #13 from hph/master
Fix relative links to examples and links to docs
2013-07-30 17:42:33 -07:00
Mark Otto a9830a0bab Merge pull request #10 from ssorallen/sigin-input-block
Replace 'input-block-level' with 'form-control'
2013-07-30 17:42:10 -07:00
Mark Otto 6c2db4bbbe Merge pull request #16 from ssorallen/starter-template-js
Add jQuery + Bootstrap JS to starter template
2013-07-30 17:41:57 -07:00
Mark Otto 4a060881d7 Merge pull request #11 from ssorallen/jumbotron-js-inputs
Jumbotron JS + "form-control"
2013-07-30 17:41:43 -07:00
Mark Otto 0f23f514ab Merge pull request #24 from ssorallen/sticky-footer-js
Sticky footer example JS and navbar dropdown style
2013-07-30 17:37:21 -07:00
Mark Otto 46a424fc93 edit modal docs code to fix #8769 2013-07-30 15:14:38 -07:00
Mark Otto e6ac348bfc Merge pull request #8726 from andreypopp/3.0.0-wip
Fix out of order variable declaration order
2013-07-30 14:14:51 -07:00
Mark Otto 96eef43dee Merge pull request #8852 from briannelsondesign/label_baselines
Adjusts vertical alignment of labels and badges
2013-07-30 14:07:00 -07:00
fat fc8f4f0465 fixes #8216 2013-07-30 13:41:24 -07:00
fat c54b8adb85 fixes #8814 2013-07-30 13:33:56 -07:00
fat 5ee2a221ca fixes #8816 2013-07-30 13:31:57 -07:00
Chris Rebert da98c5c2c3 trivial spacing fix 2013-07-30 12:35:39 -07:00
Ross Allen ad01dd8ce8 Use correct class for header in jumbotron dropdown nav 2013-07-30 10:33:48 -07:00
Ross Allen 6a8f76f020 Enable dropdown in sticky-footer with Bootstrap JS
The sticky-footer example uses a drop down in its navbar, and dropdowns
require Bootstrap's JS to work.

Use the minified version of Bootstrap since this example is about the
CSS and not about the JS.
2013-07-30 10:10:34 -07:00
Ross Allen 934cf4f683 Use correct dropdown header class in sticky-footer
"nav-header" does not exist in Bootstrap. The class used for headers
in dropdowns is "dropdown-header".
2013-07-30 10:09:30 -07:00
Mark Otto d9266f95c4 Merge pull request #8846 from ggam/patch-5
Fix grid sizes documentation
2013-07-30 09:40:01 -07:00
Brian Nelson dcbf1e51c4 Compiles changes to CSS 2013-07-30 11:35:13 -04:00
Brian Nelson 220fee80bf Improves label and badge alignment so text aligns with baseline 2013-07-30 11:23:25 -04:00
Guillermo González de Agüero 3d54fe180c Fix #8658 2013-07-30 16:34:13 +02:00
Gerhard a9144b50ea .navbar-wrapper need higher z-index to be on top of the carousel 2013-07-30 16:23:34 +02:00
Chris Rebert 5ef1fe160e Merge pull request #8821 from twbs/twbs-license-faq-tweak
tweak part of license FAQ to reflect Twitter->twbs change
2013-07-29 22:11:37 -07:00
Chris Rebert 652f056556 tweak part of license FAQ to reflect Twitter->twbs change 2013-07-29 22:10:53 -07:00
liuyl 7cfcfdfe64 make navbar-text float left 2013-07-30 09:30:21 +08:00
Mark Otto 8b5e41d900 Refactor .input-* sizing a bit by not chaining to .form-control (fixes #8672) 2013-07-29 17:30:36 -07:00
Mark Otto 09edfcf8c2 fixes #8670: move list group bg color to individual items for mo betta rendering 2013-07-29 17:23:08 -07:00
Mark Otto 87c98478d2 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-07-29 17:21:31 -07:00
Mark Otto ddafa9a0bb Attempts to fix #8645: add code comments to grid example to clarify behavior 2013-07-29 17:21:22 -07:00
Chris Rebert 7ae32074a0 Remove hack/workaround for jshint/grunt bug that's now fixed
See https://github.com/gruntjs/grunt-contrib-jshint/issues/86
2013-07-29 17:17:52 -07:00
Mark Otto fa854a58bd Merge pull request #8818 from twbs/firefox-input-btn-docs-note
make it clearer than <input> buttons are slightly broken on Firefox
2013-07-29 17:16:02 -07:00
Mark Otto 5716355cda Restore mini button (fixes #8644) 2013-07-29 17:08:04 -07:00
Mark Otto 2dcfa00e56 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-07-29 17:03:40 -07:00
Mark Otto 09fff764ed fixes #8687: correct docs typo on radio inputs 2013-07-29 17:03:00 -07:00
Chris Rebert dfd10efd80 make it clearer than <input> buttons are slightly broken on Firefox 2013-07-29 16:57:30 -07:00
Andrey Popp e0395b425d reorder nav-justified classes 2013-07-30 03:27:32 +04:00
Mark Otto d9c9afa6d1 add focus to button group active button behavior 2013-07-29 14:53:55 -07:00
Chris Rebert 1e0c0b8f94 Add .fade to div.modal in "Live demo" modal example code; fixes #8723 2013-07-29 13:26:00 -07:00
Peter Wilmott c2b7e2ca27 use the local copy of jquery 2013-07-29 21:23:19 +01:00
Mark Otto d08d9a63c3 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-07-29 12:29:22 -07:00
Mark Otto 7b42b8b0fe fixes #8797: only expand submenu docs links at >768px 2013-07-29 12:28:54 -07:00
Mark Otto a954f04a02 Merge pull request #8800 from brenocalazans/3.0.0-wip
Update bower.json
2013-07-29 12:25:57 -07:00
Breno Calazans 47a56f5451 Update bower.json 2013-07-29 16:11:28 -03:00
Chris Rebert db051288c5 Merge pull request #8791 from acmetech/3.0.0-wip
Update the code example for <select> multiple
2013-07-29 11:34:13 -07:00
Ross Allen 07dd62ed7c Add jQuery + Bootstrap JS to starter template
The starter template uses the Collapse component[1], which requires
Bootstrap's JavaScript.

Fixes #15

[1] http://twitter.github.io/bootstrap/javascript/#collapse
2013-07-29 11:24:40 -07:00
Jacob 9c2ae98a4e Merge pull request #8774 from liuyl/transition
fix transition end
2013-07-29 11:23:29 -07:00
Chris Rebert 33a61baf38 fix the download link to 3.0.0-wip 2013-07-29 11:20:41 -07:00
Tom Pietschker 13406c240a update code example for <select> multiple 2013-07-29 14:15:17 -04:00
Mark Otto 2acb0f40c0 Merge pull request #8718 from ggam/patch-4
Deleted unnecessary ID from modals example
2013-07-29 10:00:35 -07:00
Mark Otto 0bf5443ad7 Merge pull request #8717 from ggam/patch-3
Deleted "show-grid" class from examples
2013-07-29 10:00:10 -07:00
Mark Otto 08cd3072fc Merge pull request #8747 from liuyl/buttons
disable user-select for buttons
2013-07-29 09:58:54 -07:00
Mark Otto 6c44246dc9 fix broken focus state on download button (fixes #8782) 2013-07-29 09:42:50 -07:00
liuyl 270316f140 fix transition end 2013-07-29 20:23:01 +08:00
Chris Rebert b1a1210f07 fix #8694: apply tooltip demo ordering change from #8730 to popovers too 2013-07-29 03:35:45 -07:00
Chris Rebert be0974802d update composer.json to reflect org change 2013-07-29 00:21:18 -07:00
Chris Rebert 3a50ce3596 fix #8745: fix html5shiv & respond.js script links in docs 2013-07-28 23:13:43 -07:00
liuyl e77d134481 buttons 2013-07-29 14:09:41 +08:00
Mark Otto f3cff49d6d Merge pull request #8738 from twbs/clarify-width-vs-height-size-classes
form input docs: clarify height-related vs. width-related classes
2013-07-28 22:29:05 -07:00
Chris Rebert 061535019c avoid ambiguous term "relative sizing"; clarify width vs. height control classes 2013-07-28 22:24:49 -07:00
Jacob Thornton 8eb42d9b20 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-28 22:23:56 -07:00
Jacob Thornton edaeb33816 fixed #8715 2013-07-28 22:23:20 -07:00
Mark Otto eb56f7e4f4 Merge pull request #8737 from twbs/docs-html5-style-select-multiple
CSS docs page: Use simpler HTML5 style for `multiple` <select> attribute
2013-07-28 22:22:10 -07:00
Mark Otto e74a25a3b8 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-07-28 22:21:27 -07:00
Mark Otto 774f173a18 expand grid system options table to include column widths, gutter widths, large desktop media query, and container widths (fixes #8733) 2013-07-28 22:21:16 -07:00
Chris Rebert 70bd9b936f CSS docs page: Use simpler HTML5 style for multiple boolean attribute of <select> 2013-07-28 22:17:08 -07:00
Jacob Thornton a31c5cea42 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-28 22:16:17 -07:00
Jacob Thornton e5a7af36d5 fixes #8703 2013-07-28 22:14:43 -07:00
Chris Rebert c9c2418a47 Merge pull request #8736 from twbs/css-docs-code
CSS docs page: apply <code> in a few places
2013-07-28 22:14:24 -07:00
Chris Rebert 7bcee1acd2 apply <code> in a few places 2013-07-28 22:09:01 -07:00
Chris Rebert 4ebb29e5bd Merge pull request #8735 from twbs/docs-edits
minor CSS docs edits
2013-07-28 22:07:46 -07:00
Chris Rebert d0a2a62cd7 expand out IE for consistency w/ the rest of the page 2013-07-28 22:04:38 -07:00
Chris Rebert e9b1422e86 add commas in a couple places 2013-07-28 22:04:21 -07:00
Mark Otto bcc6fe5b2b Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-07-28 22:00:55 -07:00
Mark Otto b0225c073a add responsive images section to docs (fixes #8734) 2013-07-28 22:00:49 -07:00
Mark Otto af90282858 Merge pull request #8730 from eluttner/3.0.0-wip
Javascript - tooltips directions - easier visualization
2013-07-28 21:50:06 -07:00
Chris Rebert 59ad7a9cf4 docs.css: Remove border-color that's missing a value
/cc @mdo to fix this properly later
/cc @rcotrina94 from e1bb94c383
2013-07-28 20:53:59 -07:00
Nicholas Westlake 8858ef4dae Format multiple badges in list-group-item 2013-07-28 21:25:16 -05:00
eduardo luttner 6652e2684d Javascript - tooltips directions - easier visualization
Changed the order of the visualization. It is not the css order, however it is easier to see the tooltips
2013-07-28 22:46:16 -03:00
Andrey Popp 0d7940d950 get rid of out of order variable declaration 2013-07-29 03:04:12 +04:00
Guillermo González de Agüero 7dba45bae7 Deleted unnecessary ID from modals example 2013-07-28 19:46:15 +02:00
Guillermo González de Agüero c649a04286 Deleted "show-grid" class from examples 2013-07-28 19:40:50 +02:00
Mark Otto e1180daca0 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-07-28 09:42:56 -07:00
Mark Otto 67e89ea2bf Merge pull request #8712 from claydiffrient/3.0.0-wip
Fix wording in 'hidden on...' to be in line with 3.0 wording.
2013-07-28 09:38:12 -07:00
Mark Otto 111dc1492f fixes #8714: correct stacked pills nav 2013-07-28 09:37:10 -07:00
Haukur Páll Hallvarðsson 582787342e Fix relative links to examples and links to docs 2013-07-28 15:37:53 +00:00
Clay Diffrient 98a24cbd25 Fix wording in 'hidden on...' to be in line with 3.0 wording. 2013-07-28 08:57:10 -06:00
syed 1aedb7862c move things around
Moved alerts, badges, button groups, buttons, carousel, close to
variables.less and customize.html
2013-07-28 17:32:08 +05:00
Chris Rebert c947ab1c9a fix #8701: IE 10+ supports <fieldset disabled>
*golf clap*
2013-07-28 03:48:40 -07:00
Chris Rebert 89746174b7 Safari handles <fieldset disabled> just fine; fixes #8698
This makes me wonder whether recent IE might actually support this too.
If not, your move IE Team.
2013-07-28 02:05:38 -07:00
Mark Otto b9ff423443 derp, no s on that url 2013-07-28 00:08:55 -07:00
Mark Otto c6aedfb877 point to different download urls 2013-07-28 00:03:24 -07:00
Mark Otto 4f793752c5 temporarily undo @fat's scrollspy enhancement since it fucks firefox and ie 2013-07-27 23:53:09 -07:00
Mark Otto 939c9590e5 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-07-27 23:45:11 -07:00
Chris Rebert 908f4c342b Merge pull request #8696 from twbs/jshintrc
get jshint close to passing by updating .jshintrc settings
2013-07-27 23:12:00 -07:00
liuyl efac0bf8d6 make pull-right !important 2013-07-28 14:05:47 +08:00
Chris Rebert 9c672c6b20 get jshint close to passing by updating .jshintrc settings
I don't agree with these personally, but they jive with BS/@fat's JS code style.
The remaining jshint complaints are things that really actually should get fixed.
2013-07-27 21:56:44 -07:00
Chris Rebert c25bf6ba46 Merge pull request #8695 from twbs/fix-grunt-jshint
Fix grunt jshint
2013-07-27 21:43:27 -07:00
Chris Rebert 03b2866b9e tweak Gruntfile.js so it passes jshint 2013-07-27 21:39:11 -07:00
Chris Rebert ba62cfeffe workaround possible bug in grunt-contrib-jshint 2013-07-27 21:38:59 -07:00
Chris Rebert 880f43221d tweak Gruntfile.js so it passes jshint 2013-07-27 21:33:41 -07:00
Chris Rebert 8a430b3698 workaround possible bug in grunt-contrib-jshint 2013-07-27 21:33:11 -07:00
Ross Allen d149f651f2 Add Bootstrap JS to make collapsible nav work
This example uses the collapsible nav for smaller screen sizes, and it
requires Bootstrap JS to get that functionality.
2013-07-27 20:40:24 -07:00
Ross Allen cee5f6fbdf Add new 'form-control' class to style header inputs 2013-07-27 20:39:24 -07:00
Ross Allen 1a1bc33406 Replace 'input-block-level' with 'form-control'
'input-block-level' was replaced with 'form-control' in v3. To get
block-level inputs, the 'form-control' class is now needed.
2013-07-27 20:24:28 -07:00
Ross Allen ce1fdc5ded Update carousel example JS path
'bootstrap.min.js' lives in '../bootstrap/js' now. Switch to the
minified version for a smaller download since this example is focused
on CSS changes, not JavaScript ones.
2013-07-27 20:17:53 -07:00
Ross Allen c834b4027c Match .carousel-inner specificity to beat styles
'.carousel ing' was replaced with '.carousel-inner > .item > img' in
3.0 and now loses the specificity war. To make carousel images 500px
tall, match specificity to make carousel.css win.
2013-07-27 20:14:49 -07:00
Mark Otto 7b6f85c179 Remove back to top link from docs 2013-07-27 19:50:33 -07:00
Mark Otto ce57378705 fixes #8665: have modals use auto margin on sides and widen it instead of positioning and negative margin 2013-07-27 19:38:05 -07:00
Mark Otto 5aad25b34b Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-07-27 18:56:52 -07:00
Mark Otto b281ad6409 Input groups overhaul
* Moves input groups CSS into separate file
* Moves input groups docs into the Components page
* Add support for radios and checkboxes in input groups to fix #8679
2013-07-27 18:56:31 -07:00
Chris Rebert 2f39259d9b Merge pull request #8685 from jouve/3.0.0-wip
fix README.md
2013-07-27 18:13:54 -07:00
Cyril Jouve b4f5687c05 fix README.md 2013-07-28 02:52:39 +02:00
Mark Otto e953c23019 fixes #8659: remove lingering .nav-header 2013-07-27 16:51:04 -07:00
Mark Otto 8cb1b766f8 fixes #8642: use .pull-right to keep dropdowns aligned in example 2013-07-27 16:41:02 -07:00
Mark Otto 14f688c7fc fixes #8675: align horizontal form label and input 2013-07-27 16:37:45 -07:00
Mark Otto 51515e6791 Merge pull request #8676 from sprice/update-editorconfig
Remove Makefile section from .editorconfig
2013-07-27 14:56:29 -07:00
Shawn Price d8b477f273 Use local copy of jquery instead of hotlinking 2013-07-27 14:30:38 -07:00
Shawn Price dfa71726a9 Fix path to bootstrap javascript 2013-07-27 14:28:13 -07:00
Shawn Price d14c72f334 Remove Makefile section from .editorconfig 2013-07-27 14:04:46 -07:00
Mark Otto 57bc65f7f8 Merge pull request #8650 from loic/3.0.0-wip
Fixed minor typos in css.html
2013-07-27 11:26:28 -07:00
Mark Otto 1fb1c40aba Merge pull request #8657 from Micronax/3.0.0-wip
Added rel="stylesheet" to CDN-Examples
2013-07-27 11:25:17 -07:00
Mark Otto 1ca5c2bdb9 Merge pull request #8663 from mekishizufu/fix-typo
Fix typo in css.html
2013-07-27 11:24:32 -07:00
Loic Bistuer 273a388995 Fixed minor typos in javascript.html 2013-07-28 00:57:12 +07:00
Jiri Pospisil f670282b40 Fix typo in css.html 2013-07-27 18:40:35 +02:00
Fabian Golle 9eef7e0b1d Update getting-started.html 2013-07-27 17:30:44 +02:00
Loic Bistuer 7f6c089e45 Fixed minor typos in css.html 2013-07-27 19:27:45 +07:00
Mark Otto 9c63ffa00f update links to point to download links 2013-07-27 01:06:59 -07:00
Mark Otto d78c85c82a unfuck broke links in docs 2013-07-27 00:47:08 -07:00
Mark Otto 80123fc039 mo links, fix ads and analytics in gh pages 2013-07-27 00:35:26 -07:00
Mark Otto 94df8090a7 fixes for hella broken links on account of jekyll and twbs.github.com links 2013-07-27 00:28:23 -07:00
Mark Otto 0f2b22a210 herpy derpy shit for urls 2013-07-27 00:18:12 -07:00
Mark Otto 295a87ab0f Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 23:28:20 -07:00
Mark Otto c884e51bfc 2.3.2 not 2.3.3 2013-07-26 23:24:02 -07:00
fat ec42ddf1f4 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 23:14:48 -07:00
fat b1e01a1b04 update js title 2013-07-26 23:14:21 -07:00
Mark Otto 40d398bcd0 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 23:04:12 -07:00
Mark Otto c8883647ae add cname 2013-07-26 23:04:03 -07:00
fat d0cafdd3a8 rebuild + use serif arrows 2013-07-26 22:59:21 -07:00
fat 4f4e74be78 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 22:41:34 -07:00
fat 0da0b321ab small copy change 2013-07-26 22:36:23 -07:00
Mark Otto 45f6f1629b ignore the gruntfile from jekyll 2013-07-26 22:31:14 -07:00
fat 7b9a949a18 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 22:25:11 -07:00
fat cfa4ab90f3 fix scrollspy for window *and* children 2013-07-26 22:24:51 -07:00
Mark Otto 88dd20e6ac Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	dist/css/bootstrap.min.css
2013-07-26 22:18:16 -07:00
Mark Otto bed8e959b3 responsive tables all up in js docs 2013-07-26 22:17:53 -07:00
Mark Otto bf5434dbec Fix up dropdowns being incorrectly positioned on nav pills 2013-07-26 22:11:58 -07:00
fat 2cf1851d9f use transforms to make the dialog smooooth 2013-07-26 22:09:31 -07:00
Mark Otto 4e27740916 Fix broke ass navbar example docs stuff 2013-07-26 22:09:05 -07:00
Mark Otto 44a4e71215 Fix clipped dropdowns in input groups section of docs 2013-07-26 22:03:52 -07:00
Mark Otto 5bed9f4635 simpler forms docs structure 2013-07-26 21:52:23 -07:00
Mark Otto 88887f8c00 Undo changes from #8582 because it made links uneven on desktop
/cc @salman-javed-confiz
2013-07-26 21:49:35 -07:00
Mark Otto 85591d82dd derp 2013-07-26 21:40:58 -07:00
Mark Otto 2967cc1d60 mo tables mo responsive or whatever the hell that means 2013-07-26 21:35:56 -07:00
Mark Otto 572174652e another responsivey table 2013-07-26 21:31:00 -07:00
Mark Otto 70fa8ef4b0 Responsivey docs table for grid section 2013-07-26 21:28:44 -07:00
Mark Otto 8349236f8c Twerk lead font-size for mobile devices 2013-07-26 21:12:48 -07:00
Mark Otto ad235f5f51 Broser meta tag docs layout change 2013-07-26 21:12:35 -07:00
fat fff2854c5e Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 21:01:50 -07:00
fat f83995684c fixes #6937 2013-07-26 21:01:14 -07:00
Mark Otto 27a656f72e Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 20:53:26 -07:00
fat 93eeb8578d Merge branch '3.0.0-docs-js' of git://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs-js
Conflicts:
	javascript.html
2013-07-26 20:50:51 -07:00
Mark Otto 2998929b39 fix up carousel holder and navbar probs 2013-07-26 20:48:10 -07:00
fat 38044e55ae rebuild + fix #2539 2013-07-26 20:44:35 -07:00
Mark Otto c3e6626411 Merge branch 'example-named-files'
Conflicts:
	.gitignore
2013-07-26 20:43:22 -07:00
Mark Otto 9c13af8cb1 massive update, including new index page 2013-07-26 20:42:47 -07:00
Mark Otto 425ec58ea9 Contrast on old docs callout 2013-07-26 20:36:02 -07:00
fat 6fdb18b641 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 20:34:59 -07:00
fat e2d4cf5f68 change how collapse works - collapse, collapsing, and in 2013-07-26 20:34:39 -07:00
Mark Otto 4b849e5fd7 Merge branch 'master' of github.com:twbs/bootstrap-examples 2013-07-26 20:26:53 -07:00
Mark Otto ae3a1ddd14 Color change to sidenav 2013-07-26 20:20:21 -07:00
Mark Otto 46a332049f Mo betta side nav colors 2013-07-26 19:58:46 -07:00
Mark Otto d16396f44a Fix broke ass popovers direction example 2013-07-26 19:50:02 -07:00
Mark Otto 20040868c1 Unfuck JS docs spacing and closing divs 2013-07-26 19:46:42 -07:00
Mark Otto b2c618c212 Update IDs on customize page 2013-07-26 19:38:12 -07:00
Mark Otto 22fda2f54d Upate IDs on components page 2013-07-26 19:37:31 -07:00
Mark Otto d89c3b9d23 Update IDs on css page 2013-07-26 19:35:24 -07:00
Mark Otto e2d497c385 Update IDs on getting started page 2013-07-26 19:32:15 -07:00
Mark Otto e3b8081b7e Better spacing of le docs sections 2013-07-26 19:32:05 -07:00
Mark Otto e647d54f25 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 19:26:58 -07:00
fat 178d8e98de update docs nav targets 2013-07-26 19:25:45 -07:00
Mark Otto 71acb0c42b Tweak getting started section 2013-07-26 19:25:13 -07:00
Mark Otto 259ff8b6a4 More vars work 2013-07-26 19:24:59 -07:00
Mark Otto 305455a9b3 Use some vars for key urls for easier updating 2013-07-26 19:05:43 -07:00
Mark Otto a285a3db3f more space in sidenav 2013-07-26 18:52:05 -07:00
Mark Otto bdac42ea40 Merge pull request #8631 from jamescostian/patch-1
Fix ID of buttons section on javascript page
2013-07-26 18:47:08 -07:00
James Costian 2c58fab318 Fix ID of buttons section on javascript page
The old ID caused the link on affix to not work.
2013-07-26 19:15:11 -05:00
Mark Otto e4159b53f6 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 16:53:00 -07:00
Mark Otto 75f5a70f7d Fixes #8293: sub nav links in JS docs 2013-07-26 16:52:09 -07:00
Mark Otto e686464ad8 Simpler horizontal form button placement 2013-07-26 16:01:34 -07:00
Mark Otto 6585c723f8 Ignore less dir in Jekyll 2013-07-26 16:01:24 -07:00
Mark Otto 01c6617f79 Update inline and horizontal forms
* No more need for `.row.form-group`--only need `.form-group`
* Change tag selectors for inline form to use `.form-control`
* Docs improved to explain what's happening
2013-07-26 15:51:25 -07:00
Mark Otto 68827689e8 Use .form-control in input sizing CSS 2013-07-26 15:41:16 -07:00
Mark Otto 73427f717d Tweak side nav styles 2013-07-26 15:34:50 -07:00
Chris Rebert 7b4c40ddb5 Merge pull request #8630 from caouecs/patch-1
Fix example of textarea in css.html
2013-07-26 15:14:08 -07:00
Mark Otto c75f3748e8 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 15:13:41 -07:00
Mark Otto b513cd9add grunt on previous commits 2013-07-26 15:13:03 -07:00
Chris Rebert 6aa051b000 README: update stray "2.3.2" to "2.3.3" 2013-07-26 15:12:32 -07:00
Fred Delrieu 4ca3e3677a Example of textarea 2013-07-27 00:09:27 +02:00
Mark Otto 1cf0a07f17 Merge branch 'patch-3' of https://github.com/jholl/bootstrap into jholl-patch-3
Conflicts:
	css.html
2013-07-26 15:08:45 -07:00
Mark Otto 444973e54d Fixes #8605: use .form-control in .input-group instead of HTML tags 2013-07-26 14:31:24 -07:00
Mark Otto 5dd2bff38c more readme clarity and reorg--think this makes more sense now 2013-07-26 14:15:48 -07:00
Mark Otto fd6f7dcce1 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 14:09:45 -07:00
Mark Otto b82692b2bf more readme love 2013-07-26 14:09:12 -07:00
Chris Rebert 0168ebade2 tweak terminology to be pedantically correct & add link 2013-07-26 14:04:35 -07:00
Mark Otto 953e0e445c update 2.3.x version mention and link in readme 2013-07-26 13:59:56 -07:00
Mark Otto bc1ba8f08b update readme per comments in pr 2013-07-26 13:58:18 -07:00
Mark Otto 1ad3e1e8a7 Merge branch '3.0.0-wip' of https://github.com/jojohess/bootstrap into jojohess-3.0.0-wip 2013-07-26 13:51:27 -07:00
Mark Otto ded4ebfa7e Make customize layout match default layout 2013-07-26 13:50:55 -07:00
Mark Otto 52e8aedb8e More customizer changes, and revert to placeholder layout 2013-07-26 11:17:48 -07:00
Mark Otto e3af87967a Fix broken indentation
Not sure when or how this happened, but I just noticed it—4 spaces were
used instead of 2.
2013-07-26 11:11:09 -07:00
Mark Otto 9e98b733f1 Vars update
* Drop progress bar text-shadow
* Reorganize popover and tooltip vars and fix complier error due to
missing `;`
* Run `grunt`
2013-07-26 11:08:27 -07:00
Mark Otto e62e992b88 Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip 2013-07-26 10:44:46 -07:00
Mark Otto d28b7913f6 Merge pull request #8619 from jholl/patch-2
align dropdown menu with .pull-right for .input-group-btn when btn on ri...
2013-07-26 10:35:20 -07:00
Mark Otto caa5b4b718 Merge pull request #8624 from jholl/patch-2
Update typo css.html move double class .form-control from label in examp...
2013-07-26 10:31:20 -07:00
Mark Otto 099e970953 Merge pull request #8625 from liuyl/fixbtnbg
Fix #8623
2013-07-26 10:30:41 -07:00
Chris Rebert 2d91e91b85 Merge pull request #8626 from cowboy/3.0.0-wip
It's Grunt, not GruntJS :)
2013-07-26 09:17:59 -07:00
Ben Alman 102fad4ebd It's Grunt, not GruntJS :) 2013-07-26 12:00:45 -04:00
Yulong Liu e4300fa1bf fix background of btn-link 2013-07-26 22:27:55 +08:00
Yulong Liu a2f120a7aa remove background:none 2013-07-26 21:59:50 +08:00
James Holland 0e7aad8b8d Update typo css.html move double class .form-control from label in example mark up to input
missed the double class in label in recent commit #8621
2013-07-26 09:43:05 -04:00
James Holland 2e7593a40d Update forms.less to remove .form-horizontal .row + .row
use .form-group to apply consistent vertical spacing on form rows
2013-07-26 09:04:39 -04:00
James Holland 6115f01adb Update css.html in .form-horizontal
to use .row.form-group for horizontal spacing instead of .form-horizontal .row + .row
2013-07-26 08:58:47 -04:00
syed 1b8ba0d159 move things around :)
Moved pager, pagination, popovers, tooltip, progress bars & type
properties to variables.less
2013-07-26 17:04:15 +05:00
James Holland f7a376569a align dropdown menu with .pull-right for .input-group-btn when btn on right of input 2013-07-26 07:52:40 -04:00
Jordan Hess cd23ae00dd Added windows hint to jekyll documentation instructions. 2013-07-26 03:25:12 -06:00
Jordan Hess fe095d17a2 Changed old reference to "grunt bootstrap" to "grunt dist" 2013-07-26 03:16:27 -06:00
Mark Otto 2a51ebf671 readme /cc @zdroid 2013-07-26 01:46:30 -07:00
Mark Otto 5b2b46fe28 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 01:43:53 -07:00
Mark Otto 5d766d9e2f Mo betta placement of old docs callouts 2013-07-26 01:43:43 -07:00
Chris Rebert 2910e3cb5a Merge pull request #8614 from cvrebert/grunt
Switch from `make` to `grunt`
Rebase of #7786 against soon-to-be 3.0.0-rc.1
2013-07-26 01:34:58 -07:00
Chris Rebert 2d58534519 Merge pull request #8616 from caouecs/patch-1
Small typo in less/mixins.less
2013-07-26 01:20:10 -07:00
Chris Rebert a317f67c1c re-integrate #8560 using @fat's code from the comment on #8614 2013-07-26 01:15:41 -07:00
Fred Delrieu 06980ae5a1 Small typo 2013-07-26 10:10:35 +02:00
Chris Rebert 292d8d6819 specify explicit ordering for grunt concat step 2013-07-26 01:07:56 -07:00
John-Philip Johansson 0d33455ef4 Replace Makefile with GruntJS
A rebase (against soon-to-be 3.0.0-rc.1) & squash of
https://github.com/twbs/bootstrap/pull/7786 AKA
https://github.com/twitter/bootstrap/pull/7786
originally by
@seriema
@mokkabonna
@jojohess

Rebased by @cvrebert
2013-07-26 00:39:14 -07:00
fat 995add132e Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 00:22:48 -07:00
fat 91b6a43ed9 fix makefile error thing 2013-07-26 00:22:20 -07:00
Mark Otto 210ee63693 Fixes #8586: add addional color text classes to apply all of branch colors easily 2013-07-26 00:18:18 -07:00
Mark Otto d604052aa5 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 00:04:24 -07:00
Mark Otto c23ba4d50b Fuck a color purple 2013-07-26 00:04:15 -07:00
Mark Otto b4f023f809 Make it so back to top link ain't broked no mo 2013-07-26 00:02:20 -07:00
fat 5588e14867 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-25 23:57:37 -07:00
fat 778f3a3df7 update docs a bit more for affix 2013-07-25 23:57:21 -07:00
fat 7ae8db8b7e update the affix docs a bit 2013-07-25 23:53:34 -07:00
Mark Otto 1659ac6473 Fix up navbar forms 2013-07-25 23:32:12 -07:00
fat f58827f24d Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-25 23:30:29 -07:00
fat f5f04ae4a0 fix affix… 2013-07-25 23:30:13 -07:00
Mark Otto ed4674a09a Disable the customizer for rc1 for now 2013-07-25 23:29:43 -07:00
Mark Otto 8a7553aeda Bump version of old docs in callout 2013-07-25 21:52:21 -07:00
Mark Otto 94202b2b29 Update docs to better indicate v3 RC1 2013-07-25 21:51:45 -07:00
Mark Otto f79740b48a Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-25 21:49:50 -07:00
fat 124d7e6279 fixes #8560 2013-07-25 21:49:19 -07:00
fat 0190128ebc Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-25 21:34:02 -07:00
fat 15d9c82fc5 fix collapse event #8596 2013-07-25 21:33:26 -07:00
Jacob f1ddf7681c Merge pull request #8419 from hollensteiner/3.0.0-wip
Replace position() with offset() in scrollspy.js
2013-07-25 21:19:57 -07:00
Mark Otto 56404bc89b Add .panel-title to panel component to mirror modals
/cc @leeaston
2013-07-25 21:16:43 -07:00
Mark Otto ac4e7db17f single include for old ads callout 2013-07-25 20:56:44 -07:00
Mark Otto 2a4a6fe0f0 Merge pull request #8611 from twitter/bs3_form_classes
Updated BS3 form classes
2013-07-25 20:31:11 -07:00
Mark Otto 35aad07456 Add comment about opacity mixin not being used 2013-07-25 19:56:04 -07:00
Mark Otto 27cedf71d5 Update form validation states
* Once again no longer applies to single inputs (this is a bit simpler,
but I'm open to new ideas) but the entire set of inputs, labels, and
help text within a particular element. However, the styles are not too
dependent on markup or layout, so they're super flexible.
* Simplified the markup in the validation docs examples to match latest
changes.
* Renamed `.form-state-validation` mixin to `.form-control-validation`
to match naming of prev commit.
2013-07-25 19:45:14 -07:00
Mark Otto 71d3d2c3f6 Spacing 2013-07-25 18:55:00 -07:00
Mark Otto 13bc74b636 Refactor forms styles
* Reorganize forms.less
* Change from attribute selectors to `.form-control`. Few lines, less
specific (meaning easier overrides as `element[type=""]` is more
specific than a class), less intrusive, and more performant.
* Add `.form-group` for basic spacing in vertical forms.
* Remove (unnecessary?) `margin: 0;` from `form` element (as far as I
can tell no browser sets that anyway).
2013-07-25 18:29:51 -07:00
Mark Otto d242d536c4 Merge pull request #8603 from cvrebert/twbs
twbs ALL the links
2013-07-25 13:42:51 -07:00
Chris Rebert 90fb40b707 twbs ALL the links 2013-07-25 12:24:13 -07:00
Mark Otto bc93a429a8 update docs to use buttons for tooltips 2013-07-25 11:55:12 -07:00
Mark Otto c7995cf964 move some thing around 2013-07-25 10:50:59 -07:00
Mark Otto 0d2d65c8f1 run make on prev commits 2013-07-25 10:12:51 -07:00
Mark Otto f94d9ce096 Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into 3.0.0-wip 2013-07-25 10:11:30 -07:00
Mark Otto 768e7edabf fixes #8571 completely: add better th support for table classes 2013-07-25 10:01:42 -07:00
Mark Otto d4cd7efce6 make on prev commits 2013-07-25 09:58:28 -07:00
Mark Otto 4d42100a3e Merge branch '3.0.0-wip' of https://github.com/tagliala/bootstrap into tagliala-3.0.0-wip 2013-07-25 09:57:49 -07:00
Mark Otto f3aaba0be2 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-25 09:57:40 -07:00
Mark Otto 72237acf52 fix #8584: add readme callout for npm and node 2013-07-25 09:57:33 -07:00
Geremia Taglialatela 0017f7fca4 Navbar toggle is not vertically aligned (3.0.0-wip) with custom navbar height
When using navbar heights higher that default, the navbar-toggle button is not centered.

Fiddle demonstrating this issue (compiled with `@navbar-height: 60px;`): http://jsfiddle.net/tagliala/mRVMe/2/


Another fiddle with the proposed fix: http://jsfiddle.net/tagliala/mRVMe/3/
2013-07-25 17:09:12 +02:00
syed a06afd8320 Moved navs inline properties to variables.less and customize.html & nav-customize.html 2013-07-25 12:43:14 +05:00
syed f8d5a974bc Moving navbar inline properties to variables.less and customize.html 2013-07-25 11:58:25 +05:00
Jacob Thornton e9c83647af fixes #8568 -- account for margins in offset 2013-07-24 20:57:26 -07:00
Jacob Thornton aad910465c fixes #8569 2013-07-24 20:21:23 -07:00
Jacob Thornton a282dba58f Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-24 20:10:51 -07:00
Jacob Thornton eaefed517a fixes #8399 w/ tests 2013-07-24 20:10:16 -07:00
Mark Otto 1f40da9676 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	dist/css/bootstrap.min.css
2013-07-24 16:53:34 -07:00
Mark Otto 51de38e5b9 make again 2013-07-24 16:52:47 -07:00
Mark Otto 61ac20ebb5 Merge branch '3.0.0-wip' of https://github.com/salman-javed-confiz/bootstrap into salman-javed-confiz-3.0.0-wip 2013-07-24 16:42:13 -07:00
Mark Otto a36f444c25 Merge pull request #8583 from liuyl/disabled
set cursor to not-allowed for disabled elements
2013-07-24 16:32:25 -07:00
Mark Otto 3080104642 make footer border color use header border color in modals 2013-07-24 16:31:17 -07:00
Mark Otto c63489def3 run make on prev commits 2013-07-24 16:28:34 -07:00
syed 2e6fcefc5c Moved modals inline properties to variables.less
In this commit I moved modals.less inline properties to variables.less
and also added those variables to customize.html.
2013-07-24 18:43:21 +05:00
liuyl 7e9532dabe set cursor to not-allowed for disabled elements 2013-07-24 17:10:27 +08:00
Salman Javed 0caab585f5 issues fixed for nav-justified on pills on android default browser. 2013-07-24 13:39:16 +05:00
Julian Thilo 7936f14780 Fix #8428 - Document tooltip/popover events 2013-07-24 09:08:19 +02:00
Jacob Thornton 930c75e5dd Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-23 23:51:18 -07:00
Jacob Thornton 217eb988b8 add placement auto for tooltips + tests… kinda sad about this doe 2013-07-23 23:50:23 -07:00
Mark Otto 8540515eeb Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-23 23:48:32 -07:00
Mark Otto 18157e9f39 Run make on prev commits 2013-07-23 23:48:17 -07:00
Mark Otto 9029b4c06c Update forms vars
* Reorganize layout
* Add input group var
* Add legend border var
2013-07-23 23:25:46 -07:00
Mark Otto a049cdd46e Reorganize dropdown vars section 2013-07-23 23:22:13 -07:00
Mark Otto 398038c798 Update dropdown vars
* Update `.nav-divider` mixin to simplify to a 1px line (one value
instead of two in parametric mixin)
* Rename and consolidate dropdown caret vars
* Add vars to Customizer
2013-07-23 23:18:53 -07:00
Mark Otto cdf6019e11 Update code vars
* Drop the `rgba()` border and fallback because fuck that noise
* Add vars to customizer
* Remove rogue `:`
2013-07-23 23:13:15 -07:00
Mark Otto ba954db159 Update close vars
* Remove dupe hover color var (again, it's not necessary to have it's
own var here since we're controlling it via `opacity`)
* Add to customizer
2013-07-23 23:09:06 -07:00
Mark Otto a5cc1300f6 Update carousel vars
* Remove `@carousel-control-hover-color` since that's just the same as
the default control color and all we change is `opacity` (it's required
for specificity).
* Add vars to customizer
* Update customizer nav to include new section
* Remove the `li` from the var names
* Consolidate and simplify `text-shadow` vars
2013-07-23 23:03:57 -07:00
Jacob Thornton 3cfa1c8a30 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	dist/js/bootstrap.min.js
2013-07-23 22:59:33 -07:00
Jacob Thornton 6841c50968 fixes #7814 2013-07-23 22:59:09 -07:00
Mark Otto b0dd2f902d Update and add @btn-hover-color to Customize page 2013-07-23 22:53:30 -07:00
Mark Otto 1803b2f09e Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip 2013-07-23 22:49:13 -07:00
Mark Otto 1d1bd62598 Fixes #8571: allow table classes in thead and tfoot 2013-07-23 22:27:49 -07:00
Mark Otto a346ea2a1a make on prev commit 2013-07-23 21:23:13 -07:00
Mark Otto 2447f03758 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-23 21:22:52 -07:00
Jacob Thornton faba6808b7 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-23 20:53:32 -07:00
Jacob Thornton 72d2661ff0 fixes #8232 2013-07-23 20:53:12 -07:00
Mark Otto 00976ff09a Merge pull request #8576 from sfaxon/3.0.0-wip
update carousel js docs to reflect leading .glyphicon
2013-07-23 20:17:40 -07:00
Mark Otto ced204c774 Clear up license FAQs by using "Bootstrap" as noun instead of "Twitter open source software" 2013-07-23 20:16:02 -07:00
Mark Otto 984a0d1c78 Update link to blog 2013-07-23 19:52:44 -07:00
Seth Faxon 13f2a68a23 update carousel js docs to reflect leading .glyphicon
https://github.com/twitter/bootstrap/pull/6342 icons section
  mentions the change to using glyphicon base class
  this adds it to the docs
2013-07-23 19:38:23 -07:00
Jacob Thornton faa00629c4 add additional carousel test 2013-07-23 18:56:00 -07:00
Jacob Thornton 68e87183a0 fixes #8134 2013-07-23 18:54:00 -07:00
Jacob Thornton f1009c19b3 revert collapse change + add emulateTransitionEvent to catch dead css transitions 2013-07-23 18:44:08 -07:00
Jacob Thornton 43e5e90a6d shown.bs.modal fix 2013-07-23 17:32:20 -07:00
Jacob Thornton 7b12a0dcbc fixes #7970 2013-07-23 17:23:02 -07:00
Mark Otto e87508854e Merge pull request #8572 from mohnish/patch-1
Use input type `password` for the password field in the CSS documentatio...
2013-07-23 14:23:17 -07:00
Mark Otto 29b4caf1d5 Merge pull request #8573 from cvrebert/patch-2
getting-started.html: add <code> around mention of `placeholder`
2013-07-23 14:22:59 -07:00
Chris Rebert d8583a1064 getting-started.html: add <code> around mention of placeholder 2013-07-23 13:00:28 -07:00
Mohnish Thallavajhula 4629bed2c4 Use input type password for the password field in the CSS documentation. 2013-07-23 11:50:01 -07:00
Mark Otto 4cec956e0c Drop rounded corners on .table-bordered
* Cuts  close to 100 lines of CSS from the table CSS
* File size aside, this drastically simplifies CSS for folks looking to
build on top of the `.table-bordered` option as a starting point
2013-07-23 10:48:30 -07:00
Mark Otto b5f2482a58 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	dist/css/bootstrap.min.css
2013-07-23 10:19:04 -07:00
Mark Otto 8aa3c375f0 No more left margin on dd elements, fixes #8567 2013-07-23 10:18:34 -07:00
Mark Otto e7b0f4e81f Merge pull request #8564 from frabrunelle/3.0.0-wip
@badge-bg should be @gray-light not #f5f5f5
2013-07-23 10:05:49 -07:00
Francis Brunelle 4b9cacae91 @badge-bg should be @gray-light not #f5f5f5 2013-07-23 00:05:45 -04:00
Mark Otto 0b1ddeb353 fixes #8559 2013-07-22 14:44:36 -07:00
Mark Otto 98ce40d0f6 Merge pull request #8549 from ggam/patch-2
Updated readme.md to reflect the latest changes in directory structure
2013-07-21 16:07:55 -07:00
Guillermo González de Agüero abb1013f25 Updated readme.md to reflect the latest changes in directory structure 2013-07-21 21:57:41 +02:00
Mark Otto 12468c6103 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	dist/css/bootstrap.min.css
2013-07-21 08:52:25 -07:00
Mark Otto 582e9986a8 Merge pull request #8546 from jeroenvisser101/patch-1
Fixed typo
2013-07-21 08:50:12 -07:00
Mark Otto e78ba0ff82 Merge pull request #8545 from liuyl/refactor-btngroups
refactor button-groups.less
2013-07-21 08:49:52 -07:00
Mark Otto 832fdf9a36 Merge pull request #8544 from liuyl/removeuseless
remove useless display:inline-block
2013-07-21 08:49:34 -07:00
Jeroen Visser c926309371 Fixed typo 2013-07-21 14:20:21 +02:00
liuyl f5fc6254c7 refactor button-groups.less 2013-07-21 20:03:59 +08:00
liuyl be2693369d remove useless display:inline-block 2013-07-21 19:44:30 +08:00
Nicole 6d269c2ed7 add git ignore 2013-07-20 23:30:08 -07:00
Nicole bf51e24700 change file names to example names 2013-07-20 23:17:01 -07:00
Mark Otto a63db4d2f9 Update file input to remove height and line-height
This particular form control is wildly inaccurate across browsers, so
we're removing the `height` and `line-height`, but adding `display:
block` so it renders similarly to our other inputs.
2013-07-20 21:09:03 -07:00
Mark Otto df851b40d1 Update docs on responsive images and elaborate on IE8 support using Respond.js 2013-07-20 20:58:23 -07:00
Mark Otto d651c01e10 Update forms example to show sequential form inputs for later testing 2013-07-20 20:11:53 -07:00
Mark Otto 51dfa21009 Remove more commented out CSS from forms 2013-07-20 19:32:21 -07:00
Mark Otto 732e4196fb Remove commented out CSS 2013-07-20 19:31:56 -07:00
Mark Otto 6952d655f4 Merge pull request #8538 from brentmulligan/3.0.0-wip
Update Normalize.css URL to new Github.io domain
2013-07-20 16:58:00 -07:00
Mark Otto 3d5e9f0318 Merge pull request #8536 from ggam/patch-1
Fixed breadcrumbs link in customize
2013-07-20 16:57:30 -07:00
Brent Mulligan 23015bc7c1 Update Normalize.css URL to new Github.io domain 2013-07-20 15:38:38 -04:00
Guillermo González de Agüero faa9a22f74 Fixed breadcrumbs link 2013-07-20 14:38:10 +02:00
syed 330f40c864 moving forms, labels and list-group to variables.less 2013-07-20 13:38:27 +05:00
syed 1683e6767a moving code and dropdowns to variables.less 2013-07-20 13:17:56 +05:00
syed c2e37414d8 Move inline properties to variables.less
moved buttons.less, carousel.less & close.less in this commit
2013-07-20 12:56:20 +05:00
Mark Otto 453346262f Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-20 00:11:02 -07:00
Mark Otto e347fffb14 update headings and nav 2013-07-20 00:10:51 -07:00
Mark Otto a1065a1ef8 undo change to config exclude 2013-07-20 00:07:04 -07:00
Mark Otto 4b7f63a3a2 Update vars for badges, breadcrumbs; update customize page 2013-07-20 00:03:08 -07:00
Mark Otto 72d913baeb Move var in customize layout 2013-07-19 23:43:17 -07:00
Mark Otto c2d3dad15b Merge pull request #8533 from frabrunelle/bower-link
update links to bower
2013-07-19 21:42:30 -07:00
Francis Brunelle 0f8d6e3112 update links to bower 2013-07-19 21:28:21 -04:00
Mark Otto 7c5f7a4e82 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-19 17:36:16 -07:00
Mark Otto b6238c5f20 Fixes #8385: update carousel captions
* No longer hidden by default--up to users to figure that part out with
longer content
* Cleaned up styles and spacing
2013-07-19 17:36:03 -07:00
Mark Otto 8ab77191ce Twerk callouts and fix an unstyled one 2013-07-19 17:17:52 -07:00
Mark Otto 6cce56061f Better code snippets on mobile in docs 2013-07-19 17:09:39 -07:00
Mark Otto dd3eefc0f9 Merge pull request #8530 from codeodor/3.0.0-wip
ignore .files for bower packaging
2013-07-19 16:54:22 -07:00
Mark Otto 95b9f44190 Fixes #8278: fix on print 2013-07-19 16:49:38 -07:00
Mark Otto f25d8c0080 hacky way of not showing ads or analytics in local dev 2013-07-19 14:08:16 -07:00
Mark Otto 4b0fa356f3 Variables reorganization and breadcrumbs update
* Place component vars alongside the rest of the component vars
* Redo some of the breadcrumbs code to add a var and remove
`text-shadow`
2013-07-19 11:44:35 -07:00
Mark Otto b1819755b8 Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip 2013-07-19 11:29:21 -07:00
Sammy Larbi b8348416b0 ignore .files for bower packaging 2013-07-19 13:23:17 -05:00
syed 65ee36a7bf Improved and followed pattern suggestions 2013-07-19 23:14:13 +05:00
Mark Otto 416fd9d19b Merge pull request #8528 from dtmax/3.0.0-wip
typo fixed: highligted source code of second radio button was missing
2013-07-19 09:34:20 -07:00
syed 5e898fa2a1 move breadcrumb.less inline properties and also added @color-2 missed in last commit 2013-07-19 18:39:51 +05:00
syed b37127e2fc move badges inline properties to variables.less 2013-07-19 18:29:19 +05:00
syed 95be924926 Move accordion inline properties to variables.les 2013-07-19 18:18:01 +05:00
Max 6f9ed7efeb typo fixed: highligted source code of second radio button was missing in css.html -> checkboxes & radios -> default section 2013-07-19 13:28:26 +03:00
Mark Otto 710dbb5260 Merge pull request #8524 from jholl/patch-1
fix typo / doc components.html responsive menu dropdowns now have ref to...
2013-07-18 21:07:34 -07:00
James Holland bbe0d0d874 fix typo / doc components.html responsive menu dropdowns now have ref to .dropdown-header instead of .nav-header 2013-07-19 00:04:58 -04:00
Mark Otto 49f2f7fad9 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-18 19:53:53 -07:00
Mark Otto e440ff4b3f <input> and <select> sizing update
Restores `font-size` and more to the `<select>` element while also
changing from `min-height` to `height` for input sizing.

Fixes #8520 as opened by @ShaunR (would've merged that PR but I moved
everything around right before).
2013-07-18 19:53:32 -07:00
Mark Otto e160b14223 Merge pull request #8521 from epicyclist/3.0.0-wip
Documentation updates.
2013-07-18 19:36:16 -07:00
Christopher Canipe 896d159987 Remove Mustache comment regarding contribution: it's going away. 2013-07-18 20:09:33 -06:00
Christopher Canipe 3e8b3a246a Clean up tooltip's trigger description in the docs. 2013-07-18 19:41:42 -06:00
Mark Otto 0a3722112c Add minified CSS to dist folder 2013-07-18 18:33:20 -07:00
Mark Otto f771bf140d Merge branch 'bs3_rc1' into 3.0.0-wip 2013-07-18 18:16:50 -07:00
Mark Otto 7bb8817947 finish flattening repo structure; add dist folder of compiled css/js 2013-07-18 18:14:49 -07:00
Mark Otto a8005b3d0b flatten docs dir back into root 2013-07-18 17:41:30 -07:00
Mark Otto 36c2a34c1e Merge pull request #2 from ssorallen/master
Let .navbar-wrapper flow in Carousel example
2013-07-18 15:41:11 -07:00
Mark Otto 820558916f Fixes #8516: correct input-small and input-large on select elements 2013-07-18 15:36:41 -07:00
Mark Otto 7d9fb1dda7 Jankily fix input group wrapping with button groups in Firefox (fixes #8321, #8429, and #8067) 2013-07-18 15:28:38 -07:00
Ross Allen 1a2ef331fd Let .navbar-wrapper flow in Carousel example
A .navbar-wrapper followed by a .carousel works well in this example,
but when the navbar is not followed by a carousel, content flows
underneath the navbar because it is absolutely positioned.

Letting .navbar-wrapper be part of the flow and moving the negative
margin to the .carousel to bring it underneath the navbar makes these
example styles suitable for pages without carousels.
2013-07-18 14:57:27 -07:00
Mark Otto 1f48e83700 Merge pull request #8517 from cvrebert/gloss-unicode
add comments to gloss Unicode codepoint hex
2013-07-18 14:43:38 -07:00
Mark Otto 36188d0884 change download button label 2013-07-18 14:08:40 -07:00
Mark Otto 63f070096b copy change to css page subheading 2013-07-18 14:06:13 -07:00
Mark Otto 5cb0d64686 relative url 2013-07-18 13:51:08 -07:00
Mark Otto 3abfe029ea vertically center ad 2013-07-18 13:35:55 -07:00
Mark Otto a34470ac5d Merge branch 'bs3_old_docs_callout' into bs3_rc1 2013-07-18 13:07:49 -07:00
Mark Otto 9425382376 Merge branch 'bs3_add_ads' into bs3_rc1 2013-07-18 13:07:17 -07:00
Mark Otto cc63096118 clarify IE support and rearrange getting started docs a bit 2013-07-18 13:05:53 -07:00
Chris Rebert 86efc140e2 add comments to gloss Unicode codepoint hex 2013-07-18 11:49:39 -07:00
Mark Otto b372661a17 fixes #8206: Use navbar height var to compute vertical padding on navbar-brand 2013-07-18 02:23:38 -07:00
Mark Otto 64efa86036 for some reason iOS is shitting the bed on the .navbar-toggle unless it gets fixed dimensions 2013-07-18 02:19:13 -07:00
Mark Otto 3ed05f60fd Quick pass at new touch and favicons 2013-07-18 02:05:41 -07:00
Mark Otto 898ee8f13b twerk comment 2013-07-18 01:46:31 -07:00
Mark Otto 6e04925328 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-18 01:25:28 -07:00
Mark Otto e72b524d41 Fixes #8374: ensure navbar is always at least 50px 2013-07-18 01:25:08 -07:00
fat 6ec8a1e44f Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
2013-07-18 01:08:19 -07:00
fat 4b40ee692d cleaner way of preventing double click events + clean up tests for jshint 2013-07-18 01:07:11 -07:00
Mark Otto 181b276774 Fixes #8397: better navbar padding with grid gutter stuff 2013-07-18 01:04:54 -07:00
fat 37e899d766 get button js working with actual form elements p cooll 2013-07-18 00:59:31 -07:00
Mark Otto d87431a29e spacing and local var rename 2013-07-18 00:56:36 -07:00
Mark Otto 0c45458fcc Merge branch 'patch-1' of https://github.com/bassjobsen/bootstrap into bassjobsen-patch-1 2013-07-18 00:55:36 -07:00
Mark Otto f757cf4cf3 run make on mixin changes from #8380 2013-07-18 00:50:57 -07:00
Mark Otto 02bddac091 Merge pull request #8380 from joeybaker/patch-1
Remove unneeded prefixes from some mixins
2013-07-18 00:50:15 -07:00
Mark Otto 8dc7807dcd change characters 2013-07-18 00:48:02 -07:00
Mark Otto 1363ffa473 Merge branch '3.0.0-wip' of https://github.com/mauricew/bootstrap into mauricew-3.0.0-wip 2013-07-18 00:43:48 -07:00
Mark Otto e7bc9e1c3d Vurrriables and shit 2013-07-18 00:23:35 -07:00
Mark Otto 79a10feb7a Fixes #8452: adds .active to table classes 2013-07-18 00:10:22 -07:00
Mark Otto 87adbf7aa4 make on collapse changes 2013-07-17 23:56:38 -07:00
Mark Otto e6906040de Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-17 23:56:27 -07:00
Mark Otto e5bfd8c00b Fixes #8441: remove @font-size-mini 2013-07-17 23:56:20 -07:00
Mark Otto bc79f8a399 Bump tooltips to use @font-size-small (11px to 12px) 2013-07-17 23:55:58 -07:00
Mark Otto e57758cbb4 Drop .nav-header for .dropdown-header
* Since we no longer have `.nav-list`, I've nuked the `.nav-header`
* However, dropdowns can still have section headings, so I've kept that
around with the addition of `.dropdown-header`
* Restyled it a smidge as well
2013-07-17 23:54:09 -07:00
fat 2a4a0f70ef Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-17 23:52:55 -07:00
fat b13eecaeec fixes #7880 2013-07-17 23:52:29 -07:00
Mark Otto 3604b86806 fixes #8477: use var for rounded image border-radius 2013-07-17 23:41:05 -07:00
Mark Otto 4d73aa60f9 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
2013-07-17 23:34:31 -07:00
Mark Otto d3a139622e fixes #8491: add vars for table padding 2013-07-17 23:34:04 -07:00
Mark Otto ba0c6cd57c make on prev js changes 2013-07-17 23:33:34 -07:00
fat 59f847e8ee fixes #7777 2013-07-17 23:30:05 -07:00
fat 8cf04911db fixes #7776 2013-07-17 23:25:26 -07:00
Mark Otto d7d1c2a767 add ads to v3 docs 2013-07-17 23:22:28 -07:00
fat 451acb42db fixes #7755 2013-07-17 23:15:50 -07:00
fat 5cb8bfd7da Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-17 23:02:15 -07:00
fat 57768d7ea9 fix #7660 2013-07-17 23:01:33 -07:00
Mark Otto 3ad0cf9e94 add callouts for bootstrap 2.3.2 docs and 3.0 rc1 post 2013-07-17 22:58:49 -07:00
Mark Otto 9efba239b6 Merge pull request #8511 from twitter/bs3_remove_examples
BS3: Move examples to @twbs/bootstrap-examples
2013-07-17 22:17:30 -07:00
fat 6387d8d5cc versioning perhaps for jquery i don't even know man 2013-07-17 21:38:52 -07:00
fat 18d23b892c rebuild js + fixes #7583 2013-07-17 21:35:28 -07:00
fat 2cccc0889f make sure triggering element is visible before focusing #7521 2013-07-17 21:30:38 -07:00
fat a7a9a14379 fix @muan's unit test ;) 2013-07-17 21:17:39 -07:00
fat 102df4ff33 Merge branch '3.0.0-wip' of git://github.com/muan/bootstrap into muan-3.0.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
2013-07-17 21:14:02 -07:00
fat bf38241f0d remove duh ugly 2013-07-17 21:10:33 -07:00
fat eb3333a612 fix #7000 2013-07-17 21:08:50 -07:00
Mark Otto 0df791d1ac fix link to grid example 2013-07-17 21:04:27 -07:00
Mark Otto 6be1f9d00f remove colophon include because there's only one layout using it now 2013-07-17 21:02:50 -07:00
Mark Otto 97cdb4215a link order 2013-07-17 20:44:55 -07:00
Mark Otto f0d0718322 Merge branch '3.0.0-wip' into bs3_remove_examples
Conflicts:
	docs/_includes/nav-getting-started.html
	docs/examples/navbar-fixed-top.html
	docs/examples/navbar-static-top.html
	docs/examples/navbar.html
	docs/getting-started.html
2013-07-17 20:44:27 -07:00
fat 0f64c21049 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-17 20:30:09 -07:00
fat 392bf0c9c9 fixes #6691 2013-07-17 20:29:41 -07:00
Mark Otto bfebf0e490 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-17 20:18:03 -07:00
Mark Otto 7cc34ea547 fix broken docs callouts 2013-07-17 20:17:56 -07:00
fat 5396c40877 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-17 19:33:49 -07:00
Mark Otto 542e03ae3a Merge branch '3.0.0-docs-calloutfam' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs-calloutfam
Conflicts:
	docs/components.html
	docs/css.html
	docs/customize.html
2013-07-17 19:33:30 -07:00
fat f97dd5af49 rebuild doe 2013-07-17 19:33:21 -07:00
fat 13cad5061d maybe fix this old ass issue #5973 2013-07-17 19:28:43 -07:00
Mark Otto 06d47b0082 Fixes #8360: Add mention of IE compatibility mode to docs 2013-07-17 19:26:37 -07:00
Mark Otto f4b9938d8c Move license FAQs to the docs, add link to side nav 2013-07-17 19:20:08 -07:00
Mark Otto aa49c919c6 Fixes #8356: Move browser compatibility from wiki into real docs 2013-07-17 19:08:08 -07:00
Mark Otto e7be60fd4d Update readme to point previous releases to GitHub project releases (fixes #8508) 2013-07-17 17:21:11 -07:00
Mark Otto 8a79590d05 Remove changelog in favor of GitHub releases 2013-07-17 17:20:47 -07:00
Mark Otto cb9cc972ed Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-16 13:36:02 -07:00
Mark Otto 5967ef64a3 remove margin from left side of navs since it's no longer being set 2013-07-16 11:49:04 -07:00
Mark Otto 7dbcce30c1 Merge pull request #8498 from cvrebert/patch-1
Add missing backtick in comment
2013-07-16 11:27:33 -07:00
Mark Otto 522004e67a remove webkit-overflow-scrolling from modal for now /cc #8495 2013-07-16 11:26:48 -07:00
Chris Rebert 76063ea739 Add missing backtick in comment 2013-07-16 10:49:59 -07:00
Mark Otto ced641b107 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-15 12:00:10 -07:00
Mark Otto 6aec8f36fc fix broken scrollspy example 2013-07-15 12:00:01 -07:00
Mark Otto fb75ffca55 Merge pull request #8478 from juthilo/3.0.0-customizer
Update customizer
2013-07-14 16:56:56 -07:00
Julian Thilo aab4c95cd2 Update customizer
Add all the new things to customizer:
* `@headings-font-family`
* `@container-*`
* darker `@btn-default-bg`
2013-07-14 12:50:14 +02:00
Mark Otto 89555cb61c Merge pull request #8453 from cvrebert/retina-rename
rename .retina-image => .img-retina
2013-07-11 14:17:11 -07:00
Mark Otto cb117c62eb Merge pull request #8454 from bassjobsen/patch-2
Update forms.less
2013-07-11 14:16:58 -07:00
Mark Otto 9efab70c93 Merge pull request #8455 from cvrebert/control-group-dead
rm .control-group from docs since it's no longer in the LESS
2013-07-11 14:16:29 -07:00
Chris Rebert 5d9f51d496 rm .control-group from docs since it's no longer in the LESS 2013-07-11 12:57:44 -07:00
Bass Jobsen 3a17578a94 Update forms.less
All variables should be set in variables.less?
2013-07-11 21:24:06 +02:00
Chris Rebert a41fd16da2 rename .retina-image => .img-retina 2013-07-11 12:07:35 -07:00
Mark Otto 606d6e81d4 Merge pull request #8426 from liuyl/simplify-type
simplify type.less
2013-07-09 12:43:15 -07:00
Mark Otto b2fa51521f Merge pull request #8430 from juthilo/3.0.0-docs-fixes
Dustin the docs again
2013-07-09 12:41:07 -07:00
Julian Thilo 88d76e386f Dustin the docs again
* Fix alllll the links!
* Change all `*.js` in JS plugin docs (no mo `bootstrap-`)
* Fully remove `tr.info`
* Bring nav includes up to date
2013-07-09 15:32:28 +02:00
liuyl 0d5c3c2ecf simplify type.less 2013-07-09 09:22:36 +08:00
Mark Otto 1045226544 Merge pull request #8415 from cvrebert/code.less-cleanup
code.less: cleanup styles that get immediately overriden later in the file
2013-07-08 06:57:37 -07:00
Mark Otto f69afc1b23 Merge pull request #8414 from cvrebert/dropdowns-LESS-nesting
use LESS nesting more in dropdowns.less
2013-07-08 06:56:57 -07:00
Mark Otto b2b09f679a Merge pull request #8413 from cvrebert/misc-less-refactoring
refactor {badges,jumbotron,media,popover,print}.less (mostly nesting)
2013-07-08 06:56:35 -07:00
Mark Otto e0d1b83e25 Merge pull request #8412 from cvrebert/pagination-nesting
use nesting more in pagination.less
2013-07-08 06:55:50 -07:00
Mark Otto 46378c7ba3 Merge pull request #8411 from cvrebert/navbar-LESS-nesting
more nesting in navbar.less
2013-07-08 06:55:16 -07:00
Mark Otto b13417525c Merge pull request #8410 from cvrebert/buttons-nesting
more nesting in buttons.less
2013-07-08 06:54:39 -07:00
ClausH 0a72530429 Replace position with offset 2013-07-08 12:02:31 +02:00
Chris Rebert e40aee9c9e code.less: cleanup styles that get immediately overriden later in the file 2013-07-07 20:03:52 -07:00
Chris Rebert 7e154740f3 use LESS nesting more in dropdowns.less 2013-07-07 19:54:07 -07:00
Chris Rebert dcf1b60f2b refactor {badges,jumbotron,media,popover,print}.less (mostly nesting) 2013-07-07 19:46:20 -07:00
Chris Rebert 6bda16f6be use nesting more in pagination.less 2013-07-07 19:30:51 -07:00
Chris Rebert d9cd5e4e0c more nesting in navbar.less 2013-07-07 19:22:18 -07:00
Chris Rebert 6e03639af2 more nesting in buttons.less 2013-07-07 19:16:38 -07:00
Mark Otto 084291aac7 Merge pull request #8408 from cvrebert/progress-bar-variant-mixin
extract .progress-bar-variant mix-in
2013-07-07 18:27:43 -07:00
Mark Otto 906d04a4aa Merge pull request #8407 from cvrebert/label-variant-mixin
extract .label-variant mix-in
2013-07-07 18:26:54 -07:00
Mark Otto 65141338df Merge pull request #8406 from cvrebert/navs-nesting
more nesting in navs.less
2013-07-07 18:26:26 -07:00
Mark Otto 03becfb9e3 Merge pull request #8405 from cvrebert/button-groups-nesting
more nesting in button-groups.less
2013-07-07 18:25:48 -07:00
Mark Otto 400e9b2a88 Merge pull request #8404 from cvrebert/alert-variant
extract .alert-variant mix-in
2013-07-07 18:25:17 -07:00
Chris Rebert d2fb35d546 extract .progress-bar-variant mix-in 2013-07-07 15:44:18 -07:00
Chris Rebert a7dd1088d2 extract .label-variant mix-in 2013-07-07 15:38:43 -07:00
Chris Rebert 15bd6eadf3 more nesting in navs.less 2013-07-07 15:31:18 -07:00
Chris Rebert f12d6401f2 more nesting in button-groups.less 2013-07-07 15:27:06 -07:00
Chris Rebert e757ddd60f extract .alert-variant mix-in 2013-07-07 15:21:40 -07:00
Maurice Wahba 8a84da6341 Carousel no longer dependent on glyphicons
Used laquo/raquo for control buttons
Updated docs
2013-07-06 22:26:40 +04:00
Mark Otto 95655e7275 Remove more Glyphicons 2013-07-05 14:27:54 -05:00
Mark Otto fffb37ecea Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-05 14:24:40 -05:00
Mark Otto 3279181f42 Merge pull request #8378 from liuyl/aftertosibling
optimize breadcrumb
2013-07-05 12:23:14 -07:00
Mark Otto 30c138c4bf Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-05 14:22:46 -05:00
Mark Otto dd691b5c36 Merge pull request #8390 from liuyl/typeahead
delete typeahead style
2013-07-05 12:21:49 -07:00
Mark Otto 4f922d6e3f Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-05 14:21:33 -05:00
Mark Otto 61823dbff1 Move hr to scaffolding.less (out of type.less) and simplify styles 2013-07-05 14:21:05 -05:00
Mark Otto bc3c69e4e8 Merge pull request #8392 from liuyl/refactpagination
refactor pagination.less
2013-07-05 12:19:31 -07:00
Mark Otto 88a266b800 Add tfoot back (addresses more than #8387) 2013-07-05 14:15:00 -05:00
Mark Otto 14056409c3 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-05 14:13:24 -05:00
Mark Otto 817972724a Remove further mentions of Glyphicons 2013-07-05 14:11:12 -05:00
liuyl 969529c80e refactor pagination 2013-07-05 20:18:57 +08:00
liuyl 3bd42511f4 refactor pagination 2013-07-05 20:17:20 +08:00
liuyl e6529e9588 delete typeahead style 2013-07-05 15:09:16 +08:00
Mark Otto d483e77553 Merge pull request #8370 from cvrebert/tables-nesting
refactor tables.less to use nesting more
2013-07-03 19:39:29 -07:00
Joey Baker 2d56997c61 Remove unneeded prefixes
Per caniuse, prefixes for transitions and transforms can be reduced to just `-webkit` and `-ms`. http://caniuse.com/#search=transform
http://caniuse.com/#search=transition
2013-07-03 08:11:28 -07:00
liuyl 5b69d34053 use sibling selector instead of pseudo selector 2013-07-03 20:37:36 +08:00
Chris Rebert da072fff21 refactor tables.less to use nesting more 2013-07-02 11:42:37 -07:00
Mark Otto 749dc35328 comma for the guardian angel /cc @cvrebert 2013-07-01 20:18:44 -07:00
Mark Otto a049dcb7f6 Merge branch '3.0.0-responsive-tables' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-responsive-tables
Conflicts:
	less/mixins.less
2013-07-01 20:06:16 -07:00
Mark Otto 9ed9fba460 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-01 19:49:49 -07:00
Mark Otto 5b2d933524 Fixes #8350: unfuck Chrome number input element cursor /cc @cvrebert @eintnohick 2013-07-01 19:49:29 -07:00
Mark Otto 526d1399c5 Merge pull request #8348 from Rowno/compiled-font-shorthand
Prevent the font shorthand from getting compiled as division
2013-07-01 19:43:15 -07:00
Mark Otto 08b3515fd7 fixes #8345: use inline-block on .img-responsive 2013-07-01 19:42:43 -07:00
Mark Otto f8eb9136eb Merge pull request #8352 from liuyl/simplifytable
simplify tables.less
2013-07-01 18:23:17 -07:00
Mark Otto 9da90adb4c fixes #8068: add .help-block to form field state mixin 2013-07-01 18:21:19 -07:00
Mark Otto c9df1db502 fixes #7367: slightly larger carousel indicators 2013-07-01 18:16:59 -07:00
Mark Otto 7ad9fbef8b Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-01 17:32:14 -07:00
Mark Otto a27ecfccf3 Make more components mixin-friendly 2013-07-01 17:32:07 -07:00
Julian Thilo fea69df80c Fix responsive utilities for table elements
This change prevents situations where specificity causes some rules to
be overridden by the ones intended for mobile.
* Added mixin `responsive-invisibility()`
* Swapped out `display: none !important;` for new mixin
2013-07-01 21:13:57 +02:00
liuyl e5e9d5916a simplify tables.less 2013-07-01 20:29:41 +08:00
Roland Warmerdam 2e8752b26f Prevent the font shorthand from getting compiled as division 2013-07-01 10:51:08 +12:00
Mark Otto 534eac5242 Merge pull request #8340 from JohnONolan/Fix-Broken-Docs-Links
Docs: Fix broken links to navbar component in examples pages
2013-06-29 17:29:19 -07:00
Mark Otto eeaa70ab4a Merge pull request #8341 from Quy/3.0.0-wip
Remove references to fonts
2013-06-29 17:29:01 -07:00
Mark Otto 3b5f4ed054 Merge pull request #8343 from frabrunelle/reset-left-padding
reset left padding for .media-list, .pagination and .pager
2013-06-29 17:28:06 -07:00
Francis Brunelle 6a20810ca4 reset left padding for .media-list, .pagination and .pager 2013-06-29 16:06:14 -04:00
Quy Ton 02351c0589 Remove references to fonts 2013-06-29 07:37:53 -07:00
John O'Nolan 4252dff850 Fixes broken links to navbar component in docs. 2013-06-29 13:21:16 +02:00
Mark Otto 2d2828d36c Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-28 09:25:02 -07:00
Mark Otto 0a92efce0c Nuke hella things
* Any mentions of .btn-mini
* Old docs page that somehow found it's way back
2013-06-28 09:24:46 -07:00
Mark Otto 8ef3002153 Merge pull request #8336 from guilbep/3.0.0-wip
removing bootstrap-fonts rule in Makefile for bootstrap rule
2013-06-28 09:20:02 -07:00
Pierre Guilbert 37e4fbf9ca removing useless space 2013-06-28 14:19:46 +02:00
Pierre Guilbert a85c11eb45 removing bootstrap-fonts rule in Makefile for bootstrap rule 2013-06-28 14:09:46 +02:00
Mu-An Chiou 55fa1acbd6 Tooltip: apply position class before positioning 2013-06-28 11:05:38 +01:00
Mark Otto 09cdee2f03 Overall responsive img styles
`img`s are no longer responsive by default. Instead, use
`.img-responsive` as a class or mixin. Existing `.thumbnail > img` and
`.img-thumbnail` classes now make use of this as a mixin as well.
2013-06-28 00:09:10 -07:00
Mark Otto 1a09eada35 Run make on JS 2013-06-28 00:08:19 -07:00
Mark Otto 8e6d5be8e4 update close button example display 2013-06-27 23:26:04 -07:00
Jacob d23800c828 Merge pull request #7424 from sody/3.0.0-wip
Fixes #7213 Collapse plugin does not correctly set the "collapsed" class.
2013-06-27 22:36:33 -07:00
Mark Otto 88ece4fc59 fixes #7961 a bit: adds css for extra tooltip placement options. /cc @fat you just need dat js prolly 2013-06-27 20:50:21 -07:00
Mark Otto bf3c5e070e remove submenus. for more context: http://www.youtube.com/watch?v=ggWyUEuGcWY&feature=youtu.be&t=48s 2013-06-27 20:49:29 -07:00
Mark Otto 89117ec6b2 run make on last commit 2013-06-27 20:18:16 -07:00
Mark Otto 0682068929 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-27 20:17:59 -07:00
Mark Otto 69b7c5a2af Merge pull request #7995 from hrach/patch-3
Fixed mixin btn-pseudo-state background for [disabled] buttons
2013-06-27 20:17:48 -07:00
Mark Otto d9a662ed1d fixes #7977: prevent some table bullshit on input groups 2013-06-27 20:15:44 -07:00
Mark Otto 5156234c23 update grid col mixin to use latest css from grid cols 2013-06-27 19:54:30 -07:00
Mark Otto ca8ca2177f fixes #4852: popover carets fully functional in ie8 holy carp wtfbqq huge shoutout to @PumaOmaR 2013-06-27 19:36:56 -07:00
Mark Otto 6a2858f7bf make on js i guess? /cc @fat 2013-06-27 19:36:35 -07:00
Mark Otto 81b5e74057 remove glyphicons from compiled css 2013-06-27 19:36:09 -07:00
Mark Otto 416cc6b2ee fix broke js markup 2013-06-27 19:33:26 -07:00
Mark Otto 51093fde18 fix makefile 2013-06-27 19:27:44 -07:00
Mark Otto 2af67238a4 Merge pull request #8332 from twitter/bs3_remove_icons
BS3: Remove Glyphicons
2013-06-27 19:23:55 -07:00
Mark Otto 8cd5d0be71 add docs callout for glyphicons on homepage and CSS page 2013-06-27 19:22:11 -07:00
fat b06ec345ce Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-27 19:19:57 -07:00
fat b0da97588e fixes #6982 2013-06-27 19:19:22 -07:00
Mark Otto 2981f0089f remove glyphicons from demo component 2013-06-27 18:51:06 -07:00
Mark Otto 879d517cb3 delete icons in assets 2013-06-27 18:49:59 -07:00
Mark Otto e5a9a1f5ff remove icons from sidenav 2013-06-27 18:49:37 -07:00
Mark Otto 62f76ad33f Merge branch '3.0.0-wip' into bs3_remove_icons
Conflicts:
	docs/components.html
2013-06-27 18:49:05 -07:00
fat 94761c2216 use collapse in dropdown js example 2013-06-27 18:47:35 -07:00
Mark Otto cb483b6758 Add parens so sublime picks up on syntax highlighting 2013-06-27 18:45:08 -07:00
Mark Otto 7636577681 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-27 18:43:54 -07:00
Mark Otto c9ccbd2cf0 Fixes #8329: add !important to .hidden 2013-06-27 18:43:29 -07:00
Mark Otto cb29ed0751 Merge pull request #8307 from cvrebert/8287-docs-patch
Fix #8287
2013-06-27 18:38:34 -07:00
Mark Otto 5e29c42211 remove custom url in jekyll 2013-06-27 18:38:00 -07:00
Mark Otto 296b9d7293 Merge pull request #8313 from jholl/patch-1
typo: match doc text and example
2013-06-26 11:42:04 -07:00
Mark Otto 68792fc1f9 Merge pull request #8306 from cvrebert/styling-n-typo
Docs: fix 1 typo; use <code> in 1 place
2013-06-26 11:20:14 -07:00
Mark Otto cd4f131c49 Merge pull request #8305 from cvrebert/copyedit
copyedit JS docs
2013-06-26 11:19:43 -07:00
Julian Thilo b4e0e4fee6 Adjust info callout, add callouts to docs
* Adjust the background-color of bs-callout-info to match danger and
warning in tone
* Convert all the callouts
* Change some callouts to info/warning
* Add new callout
2013-06-26 15:59:33 +02:00
James Holland 2471b9d725 typo: match doc text and example 2013-06-26 08:27:12 -04:00
Chris Rebert 242d92e09c Fix #8287 2013-06-25 20:18:30 -07:00
Chris Rebert 274a342657 Docs: fix 1 typo; use <code> in 1 place 2013-06-25 19:50:37 -07:00
Chris Rebert 694c650f8e copyedit JS docs 2013-06-25 19:32:17 -07:00
Mark Otto cc43ba35d7 Merge pull request #8301 from cvrebert/patch-3
Fix spelling in comment
2013-06-25 17:11:31 -07:00
Mark Otto 0f371d409f Merge pull request #8300 from cvrebert/patch-2
Fix typo in comment
2013-06-25 17:11:20 -07:00
Mark Otto 2da485d6bb Merge pull request #8299 from cvrebert/patch-1
Spelling in comment
2013-06-25 17:10:59 -07:00
Mark Otto 5c9bd469ae Merge pull request #8303 from cvrebert/patch-4
Fix 2 typos
2013-06-25 17:10:34 -07:00
Mark Otto ae9fde5cab Merge pull request #8304 from cvrebert/patch-5
rm :invalid styling from docs
2013-06-25 17:09:52 -07:00
Chris Rebert 266bdfcaaa rm :invalid styling from docs
It was removed from the code in 90d4343f66  :-/
2013-06-25 16:31:12 -07:00
Chris Rebert d82941265c Fix 2 typos 2013-06-25 17:07:51 -06:00
Bass Jobsen 321190535f Update mixins.less
Add a the function .make-small-column. See also http://stackoverflow.com/a/17308128/1596547
2013-06-26 01:05:45 +02:00
Chris Rebert 8ee0e39ef9 Fix spelling in comment 2013-06-25 17:05:26 -06:00
Chris Rebert d2b5f4e45c Fix typo in comment 2013-06-25 17:03:57 -06:00
Chris Rebert 64a01f01cb Spelling in comment 2013-06-25 17:01:46 -06:00
Mark Otto ac90fbf4d8 Merge pull request #8297 from cvrebert/patch-1
rm pre{white-space:pre-wrap;} since redundant to Normalize
2013-06-25 14:57:41 -07:00
Mark Otto 73ec8e031b Merge pull request #8298 from cvrebert/patch-2
rm fallback white-space for <code>
2013-06-25 14:57:17 -07:00
Chris Rebert 1bb159aa6f rm fallback white-space for <code>
If my analysis is right, this should be unnecessary.
2013-06-25 15:53:48 -06:00
Chris Rebert 9b97d63188 rm pre{white-space:pre-wrap;} since redundant to Normalize.css 2013-06-25 14:48:57 -07:00
Julian Thilo f00c885d4c Docs: create new callout classes 2013-06-25 23:12:36 +02:00
Mark Otto 211d6831fc Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-25 13:35:49 -07:00
Mark Otto 6ac063430f Merge pull request #8290 from juthilo/3.0.0-docs-nothird
Add new callouts to docs
2013-06-25 13:34:03 -07:00
Mark Otto 534ba060be Merge pull request #8292 from cvrebert/patch-1
fix "Data attributes" link in JS docs sidenav
2013-06-25 13:32:41 -07:00
Mark Otto 327a951ca3 Move mixin to mixins.less 2013-06-25 13:32:21 -07:00
Mark Otto 03e67e44f9 Merge pull request #8291 from cvrebert/refactor
refactor responsive-utilities slightly
2013-06-25 13:28:34 -07:00
Mark Otto 08ab44708d Merge pull request #8294 from cvrebert/patch-2
fix ID of Normalize heading in docs so that the sidenav can find it
2013-06-25 13:26:14 -07:00
Julian Thilo fe25ebc2af Recess welcome 2013-06-25 22:22:23 +02:00
Chris Rebert e46e63463a fix ID of Normalize heading in docs so that the sidenav can find it 2013-06-25 14:16:39 -06:00
Chris Rebert 4be21c422a fix "Data attributes" link in JS docs sidenav
`#js-data-attributes` => `#js-data-attrs`
2013-06-25 14:09:24 -06:00
Julian Thilo a87ea9345b Add IDs, adjust text 2013-06-25 21:59:34 +02:00
Chris Rebert 83c4073ec7 refactor responsive-utilities slightly 2013-06-25 12:23:56 -07:00
Julian Thilo 0f0e7fc376 Add a link to the mailing list for JS help 2013-06-25 21:19:19 +02:00
Julian Thilo 30e5e89fac Add callout to docs: LESS compiler support 2013-06-25 21:01:13 +02:00
Julian Thilo abb112173e Add callout to docs: 3rd-party libs not supported 2013-06-25 20:52:49 +02:00
Mark Otto e9951385b0 Merge pull request #8283 from luishdez/hotfix/add-on-breaks
Fix line breaks on add-ons with spaces
2013-06-25 09:37:56 -07:00
Luis Hdez 9ed5b5e653 Fix line breaks on add-ons with spaces 2013-06-25 14:34:57 +02:00
Mark Otto 5fe3de1cb3 Merge pull request #8270 from kylase/3.0.0-wip
Replaced <i> with <span> for glyphicon
2013-06-23 21:26:56 -07:00
Mark Otto 838bc93724 Merge branch 'master' of github.com:twbs/bootstrap-examples 2013-06-23 20:34:38 -07:00
Mark Otto 0dffb03c0b add gitignore and editorconfig 2013-06-23 20:33:37 -07:00
Kyle c455d92f9e Replaced <i> with <span> for glyphicon 2013-06-24 11:27:05 +08:00
Nicole 0a1c46a12c Merge branch 'master' of https://github.com/twbs/bootstrap-examples 2013-06-23 17:17:20 -07:00
Nicole 8e50e7a8f2 Update remaining templates to match starter template 2013-06-23 17:17:08 -07:00
Mark Otto 55120d124c Merge pull request #8268 from luishdez/hotfix/sidebar-overlap
Fix overlap sidebar for Tablets and up in docs
2013-06-23 15:16:25 -07:00
Mark Otto 573a197417 Move grid offsets to desktop only (fixes #8229) 2013-06-23 15:15:42 -07:00
Mark Otto 164e88781b Make on previous commits 2013-06-23 15:05:58 -07:00
Mark Otto b76d98eee3 Fixes #8211: restore proper table grid class behavior
Needs work though—we shouldn't be setting this stuff with the attribute
selectors, but it's the easiest solution for now.
2013-06-23 15:05:50 -07:00
Luis Hdez 5af22ab89f Fix overlap sidebar for Tablets and up in docs 2013-06-23 23:15:32 +02:00
Mark Otto eec86051a4 move readme to root 2013-06-23 13:21:40 -07:00
Mark Otto 2a47037ab0 Fixes #8266: remove unnecessary strong and em styles 2013-06-23 10:24:50 -07:00
Mark Otto 976322b2a6 run make on previous merge 2013-06-22 18:56:55 -07:00
Mark Otto bd2295014d Merge pull request #8261 from frabrunelle/patch-1
Reset left padding for .carousel-indicators
2013-06-22 18:56:20 -07:00
Mark Otto 471c409a12 Add basic readme 2013-06-22 18:29:13 -07:00
Francis Brunelle 7fd121fecb Reset left padding for .carousel-indicators 2013-06-22 21:38:02 -03:00
Mark Otto 5226490115 Create CNAME 2013-06-22 16:35:58 -06:00
Mark Otto 42f101d746 Merge pull request #8258 from aristath/navbar-fixes
Navbar fixes
2013-06-22 15:07:49 -07:00
Aristeides Stathopoulos 72183d9a45 Update variables.less 2013-06-22 18:45:25 +03:00
Aristeides Stathopoulos aad76f21f6 Update navbar.less 2013-06-22 18:44:04 +03:00
Aristeides Stathopoulos b51e1e0d8c Update navbar.less 2013-06-22 14:41:31 +03:00
Aristeides Stathopoulos 2ba3b47dc6 Update navbar.less
navbar padding-left and padding-right should be calculated from the grid-gutter-width variable.
2013-06-22 14:34:17 +03:00
Aristeides Stathopoulos 9360a25abf Merge pull request #10 from twitter/3.0.0-wip
3.0.0 wip
2013-06-22 04:26:09 -07:00
Mark Otto b0e943399d Improve alignment of navbar brand and fix up left padding on list groups 2013-06-21 17:21:44 -07:00
Mark Otto eba9b4de6c Reset padding on homepage links 2013-06-21 11:56:47 -07:00
Mark Otto 356100e74e Merge pull request #8251 from acmetech/3.0.0-wip
Remove offcanvas from footer and change placeholder in css.html
2013-06-21 09:11:54 -07:00
Tom Pietschker 9d43fbb57e Remove the offcanvas js from the footer
This was moved inline in 65ad52060e
2013-06-21 10:03:28 -04:00
Tom Pietschker 8ef3df418f Rename class name in placeholder
applies 2535e060a4 to css.html. Wasn't
docs.html removed a while ago?
2013-06-21 09:59:34 -04:00
Mark Otto 2535e060a4 Merge pull request #8244 from Quy/3.0.0-wip
Rename class name in placeholder
2013-06-20 22:55:11 -07:00
Quy Ton ac1058e435 Rename class name in placeholder 2013-06-20 18:44:19 -07:00
Mark Otto ef8e5853cb Fixes #8154: enforce full width .navbar-nav.pull-right in mobile
Prevents an odd alignment issue in mobile views by forcing the nav
links to be full width without undoing the float.
2013-06-20 17:15:09 -07:00
Mark Otto 82f9de9459 Fixes #8159: Be more specific about disabled inputs to avoid iOS bug
Attached disabled styles to the exact input types rather than all
inputs and reseting the checkbox/radios. If setting `background-color:
transparent;`, iOS renders no background on the disabled control.
2013-06-20 17:02:10 -07:00
Mark Otto 90d4343f66 Fixes #8093: Removes invalid focus styles on inputs 2013-06-20 16:42:05 -07:00
Mark Otto 4db90244c4 run make on previous commit 2013-06-20 16:27:39 -07:00
Mark Otto 2aec6dae59 Fixes #7730: Better hiding of empty titles in popovers
If the popover's title contains no text, hide it via JS. Previously was
done via CSS's `:empty` property, but that doesn't work in IE8, so JS
it is.

/cc @fat becaue I probably did this wrong <3
2013-06-20 16:02:05 -07:00
Mark Otto 2fccf927c5 Run make on last commit 2013-06-20 16:02:05 -07:00
Mark Otto eee719f608 Merge pull request #8193 from mediafreakch/3.0.0-wip
Fixes broken layout for .input-group-addons within .input-large. Follows...
2013-06-20 15:44:08 -07:00
Mark Otto f64fe29003 Move Glyphicons into their own repo
Removes the icon fonts and associated docs and LESS code from the core
repo and into twbs/bootstrap-glyphicons.
2013-06-20 15:40:37 -07:00
Mark Otto 1b89a63a48 Use @font-family-base for headings font-family variable 2013-06-20 15:38:18 -07:00
Mark Otto 3c60645ec0 Merge pull request #8237 from luishdez/feature/var-heading-family
Add heading font family variable
2013-06-20 15:36:49 -07:00
Mark Otto c5fb401a62 Move examples out of the main repo to twbs/bootstrap-examples
While examples are phenomenally useful and awesome for folks getting
started with Bootstrap, they don't really shine as well being buried in
the main docs. Moreover, having anything that's not core HTML, CSS, JS,
or documentation in the main repo seems to just get in the way.
Therefore, examples gets its own repo.

Specifically, we're doing the following:

* Deletes all example screenshots
* Deletes example layout
* Deletes example files
* Updates Getting Started docs to include only the template and a link
to the new examples project

All the examples and their history will be preserved in the switch.
2013-06-20 12:36:27 -07:00
Mark Otto 8383209521 run make on @nextgenthemes last commit 2013-06-20 09:58:21 -07:00
Mark Otto 175e4676dd Merge pull request #8241 from nextgenthemes/3.0.0-wip
rename '.navbar .nav' to '.navbar-nav'
2013-06-20 09:57:18 -07:00
nextgenthemes 110fc88601 rename '.navbar .nav' to '.navbar-nav' 2013-06-20 19:40:30 +03:00
Luis Hdez cd09f3213b Add heading font family variable 2013-06-20 12:50:30 +02:00
Mark Otto 14273cd53d add example screenshots dir 2013-06-19 23:17:17 -07:00
Mark Otto a550ea5113 minify latest bs3 2013-06-19 23:16:34 -07:00
Mark Otto f91559d85d update starter template to use new format; include latest BS3 CSS 2013-06-19 23:16:00 -07:00
Mark Otto 65ad52060e Offcanvas example update
* Remove plugin file and put JS inline
* Update grid layout to use tablet columns
* Switch from LESS to CSS for transition
* Pad footer sides for better mobile rendering
* Spacing cleanup
2013-06-19 20:31:03 -07:00
Mark Otto 9f73fef30a Offcanvas example update
* Remove plugin file and put JS inline
* Update grid layout to use tablet columns
* Switch from LESS to CSS for transition
* Pad footer sides for better mobile rendering
* Spacing cleanup
2013-06-19 20:31:03 -07:00
Mark Otto b0bece66f2 Merge branch 'offcanvas-example' of https://github.com/trumbitta/bootstrap into trumbitta-offcanvas-example 2013-06-19 19:13:38 -07:00
Mark Otto 84b6847c75 Merge branch 'offcanvas-example' of https://github.com/trumbitta/bootstrap into trumbitta-offcanvas-example 2013-06-19 19:13:38 -07:00
Mark Otto 5fcdf1229d Fixes #8001: add IDs for example inputs 2013-06-19 19:02:29 -07:00
Mark Otto badececcdf Merge pull request #8233 from zurt/patch-1
Add missing property to form-horizontal docs
2013-06-19 18:02:47 -07:00
Kurt MacDonald 98a8eaffc0 Add missing property to form-horizontal docs 2013-06-19 17:08:14 -06:00
Mark Otto 546d40a143 Add support for tr, th, and td to responsive utilities 2013-06-18 19:16:50 -07:00
Mark Otto 112dabb3c2 run make on last commit 2013-06-18 19:16:50 -07:00
Mark Otto 986c22a5c6 Merge pull request #8210 from cvrebert/backticks
docs/javascript.html: backticks -> <code>
2013-06-18 14:40:13 -07:00
Chris Rebert 7b60d04f0c docs/javascript.html: backticks -> <code> 2013-06-18 14:35:37 -07:00
Edgar Schnueriger 6a79f53899 Use correct font-size to calculate input-heights 2013-06-18 21:43:34 +02:00
Mark Otto 4b4079b224 Addresses #8199: darker default button 2013-06-18 11:16:43 -07:00
Mark Otto c6c3009dd0 Add note about Jekyll version per #8195 2013-06-17 21:36:03 -07:00
Mark Otto 4130a1093d Merge pull request #8182 from karelvuong/3.0.0-wip
3.0.0-wip - Fixed 'Running Doc. Locally" Link
2013-06-17 21:34:31 -07:00
Mark Otto bcc3af4b2a Fixes #7599: Improved print styles for a few key components
* Updates `.table` to always enforce a solid white background
* Update button groups and dropdowns to always use black carets
* Add a 1px solid black border to labels (in the future we should add a
border to these perhaps for better printing)
2013-06-17 20:56:02 -07:00
Mark Otto 37f4a25be4 Better clearing on .dl-horizontal for empty dd elements
Instead of clearing the entire `.dl-horizontal`, we've moved the
clearfix mixin to the `dd` level to solve two problems in one: empty
`dd`s mid-list, and empty `dd` as the last child.

Addresses a few old issues, including #2824, #3819, #3821, #4062,
#6707, and #7180.

Sorry that took so long :D.
2013-06-17 14:21:16 -07:00
Mark Otto 4436e727ed Properly unstyle the .list-unstyled class by switching from margin to padding
Also add better comments
2013-06-17 14:21:16 -07:00
Mark Otto 84c0dc13ba Remove explicit, unncessary line-height on li elements 2013-06-17 14:21:16 -07:00
Mark Otto 731cbb302e Better base ul and ol styles
Turns out we were nixing the default browser spacing for bullets and
numbers, so this reverts that and instead just twerks the top/bottom
`margin`.
2013-06-17 14:21:16 -07:00
Edgar Schnueriger b0d202455d Fixes broken layout for .input-group-addons within .input-large. Follows 6ce154c7ed 2013-06-17 18:56:17 +02:00
Mark Otto 5f3f73c620 Merge pull request #8184 from FLOKER/3.0.0-wip
redundant lines removed
2013-06-16 20:48:27 -07:00
Mark Otto abfcde4de2 Merge pull request #8189 from cvrebert/patch-2
components docs: backticks ==> <code>
2013-06-16 20:45:20 -07:00
Chris Rebert 5c63883062 components docs: backticks ==> <code> 2013-06-16 21:40:50 -06:00
Mark Otto 1555992e35 Merge pull request #8187 from imsky/3.0.0-wip
upgrade holder to 2.0, update thumbnail examples in docs to fit inside containers
2013-06-16 20:39:11 -07:00
Mark Otto ce17746302 Merge pull request #8188 from cvrebert/patch-1
CSS docs page: backticks ==> <code>
2013-06-16 20:38:31 -07:00
Chris Rebert 50df5de14f CSS docs page: backticks ==> <code> 2013-06-16 21:36:56 -06:00
Ivan Malopinsky c1655e6cbd upgrade holder to 2.0, update thumbnail examples in docs to fit inside containers 2013-06-16 23:16:56 -04:00
FLOKER 125e472d6f redundant lines removed 2013-06-16 22:18:46 +02:00
Mark Otto ac3521fef4 Remove WebKit overflow scrolling for now 2013-06-16 10:56:30 -07:00
Karel Vuong 0b7b40e281 Fixed link. 2013-06-15 22:23:09 -04:00
Mark Otto 6ce154c7ed Fixes #8175: Update input min-height vars to fix FF21 input rendering 2013-06-15 11:46:13 -07:00
Mark Otto 258e1d62fb Fix up broken input group example layouts 2013-06-15 11:37:59 -07:00
Mark Otto ecf9b020dd Merge pull request #8168 from marsuboss/patch-2
Duplicate ID navbar-example
2013-06-13 13:41:23 -07:00
Mark Otto ab162fe64e Merge pull request #8166 from liuyl/package
change version of recess to 1.1.7
2013-06-13 13:41:04 -07:00
Mark Otto c14f23192a Merge pull request #8167 from marsuboss/patch-1
Duplicate ID drop5
2013-06-13 13:40:40 -07:00
Mark Otto d363d96f4b Merge pull request #8169 from marsuboss/patch-4
Fix
2013-06-13 13:39:11 -07:00
marsuboss 1421a0e9bb Fix 2013-06-13 15:50:06 +03:00
marsuboss 436cffdaaf Duplicate ID navbar-example 2013-06-13 15:36:52 +03:00
marsuboss c6f51d0919 Duplicate ID drop5 2013-06-13 14:29:34 +02:00
liuyl 2c00a2fe2f change version of recess to 1.1.7 2013-06-13 19:27:26 +08:00
Mark Otto 949c7cca00 Merge pull request #8156 from baer/toggle-button-fix
Docs Customize toggle button used incorrect selectors
2013-06-12 16:59:40 -07:00
Mark Otto 47f8ba98f3 Merge pull request #8158 from baer/download-button-fix-proper
Docs "Customize and Download" button didn't send the correct parameters
2013-06-12 16:59:22 -07:00
Eric Baer 6771be1ced Docs Customize "Customize and Download" button not working properly 2013-06-12 14:01:59 -06:00
Eric Baer 7f8703ef86 Docs Customize toggle button used incorrect selectors 2013-06-12 12:51:10 -06:00
Mark Otto 40751305f8 Merge pull request #8124 from eins78/3.0.0-wip-fix-json
fix JSON syntax error in composer.json
2013-06-10 16:37:29 -07:00
Max F. Albrecht 3a02d07aca fix JSON syntax error in composer.json 2013-06-10 14:59:42 +02:00
Ivan Khalopik e138b0df3a Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip 2013-06-10 10:31:51 +03:00
Mark Otto d74a9634b0 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-09 23:45:23 -07:00
Mark Otto 9fac2c0467 Update docs JS to prevent clicks on links with hash hrefs 2013-06-09 23:45:14 -07:00
Mark Otto 9ba11ba60a No more need for grid column highlighting, so nuke that 2013-06-09 23:44:14 -07:00
Mark Otto 993efebe4f Redo grid documentation
* Update example sections to include basic, mobile-desktop, and mobile-tablet-desktop implementations
* Add more examples to the grid example page
* Red columns instead of gray for more Bootstrapy aesthetic
2013-06-09 23:43:43 -07:00
Mark Otto 0a18d33d2c Redo grid documentation
* Update example sections to include basic, mobile-desktop, and mobile-tablet-desktop implementations
* Add more examples to the grid example page
* Red columns instead of gray for more Bootstrapy aesthetic
2013-06-09 23:43:43 -07:00
Mark Otto 8b136f5b66 Merge pull request #8080 from mladenplavsic/patch-2
Update css.html
2013-06-08 20:53:37 -07:00
Mark Otto 254eba37b2 Merge pull request #8097 from burnsra/3.0.0-wip-addons
Set validation states also for addons
2013-06-08 20:15:30 -07:00
Mark Otto eb21410cc8 add new grid subnav link 2013-06-08 18:36:29 -02:30
Mark Otto 441bbe1998 Another grid update
* Update docs to include table of grid levels and behaviors
* Change from .col-md to .col-sm to match existing size variables we use elsewhere
* Keep .col-lg as-is though for simplicity as we won't likely add a fourth level of the grid
* Combine responsive .container breakpoints with grid breakpoints in grid.less
* Other misc docs updates
2013-06-08 18:34:16 -02:30
William Ghelfi df5ddeb7cc Set validation states also for addons 2013-06-06 21:00:32 -04:00
Mladen Plavsic 232c03dc2f Update css.html
Missing word "in" in "Someone famous in Source Title"
2013-06-05 13:59:13 +03:00
Mark Otto b1cc11cd98 reverse order of grid column examples for dual grid section 2013-06-04 21:55:59 -07:00
Mark Otto 567b8b5631 fix docs highlighting of grid 2013-06-03 21:58:58 -07:00
Mark Otto 37cd7b8596 nuke the .col 2013-06-03 21:57:51 -07:00
Mark Otto 245ebda651 nuke the .col 2013-06-03 21:57:51 -07:00
Mark Otto 45c5b4e45c restore .col-*-12 classes for now 2013-06-03 21:51:35 -07:00
Mark Otto 286955167a prep for less 1.4 with double parens in functions 2013-06-03 21:48:52 -07:00
Mark Otto a05f6d4cea fixes #8066: add missing % functions to grid less code 2013-06-03 11:58:38 -07:00
Mark Otto e5bdb2497e fixes #8062: correct link to editorconfig website 2013-06-03 11:55:55 -07:00
Mark Otto 1b8cd2d8eb Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-02 15:51:35 -07:00
Mark Otto 2f70477621 fixes #8059: update navbar responsive break variable 2013-06-02 15:51:28 -07:00
Mark Otto 21441f1292 Move the grid offset, push, and pull classes to be tablets-up instead of desktop-up 2013-06-02 15:33:42 -07:00
Mark Otto e787e5fc68 Merge pull request #8058 from burnsra/3.0.0-wip-navbar-toggle
Fix navbar toggles
2013-06-02 15:30:28 -07:00
Mark Otto 4e4e75d4ac homepage url change to go with it for v3 2013-06-02 15:26:10 -07:00
Mark Otto 05be4de8b8 fixes #7915: add issues link to composer 2013-06-02 15:25:19 -07:00
Mark Otto 56d6fea45e fixes #7018: authors, not author, in composer 2013-06-02 15:22:53 -07:00
Robert Burns afe0ab13dd Fix navbar toggles 2013-06-02 17:51:36 -04:00
Robert Burns 97e6e5f150 Fix navbar toggles 2013-06-02 17:51:36 -04:00
Mark Otto 4fa1e729f0 Merge pull request #8050 from sindresorhus/patch-1
Rename component.json to bower.json
2013-06-02 14:40:42 -07:00
Mark Otto bd170e8366 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-02 14:08:50 -07:00
Mark Otto ddf95c91db Merge pull request #8057 from burnsra/3.0.0-wip-getting-started
Fix layout for examples in getting-started
2013-06-02 14:08:21 -07:00
Mark Otto b5095d3e8a Merge pull request #8046 from burnsra/3.0.0-wip-carousel
Fix for carousel indicators
2013-06-02 13:48:18 -07:00
Mark Otto 19d0726609 Grid updates
- Removed mixins for generating grid classes
- Thus, we manually declare every grid class, from 1-11 (12th unit is
excluded as that's the same as no grid columns)
- No more need for `.col` base class (yay!)
- Negative indent the rows at tablets and above once again (ugh, still
working through this part)
- Add support for `.col-md` for tablet-specific grid columns
- Still need to figure out offsets, pushes, and pulls on other
devices—right now only available on desktop
2013-06-02 13:38:45 -07:00
Robert Burns 19ce707a00 Fix layout for examples in getting-started 2013-06-02 15:52:51 -04:00
Mark Otto b62fa23d9a Merge pull request #8006 from aristath/3.0.0-wip
using screen-size variables for grids
2013-06-02 11:58:30 -07:00
Mark Otto 75db70a6c2 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-02 11:57:28 -07:00
Sindre Sorhus ab6dd6e76e Rename component.json to bower.json
That's the new name of the Bower metafile.
2013-06-01 22:59:13 +02:00
Robert Burns cc684750e5 Fix for carousel indicators 2013-06-01 08:15:40 -04:00
Mark Otto a4c1248ca0 Merge pull request #8022 from ecentinela/3.0.0-wip
Remove form-actions-bg
2013-05-30 13:49:53 -07:00
Javier Martinez Fernandez c89a6edf09 Remove form-actions-bg
If form-actions has been removed, this variable is no needed anymore.
2013-05-29 22:09:33 +03:00
fat f5ce66177b fix event binding in modal.js 2013-05-29 11:24:00 -04:00
Mark Otto 8899c30f16 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-27 19:23:17 -07:00
Aristeides Stathopoulos 6fda25b4c1 Adding variables for container sizes 2013-05-27 23:00:39 +03:00
fat a7a87c8e8c rebuild 2013-05-27 12:48:16 -07:00
fat 9257bdc097 fixes #7163 2013-05-27 12:45:13 -07:00
Aristeides Stathopoulos 2b088ef44e using screen-size variables for grids 2013-05-27 19:33:14 +03:00
Ivan Khalopik 3285f4c306 Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
Conflicts:
	js/bootstrap-collapse.js
2013-05-27 11:06:31 +03:00
Jan Škrášek 33b5c32c8c Fixed mixin btn-pseudo-state background for [disabled] buttons 2013-05-26 18:14:25 +02:00
Mark Otto 60575dfb46 Gradients refactor
* Add start and end support to the horizontal gradient as well
* Change all variables from camelCase to use-dashes
* Better comments in the gradients mixins area
* Update current uses of gradients in dropdowns and carousel to specify only two values by direct assignment of variables
2013-05-25 13:16:15 -07:00
Jacob Thornton 7cbb1c0452 add data-ride=carousel support for starting carousel on load 2013-05-25 00:16:52 -07:00
Jacob Thornton e424b3879c fixes #4781 2013-05-24 23:53:44 -07:00
Jacob Thornton f3e45c3778 add show/shown hide/hidden events to dropdown + update dropdown links for testing + catch a few missed namespace things 2013-05-24 23:15:04 -07:00
Mark Otto 5ea070bdf6 Merge branch '3.0.0-wip' of https://github.com/hppycoder/bootstrap into hppycoder-3.0.0-wip 2013-05-24 21:18:07 -07:00
Mark Otto f820de4b32 Merge pull request #7980 from burnsra/3.0.0-wip
Use base padding for input-group-addon class
2013-05-24 20:55:58 -07:00
Robert Burns 79666385f7 Use base padding for input-group-addon class 2013-05-24 08:14:11 -04:00
Mark Otto 3160bd872e rearrange customizer content 2013-05-23 21:34:32 -07:00
Mark Otto 371d14e217 Remove commented out code and properly nest CSS again for .collapse 2013-05-23 21:06:02 -07:00
Mark Otto a3cba92edd rejigger the customizer layout 2013-05-22 23:45:12 -07:00
Mark Otto acc0875259 fix up customizer js and classes; turn buttons into real buttons 2013-05-22 23:34:28 -07:00
Mark Otto 432d417ade fixes #6898: typo in modal test 2013-05-22 23:17:39 -07:00
Mark Otto 9868d9403c Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-22 21:51:54 -07:00
Mark Otto cdcc3e8768 delete customize layout since it's no longer in use 2013-05-22 21:50:25 -07:00
Mark Otto 41d2b707ed Merge branch '3.0.0-wip' of https://github.com/juthilo/bootstrap-wip into 3.0.0-wip 2013-05-22 21:48:35 -07:00
Julian Thilo 52a348aa3f Bring the customizer up to speed
I reworked the customizer to match the new docs layout and include all
newly added variables, etc.
Would be glad to keep an eye on Customize and update it as v3 changes.
Help blocks in my new version need some more work, too, so this is just
a basis.
2013-05-23 02:30:58 +02:00
fat e7b4fedee8 remove 3rd arg from $.each call 2013-05-22 15:18:30 -07:00
Mark Otto bb9d867cf8 remove make gh-pages command 2013-05-21 19:56:25 -07:00
Jacob Thornton 7cbec6e89a remove jszip files 2013-05-21 19:33:57 -07:00
Jacob Thornton ccfa989898 upgrade jshint to 2.1.2 for anton <3 2013-05-21 19:31:51 -07:00
Mark Otto 59010184cb Merge pull request #7945 from AJ-Acevedo/fix
Fixed broken Customizer link for docs
2013-05-21 14:44:29 -07:00
Mark Otto ddbfe4af7a Fixes #7943: typo in makefile 2013-05-21 14:43:12 -07:00
Chad Smith c47d9932cb Found editor spacing issues with tabs instead of spaces, formatting to fit the entrance criteria 2013-05-21 16:29:35 -04:00
Chad Smith 230d6de88a Vertical gradients now can have percentages passed in as arguments to allow finer control over the backgrounds it produces 2013-05-21 16:25:59 -04:00
AJ Acevedo 9a2218dd38 Fixed broken Customizer link for docs 2013-05-21 02:23:19 -04:00
Mark Otto 930913e0a0 Back to getbootstrap.dev for jekyll 2013-05-20 10:45:01 -07:00
Mark Otto 554c24d9ae Update contributing file
* Remove notes on repo section
* Update hirearchy of coding standards sections
2013-05-20 00:33:08 -07:00
Mark Otto 13a4fb678b Refactor readme to include directions on running jekyll locally 2013-05-20 00:25:41 -07:00
Mark Otto 0c167a1d9d Fixes #7474: Use @input-height-base in .navbar-vertical-align() for .navbar-form 2013-05-19 22:12:48 -07:00
Mark Otto 35573db810 Fixes #7611: fix optgroup formatting for Firefox 2013-05-19 22:06:10 -07:00
Mark Otto 9ecde4aab7 Better grid template; link color change in docs navbar 2013-05-16 22:11:31 -07:00
Mark Otto 5f7352a6fe Better grid template; link color change in docs navbar 2013-05-16 22:11:31 -07:00
Mark Otto 551d729083 More row change ups:
* No more negative side margins
* However, keep the negative margin for nested rows
2013-05-16 21:03:56 -07:00
Mark Otto 5fbb9e9f5d More row change ups:
* No more negative side margins
* However, keep the negative margin for nested rows
2013-05-16 21:03:56 -07:00
Mark Otto e94e5e8b40 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-16 20:54:14 -07:00
Mark Otto c0f5a0775d Run make on latest JS 2013-05-16 20:54:06 -07:00
Mark Otto 9762f95bde Change up link alerts
* No more children selectors to set all links in alerts as a special color because buttons and more wrongly inherited color
* Adds .alert-link for easy styling in any alert
2013-05-16 20:53:59 -07:00
fat abc49c729b update js docs 2013-05-16 20:42:31 -07:00
Mark Otto 0f4b4acce1 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-16 20:32:37 -07:00
Mark Otto 8a3e982305 Fix broke dropdown navbar example 2013-05-16 20:29:50 -07:00
fat 2433a076ac Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-16 20:20:27 -07:00
fat 140ef2320b change namespace back to dot notation and someother js shizzle 2013-05-16 20:19:51 -07:00
Mark Otto 5dd6dbd624 Nuke rem font-size mixin 2013-05-16 20:18:03 -07:00
Mark Otto 1983ca03ec Form validation and horizontal row update
* changed .row-label to .control-label as used elsewhere already
* changed .formFieldState mixin to .form-field-validation
2013-05-16 20:17:42 -07:00
Mark Otto 55a1416789 remove prettyprint js mention 2013-05-16 20:07:48 -07:00
Mark Otto af0b9cb41a Simple responsive utilities test css 2013-05-16 20:07:41 -07:00
Mark Otto e5d6a40a77 Redo the responsive utilities stuff
* Update docs language
* Enforce display: block; on all utilities for now
* Fix up docs CSS for the tests
2013-05-16 19:13:58 -07:00
Mark Otto bdd5022833 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-16 18:46:19 -07:00
Mark Otto c73588b313 Drop .form-actions 2013-05-16 18:46:12 -07:00
fat 5ab72f7687 fix tooltip defaults 2013-05-16 18:45:53 -07:00
Mark Otto d2b588b10e nuke unfinished readme section 2013-05-16 18:38:09 -07:00
Mark Otto 94dec1bbd2 Update readme link to Bower per #7790 2013-05-16 18:37:00 -07:00
fat e74110bf4a Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-16 18:35:18 -07:00
fat c072b6b2fc remove dumb assets update makefile wassup 2013-05-16 18:34:51 -07:00
Mark Otto d8b749a4d3 Fix z-index of carousel indicators 2013-05-16 18:29:53 -07:00
fat b239542a5e carousel bug with data 2013-05-16 18:21:42 -07:00
fat f37b351288 only overlay dropdowns for mobile 2013-05-16 18:15:34 -07:00
fat a72d0d6e3a fix tests 2013-05-16 17:44:50 -07:00
fat 19de2e8603 add bs- prefix to tooltip 2013-05-16 17:19:23 -07:00
fat 149ecd21bf straight trash wang 2013-05-16 17:18:15 -07:00
Mark Otto 53bc93282f nuke that docs _site folder 2013-05-16 13:46:12 -07:00
fat 92245e8bc7 change dropdown strategy to use an overlay - fixes mobile click anywhere + allows for firefox middle click 2013-05-16 12:50:06 -07:00
fat bdbd268cb9 update collapse js style 2013-05-16 11:20:18 -07:00
fat a4c16155a2 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	Makefile
	docs/_site/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.min.js
	docs/customize.html
	docs/docs.html
2013-05-16 11:08:46 -07:00
fat 14651035de a bunch javascript junk 2013-05-16 11:06:30 -07:00
Mark Otto f3d8577734 Run make on previous commit; twerk box shadow back to commented out version 2013-05-15 10:16:11 -07:00
Mark Otto bae9d8adf0 Merge pull request #7897 from voodoom/outline-fix
#7896: Outline fix
2013-05-15 10:14:21 -07:00
Mark Otto 6307dc40d7 Fixes #7898: ensure button type
Sets `type="button"` on all buttons in the docs
2013-05-15 10:01:09 -07:00
m.seegmüller 6289e24f66 Fixed ugly outline in select fields
Removes .tab-focus() on select-fields
2013-05-15 16:14:44 +02:00
m.seegmüller 7780133c1c Fixed ugly outline
Removes outline (especially on select-elements in firefox)
2013-05-15 15:44:28 +02:00
Mark Otto 31dcb91189 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	docs/assets/css/docs.css
2013-05-14 23:28:09 -07:00
Mark Otto 57856e6cfb Merge pull request #7877 from burnsra/3.0.0-wip-form-inline
Cleanup form-inline examples in docs
2013-05-14 23:26:35 -07:00
Mark Otto fcb7c9da6f Fixes #7878: .col-span-* mentions to .col-lg-* 2013-05-14 23:24:29 -07:00
Mark Otto 28a081cb20 Overhaul form control and button sizing, and some type styles
* New padding approach with separate horizontal and vertical padding
variables
* Improved sizing in large and small buttons and form controls
* Dropped the `.btn-mini` (since we have no `.input-mini` to match, and
holy fuck those were small buttons)
* Dropped the `.pagination-mini` as well because once again, to hell
with such small components
* Changed `@line-height-headings` to `@headings-line-height`
* Removed the `@headings-font-family` because it was honestly kind of
useless
2013-05-14 23:21:30 -07:00
Mark Otto a41d566d5e margin on bottom of navbar nav by default, also round links in mobile views (unround in desktop) 2013-05-14 22:08:56 -07:00
Mark Otto e56c809492 refined navbar styles in docs 2013-05-14 22:08:32 -07:00
Mark Otto 7e674efa22 outdent the file list 2013-05-14 22:00:08 -07:00
Mark Otto 0ac1af13d3 Merge pull request #7882 from juthilo/3.0.0-wip
Cleaning the navbar docs
2013-05-14 19:43:59 -07:00
Mark Otto e23f661f3f Fixes #7885 and #7886: only right align horizontal form labels when above 768px 2013-05-14 18:59:13 -07:00
Mark Otto 1d8ff36afa Add .panel-footer 2013-05-14 18:55:37 -07:00
Julian Thilo cd2d7b5d17 add detail to navbar component alignment section
* The search form has been deprecated.
* Using pull-* on a list item won't have any effect.
2013-05-14 22:42:06 +02:00
Julian Thilo 9af88380c4 .navbar docs: update -fixed-* callouts, fix -link
* The navbar is now always 50px high, so no need for that nasty padding
code block anymore.
* The new proposed body padding value also reflects the default navbar's
margin-bottom.
* Fixed the navbar-link example positioning (missing .navbar-text).
2013-05-14 22:31:15 +02:00
Robert Burns 45f62f9589 Cleanup form-inline examples in docs 2013-05-14 08:33:49 -04:00
Mark Otto 8544ef8734 Merge pull request #7874 from burnsra/3.0.0-wip-form-examples
Fix glyphicon in "Dropdown in a button group" example
2013-05-13 19:15:05 -07:00
Robert Burns da9cf1009b Fix glyphicon in "Dropdown in a button group" example 2013-05-13 21:40:48 -04:00
Mark Otto 5ebd6a4966 Merge pull request #7872 from burnsra/3.0.0-wip-caret
Fix caret position
2013-05-13 17:21:05 -07:00
Robert Burns a38a3429fc Fix caret position 2013-05-13 20:03:53 -04:00
Mark Otto 8ae6256262 Merge pull request #7866 from marsuboss/patch-3
Fix
2013-05-13 12:02:32 -07:00
marsuboss 4eeebe7e06 Fix 2013-05-13 15:50:02 +03:00
Mark Otto 37898d5e19 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-13 00:09:35 -07:00
Mark Otto 2c6e854eea fix broken responsive utilities table 2013-05-12 23:54:10 -07:00
Mark Otto dd7bb71554 spacing 2013-05-12 21:00:37 -07:00
Mark Otto 2093635de1 Merge branch '3.0.0-wip' of https://github.com/rvinay88/bootstrap into rvinay88-3.0.0-wip 2013-05-12 20:57:07 -07:00
Mark Otto e9f42ecfda Merge pull request #7861 from burnsra/3.0.0-wip
Couple of fixes for docs and examples
2013-05-12 19:20:55 -07:00
Robert Burns 4910e779ab Fix buttons within examples 2013-05-12 22:04:22 -04:00
Robert Burns d4546cbcc2 Fix buttons within examples 2013-05-12 22:04:22 -04:00
Robert Burns 046d82f0ef Fix invalid input within docs 2013-05-12 22:04:01 -04:00
Mark Otto 79a4269430 Fix navbar button docs 2013-05-12 16:34:12 -07:00
Mark Otto 41a76e8e7a Less specific dropdown styles, change up navbar dropdown styles 2013-05-12 16:30:54 -07:00
Mark Otto 09098a7923 run make on last commit 2013-05-12 16:13:51 -07:00
Mark Otto da4e7ab15c fix broke example 2013-05-12 16:13:39 -07:00
Mark Otto 37c1122ded Consolidate active dropdown toggle styles and comment out the rest 2013-05-12 16:12:13 -07:00
Mark Otto 2d10d61fde Restore commented out dropdown styles, get open dropdown state working again 2013-05-12 16:03:56 -07:00
Mark Otto 92adcfabb5 Start some nav and dropdown cleanup
* Remove border-radii on top of tab dropdown menus
* Remove the .dropdown and .dropup styles and instead place  on all
* Use  on dropdown carets intead of separately applying margin with a top alignment
* Some other misc cleanup
2013-05-12 15:47:18 -07:00
Vinay Raghu ca5685c1f8 Timestamp correction 2 2013-05-12 12:25:56 +05:30
Vinay Raghu 3b6b9b3fa6 Timestamp correction 2013-05-12 12:25:47 +05:30
Vinay Raghu 23b32fec65 Recompiled using makefile recess 2013-12-05 01:36:19 +05:30
Mark Otto 184018837b Merge pull request #7851 from blakeembrey/input-group-btn-radius
[v3] Fix the selectors for the .input-group-btn class
2013-05-11 12:25:46 -07:00
Blake Embrey 60c24ddd97 Fix the selectors for the .input-group-btn selector. 2013-05-11 09:38:48 -07:00
Vinay Raghu 9880f7c803 Changed Responsive utilities section in docs/css.html 2013-05-11 19:34:59 +05:30
Vinay Raghu 5e13f57870 Changed Screen Notations on responsive-utilities.less and recompiled the stylesheet 2013-05-11 19:28:59 +05:30
Mark Otto 8051695c87 Merge pull request #7838 from blakeembrey/btn-group-radius
Remove the overrides and resets from button groups
2013-05-10 16:35:25 -07:00
Mark Otto 76ecfdfdc1 Font-size and line-height tweaks
* Use 1.428 for line-height instead of 1.5
* Use  function for full pixel values instead of decimals
2013-05-10 10:33:35 -07:00
Mark Otto 8261866ff2 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-10 10:31:52 -07:00
Mark Otto 758cb9d186 twerk nested nav links 2013-05-10 10:29:54 -07:00
Mark Otto 6dee7d5abe Merge pull request #7845 from aricketson/3.0.0-wip
Fix component margin and padding values to use @line-height-computed
2013-05-10 10:05:58 -07:00
Mark Otto 231318e757 Merge pull request #7843 from burnsra/3.0.0-wip
Fix link to examples
2013-05-10 10:04:32 -07:00
Aaron 94cc333553 Fix component margin and padding values to use @line-height-computed 2013-05-10 09:21:27 -06:00
Robert Burns 3af1dd1dc8 Fix link to examples 2013-05-10 07:37:14 -04:00
Mark Otto e34abd02cc redo docs footer a bit 2013-05-09 17:36:02 -07:00
Mark Otto 562483b907 more nav twerks for getting started page 2013-05-09 17:32:39 -07:00
Mark Otto dbbd48f7bc remove duplicate text scaling 2013-05-09 17:29:07 -07:00
Mark Otto 90e4ff73d2 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	less/forms.less
2013-05-09 17:22:48 -07:00
Mark Otto a19fda699d update reference to value of base line-height 2013-05-09 17:21:18 -07:00
Mark Otto 6fba68eb8b Unitless line-height
* Instead of 20px as @line-height-base, use 1.5
* Update typographic scale for headings to use unitless as well--required some twerking of decimals a bit and some rounding
* Introduce new @line-height-computed value, which takes base font-size and multiplies it by 1.5, for use in padding and margin on components
2013-05-09 17:20:46 -07:00
Blake Embrey 579d566299 Update button groups to use not selector and remove redundant CSS. 2013-05-09 16:53:28 -07:00
Mark Otto 7b6352d2cf Fix up navbar forms by using inline form as a mixin; fix docs for those 2013-05-09 16:41:35 -07:00
Mark Otto 3c72b1e9a0 remove the input from an example 2013-05-09 16:31:10 -07:00
Mark Otto 1fdfee8de0 Merge pull request #7837 from blakeembrey/input-group-radius
Remove input-group border radius resets
2013-05-09 16:30:48 -07:00
Mark Otto 293a3baca3 More forms overhaul
* Refactor the .forms-horizontal code--much simpler now and built on the Bootstrap grid system instead
* Remove all the margins on form controls for simpler styling everywhere else--was overriding that way too often
* Drop .help-inline, but keep .help-block
* Drop the unused input grid class overrides
2013-05-09 15:05:06 -07:00
Blake Embrey 9716b73f67 Make the border-radius on input-groups to be overrides instead of resets on every size. 2013-05-09 14:48:27 -07:00
Mark Otto 7a7971d6db subnav for icons section 2013-05-09 14:08:06 -07:00
Mark Otto 8f9cc5ae81 Merge pull request #7836 from blakeembrey/icon-antialias
Make icons antialiased on Webkit browsers
2013-05-09 13:59:18 -07:00
Blake Embrey 4a03d45651 Make icons antialiased on Webkit browsers. 2013-05-09 13:48:02 -07:00
Mark Otto d5e6bbba27 fix some broke buttons on the js page 2013-05-09 13:28:05 -07:00
Mark Otto ec39bed94f Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-09 13:19:38 -07:00
Mark Otto 1d6971dc2b Merge pull request #7835 from blakeembrey/progress-bars
Remove backface-visibility from progress bars
2013-05-09 13:18:39 -07:00
Mark Otto 88a4712540 fix broken buttons on css docs 2013-05-09 13:12:40 -07:00
Blake Embrey cc5e6619b4 Remove backface-visibility from progress bars. 2013-05-09 13:09:33 -07:00
Mark Otto 7fa6ae578b Update getting started page 2013-05-09 11:40:39 -07:00
Mark Otto 25b6df9944 rename welcome to getting started 2013-05-09 11:20:15 -07:00
Mark Otto 7c94f5ef64 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-09 09:22:58 -07:00
Mark Otto 751eb0bdcc Fixes #7823: add mention of container to CSS page; build out CSS overview subnav 2013-05-09 09:22:49 -07:00
Mark Otto 217ac7b7b7 Merge pull request #7824 from burnsra/3.0.0-wip-examples
Fix form in navbar
2013-05-09 09:14:31 -07:00
Mark Otto d731690352 remove lingering typeahead reference in makefile 2013-05-09 09:09:44 -07:00
Robert Burns 71377771fe Fix form in navbar 2013-05-09 07:21:22 -04:00
Robert Burns 3a539abbd2 Fix form in navbar 2013-05-09 07:21:22 -04:00
Mark Otto 766be659c1 .bs-docs-sidenote to .bs-callout 2013-05-08 22:58:54 -07:00
Mark Otto 526dfb7735 .bs-docs-tooltip-examples to .bs-example-tooltips 2013-05-08 22:57:42 -07:00
Mark Otto 09c3a4b3bc .bs-docs-example to .bs-example 2013-05-08 22:56:29 -07:00
Mark Otto ac28ad81d0 .bs-docs-footer to .bs-footer; nuke .bs-docs-container css; remove .bs-docs-container from footer 2013-05-08 22:55:17 -07:00
Mark Otto 705063c73a .bs-docs-social-* to .bs-social-* 2013-05-08 22:54:25 -07:00
Mark Otto 22f212379f nuke stuff from customizer 2013-05-08 22:53:31 -07:00
Mark Otto 3c3e56ca50 .bs-docs-top to .bs-top 2013-05-08 22:52:48 -07:00
Mark Otto e5e5f6616c .bs-docs-header to .bs-header 2013-05-08 22:51:44 -07:00
Mark Otto 67b7a2fc34 docs css reorg 2013-05-08 22:50:41 -07:00
Mark Otto d7acf4e82d more work on the sidenav, including small css refactor and new classes 2013-05-08 22:42:42 -07:00
Mark Otto f09b07dc2a more navbar and header tweaks 2013-05-08 22:31:49 -07:00
Mark Otto fa4d4e8d88 new docs page headers 2013-05-08 22:29:53 -07:00
Mark Otto 241d342363 red navbar for docs 2013-05-08 22:24:07 -07:00
Mark Otto 65289bb1ea make restored top navbar collapsable 2013-05-08 22:17:26 -07:00
Mark Otto feeaaa6feb refactor homepage jumbotron masthead doodad 2013-05-08 22:13:56 -07:00
Mark Otto 07aed1abc3 move social buttons to separate include 2013-05-08 22:07:28 -07:00
Mark Otto edb733ebc7 Super massive docs overhaul
* Bring back the navbar up top
* Pull the docs content back into separate pages because a 6.6k line docs file is just crazy
* Recenter the page content and bring back affixed side nav (needs work)
2013-05-08 21:56:08 -07:00
Mark Otto 88dd9de9ba Drop typeahead.js--instead try Twitter's typeahead plugin 2013-05-08 20:04:54 -07:00
Mark Otto 54561f1121 hide entire navbar in print views 2013-05-08 19:57:42 -07:00
Mark Otto 1cb880b4f1 Fixes #7816: revert negative margin on .navbar-nav 2013-05-08 19:55:20 -07:00
Mark Otto 509f2244da Merge pull request #7809 from twitter/bs3_adding_btn_default
BS3: Require .btn-default for all standard buttons
2013-05-08 11:47:43 -07:00
William Ghelfi 7090eb0061 Merge branch 'offcanvas-example' of github.com:trumbitta/bootstrap into offcanvas-example 2013-05-08 14:26:55 +02:00
William Ghelfi 94c067e76f Merge branch 'offcanvas-example' of github.com:trumbitta/bootstrap into offcanvas-example 2013-05-08 14:26:55 +02:00
William Ghelfi 9013ff002a add offcanvas layout example based on bradfrost/this-is-responsive 2013-05-08 14:25:37 +02:00
William Ghelfi 5e033dcc20 add offcanvas layout example based on bradfrost/this-is-responsive 2013-05-08 14:25:37 +02:00
Mark Otto f03d337151 indentation fix 2013-05-07 23:43:51 -07:00
Mark Otto c459c657f8 Update forms
* Overhaul the form control sizing section to only show sizing via grid columns as parents, not as classes on inputs
* Restore the inline-form option
* Restore the bottom margin on form controls and make them block level instead of inline-block
* More misc docs cleanup for forms
2013-05-07 21:56:55 -07:00
Mark Otto c0e23ad27b nuke the unused navbar that was leftover 2013-05-07 20:48:37 -07:00
Mark Otto 86598cac6b Fixes #7796: change @list-group-active-text to @list-group-active-color 2013-05-07 20:01:57 -07:00
Mark Otto d7f84d1220 Require .btn-default for regular buttons
* Instead of , use  for standard, gray button
* Improves ability to customize buttons by encouraging folks to not override .btn and thus overriding all button modifier classes
* Updates docs to reflect the change
* Reorganize buttons CSS
2013-05-07 18:07:06 -07:00
Mark Otto ad5f88e1c5 Update config after updating to jekyll 1.0.1 2013-05-07 18:03:32 -07:00
Mark Otto 79dac4b77a Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-07 10:33:49 -07:00
Mark Otto f06294d80f Outdent nav links a bit more so they line up in navbar 2013-05-07 10:33:41 -07:00
Mark Otto bb307243de Merge pull request #7806 from koenpunt/patch-1
Updated URL for jekyll installation
2013-05-07 09:13:48 -07:00
Koen Punt 739ef39050 Updated URL for jekyll installation 2013-05-07 15:20:28 +03:00
Ivan Khalopik 3c7a43a1f3 Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
Conflicts:
	js/tests/unit/bootstrap-collapse.js
2013-05-07 15:16:45 +03:00
Mark Otto b352f98f32 Merge pull request #7798 from mediafreakch/3.0.0-wip
fixed not working example code for modals
2013-05-06 23:44:12 -07:00
William Ghelfi 01d0cf22ab add offcanvas layout example based on bradfrost/this-is-responsive 2013-05-06 15:58:18 +02:00
William Ghelfi 18be5f6d42 add offcanvas layout example based on bradfrost/this-is-responsive 2013-05-06 15:58:18 +02:00
Edgar Schnueriger 240305321f fixed not working example code for modals 2013-05-06 09:48:05 +02:00
Mark Otto 17713a6d39 correct right nav in navbar examples 2013-05-04 15:00:59 -07:00
Mark Otto 716c869b89 correct right nav in navbar examples 2013-05-04 15:00:59 -07:00
Mark Otto 49da7d8020 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-04 13:11:31 -07:00
Mark Otto dcf7cc084d Fixes #7783: nuke bottom margin on fixed-bottom-navbar 2013-05-04 13:11:20 -07:00
Mark Otto d0e79a36d5 Merge pull request #7782 from cvrebert/patch-1
use @screen-small var in grid.less
2013-05-04 13:09:53 -07:00
Chris Rebert e0b9b86d32 use @screen-small var in grid.less
Per comment by @nextgenthemes on/in cd06c5baac
2013-05-03 17:38:58 -07:00
Mark Otto c3b9ac4676 Merge pull request #7621 from jeremydenoun/patch-1
Fix flickering on progress bar width update
2013-05-03 17:32:54 -07:00
Mark Otto 7d41a38769 Fixes #7511: add support for nested button groups so you can use dropdowns in your button groups 2013-05-03 16:16:26 -07:00
Mark Otto ee0789ff8f Fixes #7721: change @navbar-text to @navbar-color, along with inverse options 2013-05-03 15:29:32 -07:00
Mark Otto a6f7f96a93 recompile after last justified nav tweaks 2013-05-03 15:29:10 -07:00
Mark Otto a0d02368a3 Update justified nav CSS for proper selectors 2013-05-03 15:18:27 -07:00
Mark Otto 4357ed72e0 Update justified nav CSS for proper selectors 2013-05-03 15:18:27 -07:00
Mark Otto 747e108e0b Merge pull request #7670 from DarDar/3.0.0-wip
Use @font-size-... variables instead of hardcoded font-size in px
2013-05-03 15:05:29 -07:00
Mark Otto af4a33f8c0 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-03 14:57:07 -07:00
Mark Otto e1d947f53e Scope .table-bordered styles to immediate children only 2013-05-03 14:56:57 -07:00
Mark Otto 9d9fd5e0d1 remove .fade from static modal example, but include in code snippet 2013-05-03 14:46:09 -07:00
Mark Otto 1bce9b295d Merge pull request #7769 from holic/3.0.0-sticky-footer
Use padding instead of #push with box-sizing: border-box
2013-05-03 14:29:11 -07:00
Mark Otto 0959a78ff1 Merge pull request #7769 from holic/3.0.0-sticky-footer
Use padding instead of #push with box-sizing: border-box
2013-05-03 14:29:11 -07:00
Mark Otto 7cceaa6956 Merge branch 'bs3_cdn_docs_mention' into 3.0.0-wip
Conflicts:
	docs/docs.html
2013-05-03 14:13:06 -07:00
Mark Otto 14861e9cc3 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-03 14:11:23 -07:00
Mark Otto b5d68f59c2 Add cursor: pointer; to .checkbox and .radio and their inline counterparts 2013-05-03 11:56:00 -07:00
Mark Otto b0bd5899c5 Merge pull request #7762 from sethlilly/3.0.0-wip
Corrected typo in carousel.html
2013-05-03 11:21:13 -07:00
Mark Otto 77102dd2e4 Merge pull request #7770 from holic/3.0.0-input-border-transition
Fix input border flicker in Chrome
2013-05-03 10:59:52 -07:00
Mark Otto 1587b8948f run make on previous commits 2013-05-03 10:53:26 -07:00
Mark Otto e1c67b149f More navbar CSS and docs cleanup
* Rearrange sections
* Add code snippets for text and links in navbars
* Add .navbar-link back in
* Add mention of .navbar-text, but it still needs to be re-implemented
* Update nav to reflect new order
2013-05-02 23:13:43 -07:00
Mark Otto 94792b9dae Improve buttons in navbars
* Add top margin, calculated by subtracting height of an input from height of a navbar, and dividing by two
* Uses the same method as .navbar-form
* To use, add .navbar-btn to any button outside a form element
* Also add section to docs detailing buttons in navbars, and add more ids for the other unlinked and unmentioned sections in the side nav
2013-05-02 23:05:09 -07:00
Mark Otto 23ae6405f5 delete lingering navbar dividers code since we nuked that awhile back 2013-05-02 22:58:30 -07:00
Mark Otto bec8c90fd7 Cleanup .navbar-form styles
* Nuke the commented out navbar forms code that's not currently needed
* Add a few more examples to the .navbar-form docs section
* Remove (for now at least) top padding on checkbox and radios
2013-05-02 22:54:14 -07:00
Mark Otto a4f2c9e156 add customizer link to docs homepage 2013-05-02 22:44:43 -07:00
Kevin Ingersoll 08fea3304a Fix input border flicker in Chrome from @garoevans, closes #7689 2013-05-03 15:33:12 +12:00
Kevin Ingersoll a0aaa222a6 Use padding instead of #push with box-sizing: border-box 2013-05-03 15:23:10 +12:00
Kevin Ingersoll 07117f97b6 Use padding instead of #push with box-sizing: border-box 2013-05-03 15:23:10 +12:00
Seth Lilly c8daf15985 Corrected typo in carousel.html
Changed text from "First featurette headling" to "First featurette heading" in the first `h2.featurette-heading` tag.
2013-05-02 14:03:54 -03:00
Seth Lilly a62e97091c Corrected typo in carousel.html
Changed text from "First featurette headling" to "First featurette heading" in the first `h2.featurette-heading` tag.
2013-05-02 14:03:54 -03:00
DarDar 9cd3a92713 Use @font-size-... variables instead of hardcoded font-size in px 2013-05-02 08:05:00 +02:00
Mark Otto c63b793a0d Merge pull request #7750 from hppycoder/3.0.0-wip
Updating the README.md to fix the link to Bower
2013-05-01 11:50:29 -07:00
Chad Smith 9237b25300 Updating the README.md to fix the link to Bower 2013-05-01 13:47:52 -04:00
Mark Otto f8fd524def add the fade class to the default modal docs 2013-04-30 19:55:02 -07:00
Mark Otto 47155e8aa3 outdent the rows for tablets and above 2013-04-30 19:35:52 -07:00
Mark Otto 0780faad45 make that left/right padding, not top/bottom on navbar 2013-04-30 19:20:41 -07:00
Mark Otto 69f5447afa add back bottom margin to navbars 2013-04-30 19:12:48 -07:00
Mark Otto e8b7318646 no need for zero padding on navbar top/bottom; better comment 2013-04-30 19:07:28 -07:00
Mark Otto 6dd4cbd20b no units on 0 values 2013-04-30 19:06:30 -07:00
Mark Otto 0f17f9b7f7 Fixes #7744: update grid mixin to use latest grid styles 2013-04-30 13:03:10 -07:00
Mark Otto e67d3818ed nuke line numbers 2013-04-30 11:32:11 -07:00
Mark Otto 26bc36107e Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-04-28 22:46:10 -07:00
Mark Otto e13d05317e single colon pseudo element for ie8 2013-04-28 22:45:56 -07:00
Mark Otto 0cb1188a9c Merge pull request #7718 from burnsra/3.0.0-wip-breadcrumbs
Cleanup breadcrumb divider last item
2013-04-28 20:14:26 -07:00
Mark Otto 57564cf64c Merge pull request #7719 from burnsra/3.0.0-wip-grid-examples
Update examples after grid changes
2013-04-28 20:05:15 -07:00
Robert Burns f76c222089 Update examples after grid changes 2013-04-28 22:22:33 -04:00
Robert Burns 62afdd0176 Update examples after grid changes 2013-04-28 22:22:33 -04:00
Robert Burns 447be1b326 Cleanup breadcrumb divider last item
Modify to hide both padding and leading/trailing whitespace
Thanks to https://github.com/holic for suggestion
2013-04-28 21:51:02 -04:00
Mark Otto cd06c5baac Merge pull request #7704 from twitter/bs3_moar_grid_changes
BS3: Overhaul grid system once more
2013-04-28 18:44:54 -07:00
Mark Otto 781692ffa2 Merge pull request #7716 from burnsra/3.0.0-wip-navbar
Fix navbar-toggle after commit bbee78b30b
2013-04-28 18:42:20 -07:00
Robert Burns c087e383ed Fix navbar-toggle after commit bbee78b30b
The following commit introduced an issue with the navbar toggle placement:
https://github.com/twitter/bootstrap/commit/bbee78b30b40ff0b1473a06ea7ecf5a42d51b614
2013-04-28 20:45:42 -04:00
Mark Otto 5edfdc02f2 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-04-28 14:27:58 -07:00
Mark Otto bbee78b30b derp on navbar toggle and docs positions 2013-04-28 14:27:48 -07:00
Mark Otto 227c4639e4 Merge pull request #7713 from burnsra/3.0.0-wip-navs-overhaul
Fix navbar on phone/tablet devices after navbar overhaul
2013-04-28 14:26:10 -07:00
Mark Otto 1a28d50b33 Merge pull request #7712 from burnsra/3.0.0-wip-navs
Update examples after navbar overhaul
2013-04-28 14:24:49 -07:00
Robert Burns 3326e1b21e Fix navbar on phone/tablet devices after navbar overhaul 2013-04-28 10:09:57 -04:00
Robert Burns 7f0f731d6d Update examples after overhaul of navbar navs 2013-04-28 09:10:01 -04:00
Robert Burns ddc0e98716 Update examples after overhaul of navbar navs 2013-04-28 09:10:01 -04:00
Mark Otto 8b3a1702d4 Overhaul navbar navs
* Switch from  to  to eliminate an element in selectors
* Drop .navbar-divider entirely
2013-04-27 18:28:39 -07:00
Mark Otto 2ffa0e4409 Add maximum bounds variables for so our responsive utilities don't overlap 2013-04-27 11:55:45 -07:00
Kevin 9ce7f22e99 Adding media queries breakpoints variables 2013-04-27 18:47:47 +02:00
Mark Otto efd3b0c171 Back to two grid classes, .col and .col-lg-* 2013-04-26 23:59:51 -07:00
Mark Otto 8ae9c6ab34 Fixes #7688: move font-weight for glyphicons to before pseudo element 2013-04-26 23:14:06 -07:00
Mark Otto aa146582d6 Redo the getting started section to mention BootstrapCDN 2013-04-26 20:51:48 -07:00
Mark Otto 57ba494409 running make 2013-04-26 10:44:44 -07:00
Mark Otto 1fc0d2c0f1 Merge pull request #7641 from Fowowski/3.0.0-wip
more nested less rules - labels component
2013-04-25 14:51:41 -07:00
Artur Kwiatkowski 270db6f55e - changed comments
- added hover and focus state for [href] color variations
2013-04-24 14:38:53 +02:00
Stephen Edgar 8311ad513f 'docs' folder .editorconfig code guide updates 2013-04-24 14:38:51 +02:00
Stephen Edgar f40ea21a6c 'js' folder .editorconfig code guide updates 2013-04-24 14:38:50 +02:00
Stephen Edgar 22a1a7273a 'less' folder .editorconfig code guide updates 2013-04-24 14:38:49 +02:00
Stephen Edgar 75ccaadae0 'root' folder .editorconfig code guide updates 2013-04-24 14:38:49 +02:00
Mark Otto 8a3b212043 shoutout to editorconfig in readme 2013-04-24 14:38:48 +02:00
Mark Otto da4a08754a explicit callout in readme for building static assets; fixes #7632 2013-04-24 14:38:47 +02:00
Chris Rebert 159105dad3 Fixes #7661 2013-04-24 14:38:46 +02:00
Stephen Edgar ec7f2cf2b6 'root' repo end 'insert_final_newline = true' 2013-04-24 14:38:46 +02:00
Stephen Edgar 67fdb27518 Use* global rules with exceptions as needed 2013-04-24 14:38:44 +02:00
Stephen Edgar dd7249c0f1 Refined .editorconfig 2013-04-24 14:38:44 +02:00
Stephen Edgar 2eb9053d4a Include .editorconfig
http://editorconfig.org/
2013-04-24 14:38:43 +02:00
Mark Otto 3e02d127b3 Merge pull request #7664 from ntwb/editorconfig-3.0.0-wip
Editor Config (.editorconfig) Code Guide Update
2013-04-23 08:58:23 -07:00
Stephen Edgar 1a6dbc371e 'docs' folder .editorconfig code guide updates 2013-04-23 17:40:41 +10:00
Stephen Edgar 1b132ddcb4 'js' folder .editorconfig code guide updates 2013-04-23 17:34:27 +10:00
Stephen Edgar 7ebfc17028 'less' folder .editorconfig code guide updates 2013-04-23 17:30:22 +10:00
Stephen Edgar 36ed570b7d 'root' folder .editorconfig code guide updates 2013-04-23 17:27:29 +10:00
Mark Otto c81f0b5af2 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-04-22 23:04:24 -07:00
Mark Otto a4f896ef1a shoutout to editorconfig in readme 2013-04-22 23:02:57 -07:00
Mark Otto dea134d6ee explicit callout in readme for building static assets; fixes #7632 2013-04-22 23:01:11 -07:00
Mark Otto 73793637d1 Merge branch 'ntwb-editorconfig' into 3.0.0-wip 2013-04-22 22:58:33 -07:00
Mark Otto 10a1a0af86 Merge pull request #7662 from cvrebert/less-1.4-fixes
Fixes #7661
2013-04-22 20:38:14 -07:00
Chris Rebert 269b8aa761 Fixes #7661 2013-04-22 16:11:11 -07:00
Artur Kwiatkowski 55bbb9ffd7 Nuked local .a() mixins and simplified the nesting 2013-04-22 15:34:23 +02:00
Artur Kwiatkowski b7dcefea83 Merge branch '3.0.0-wip' of https://github.com/twitter/bootstrap into 3.0.0-wip 2013-04-22 15:21:55 +02:00
Stephen Edgar 08de413608 'root' repo end 'insert_final_newline = true' 2013-04-22 17:19:56 +10:00
Stephen Edgar 4e9c8880f7 Use* global rules with exceptions as needed 2013-04-22 17:10:59 +10:00
Mark Otto e0d60b1325 Fixes #7617: lowercase and dash gray color vars 2013-04-21 19:35:36 -07:00
Mark Otto 364f8330a1 Fixes #7648: Thumbnail caption should use @text-color variable. Also adds other thumbnail vars 2013-04-21 18:29:06 -07:00
Mark Otto af63a4405d typo 2013-04-21 18:25:49 -07:00
Mark Otto 30d6e0530e Fixes #7577: Attempt to fix, at least, issues with Windows Phone 8 and responsive not kicking in correctly 2013-04-21 14:50:44 -07:00
Stephen Edgar 7c41b31801 Refined .editorconfig 2013-04-21 16:52:32 +10:00
Mark Otto 4b3a43e381 Fixes #7591: add .make-small-column() mixin 2013-04-20 15:54:44 -07:00
Mark Otto 2d5ab9a2de Make alerts use variables better 2013-04-20 15:47:07 -07:00
Mark Otto dc4436dbc9 Only use .danger for alerts, no more .error 2013-04-20 15:36:11 -07:00
Mark Otto 0c9b161bb8 Fixes #7093: more consistent scrollspy docs 2013-04-20 15:32:16 -07:00
Mark Otto 510c9a6ad8 First pass at updated responsive utilities to be mobile-first. Pulled from #7490 by @apotropaic 2013-04-20 12:33:09 -07:00
Mark Otto 04d782efab correct grid class in example code 2013-04-20 12:29:12 -07:00
Mark Otto 70f8d77012 correct grid class mention in docs 2013-04-20 12:28:36 -07:00
Mark Otto a956a3258b Alternate docs mention of breadcrumbs separator, as called out in #7601 2013-04-20 12:23:27 -07:00
Mark Otto e60c07327b Merge branch 'reversefold-master' into 3.0.0-wip
Conflicts:
	README.md
2013-04-20 12:13:05 -07:00
Mark Otto ba7d928c37 Merge pull request #7645 from burnsra/3.0.0-wip-docs
Fix carousel examples within docs
2013-04-20 12:11:35 -07:00
Mark Otto afdab35aca Fixes #7640: only reset margin on last-child p within blockquotes 2013-04-20 12:09:08 -07:00
Mark Otto 90b195872e Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-04-20 12:02:43 -07:00
Robert Burns ce719925af Fix carousel examples within docs 2013-04-20 13:26:18 -04:00
Artur Kwiatkowski 3861e3f5d5 replaced parametric .is() mixin with non-parametric .a() to simplify usage 2013-04-20 15:54:48 +02:00
Stephen Edgar 322fc9a6c4 Include .editorconfig
http://editorconfig.org/
2013-04-20 14:28:50 +10:00
Artur Kwiatkowski 39bb8146f8 more nested labels component 2013-04-19 21:31:55 +02:00
Mark Otto 61ea1ae909 Merge pull request #7598 from wangshishuo/3.0.0-wip
change nav's #tables-hover to #tables-hover-rows
2013-04-18 19:48:17 -07:00
Mark Otto 5c9bd1a221 Merge pull request #7608 from Fowowski/3.0.0-wip
more nested less rules - pager component
2013-04-18 19:47:26 -07:00
Mark Otto f47aa08bad Merge pull request #7629 from Boulox/dupe-table-rule
Remove dupe css rule of table element
2013-04-18 19:45:56 -07:00
Fabien 7b5fcc2c9a Remove dupe css rule of table element
This are already declare in normalize
2013-04-19 02:48:08 +02:00
Mark Otto a8391da414 Update mixins to remove Opera prefixes on gradients; reorder rules for consistency 2013-04-18 12:46:31 -07:00
Jeremy Denoun d3e0d4a7ba update docs 2013-04-18 17:05:50 +02:00
jeremydenoun cc15c0e769 Fix flickering on progress bar width update
Issue visible on lastest version of Chrome Browser (if you update progress bar width from 100% to 0%) -> flickering appears

Fixed with addition of .backface-visibility(hidden) mixins
2013-04-18 17:44:46 +03:00
Artur Kwiatkowski 4bd6abaff2 applied @pagination-bg for .disabled state instead of hardcoded color in hex 2013-04-17 19:47:23 +02:00
Artur Kwiatkowski 67a5d8ce74 more nested pager.less 2013-04-17 17:32:48 +02:00
wangshishuo 5892cea207 change nav's #tables-hover to #tables-hover-rows 2013-04-17 12:27:30 +08:00
Justin Patrin 496f1933bb watchr should be lower-case 2013-04-16 13:07:05 -07:00
Mark Otto da35a6b437 Merge pull request #7590 from Fowowski/3.0.0-wip
more nested less rules - navs component
2013-04-16 11:32:53 -07:00
Artur Kwiatkowski dc97a1967b more nested navs 2013-04-16 16:45:51 +02:00
Mark Otto 5b38a1a357 Merge branch 'bs3_homepage' into 3.0.0-wip 2013-04-15 00:16:40 -07:00
Mark Otto 5471ce8ea3 Fixes #5256: Use > selector for better nesting of tables 2013-04-14 20:33:54 -07:00
Mark Otto ab7070bb49 change var from @table-border to @table-border-color 2013-04-14 19:45:32 -07:00
Mark Otto 02eba5e5fc center 2013-04-14 16:31:52 -07:00
Mark Otto 7dca242b5e nuke all the assets 2013-04-14 15:33:48 -07:00
Mark Otto 8d9106f2c5 nuke hidden homepage content 2013-04-14 15:32:52 -07:00
Mark Otto 0b3e9ced54 Merge branch '3.0.0-wip' into bs3_homepage 2013-04-14 13:45:10 -07:00
Mark Otto 526534f337 more copy edits to sidenotes 2013-04-14 13:01:00 -07:00
Mark Otto ccb6ac570f lighter .highlight in sidenotes as well 2013-04-14 13:00:53 -07:00
Mark Otto 0a84a7c43d shorter copy 2013-04-14 12:56:21 -07:00
Mark Otto 32761b3303 use spaces for indenting, not tabs /cc @juthilo 2013-04-14 12:54:56 -07:00
Mark Otto f78945ccc9 More contrast with code snippets in sidenotes 2013-04-14 12:54:02 -07:00
Mark Otto 5f88887c7e redo all the things 2013-04-14 12:49:35 -07:00
Julian Thilo 2b228bae60 More work on the sidenotes
* Convert more inline advices (compatibility, dependencies, ...) to
sidenotes
* Add sidenotes for:
** Note on plugin dependencies in general
** Required padding for navbar-fixed- (incl. code snippet)
* Fixed text for the small tag
2013-04-14 18:36:11 +02:00
Mark Otto f226463b05 Restore on links in dropdowns as they are randomly breaking onto new lines 2013-04-13 23:54:51 -07:00
Mark Otto 86bb3b8126 IE8 doesn't need help with responsive images, they work just dandy apparently (see http://jsbin.com/idesit/1) 2013-04-13 23:17:39 -07:00
Mark Otto eefddb1eab more indenting 2013-04-13 22:49:21 -07:00
Mark Otto 20259e2350 fixes #7191 and cleans up indenting some 2013-04-13 22:48:44 -07:00
Mark Otto fc8b9fb07d swap all bold p tags in sidenotes for h4s 2013-04-13 22:10:34 -07:00
Mark Otto 382a86f46e Merge branch '3.0.0-docs1' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs1 2013-04-13 21:50:17 -07:00
Mark Otto 5fbe66307f more specific comment, better placement of code 2013-04-13 21:45:21 -07:00
Julian Thilo d7bc89b433 Sidenotes instead of alerts
* I propose: make the docs rely more heavily on the new design language,
replace alerts (not the .alert examples) by sidenotes.
* Remove alert-heading class, which no longer exists in CSS.
2013-04-14 04:04:01 +02:00
Paul Tyng bec5679264 update docs bootstrap.css 2013-04-13 17:13:14 -03:00
Paul Tyng 811a79e16c override normalize.css override 2013-04-13 16:46:17 -03:00
Mark Otto ae98f1803f add modal variables and tweak padding for min-height on modal title 2013-04-12 20:56:19 -07:00
Mark Otto a96dd1bd28 Merge branch '3.0.0-wip' of https://github.com/garvincasimir/bootstrap into garvincasimir-3.0.0-wip 2013-04-12 20:45:10 -07:00
Mark Otto 96f332578c ignore local ruby version files 2013-04-12 20:43:41 -07:00
Mark Otto 58c8c770d8 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-04-11 20:18:22 -07:00
Mark Otto b3bb89520d add comma; more accurate code snippet 2013-04-11 20:16:20 -07:00
Mark Otto 5b7596a5b3 Merge branch '3.0.0-wip' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-wip 2013-04-11 20:12:53 -07:00
Mark Otto 991a353a26 Merge pull request #7539 from lucaflisi/3.0.0-wip
Remove BOOTSTRAP_RESPONSIVE_LESS in css compile
2013-04-11 20:10:00 -07:00
Mark Otto 7acadc09db Merge pull request #7546 from CoffeeAndCode/3.0.0-wip
fixed typo in typography documentation
2013-04-11 19:54:17 -07:00
Mark Otto f05befff6d Merge pull request #7537 from ntwb/patch-1
Fix docs.html Table Row Danger CSS Class
2013-04-11 19:45:46 -07:00
Jonathan Knapp 0d70b3c54e fixed typo in typography documentation 2013-04-11 16:02:29 -03:00
lucaflisi 43b0a1287a Remove BOOTSTRAP_RESPONSIVE_LESS in css compile
No more needed in Bootstrap 3
2013-04-11 14:01:23 +02:00
Stephen Edgar 3dc8be74fe Fix docs.html Table Row Danger CSS Class 2013-04-11 20:24:13 +10:00
Mark Otto a35b9b7d0c Merge pull request #7528 from acolchado/3.0.0-wip
[3.0.0-wip] Reordering variables that were being used before they were declared. Fixes compiler crashes.
2013-04-10 22:51:41 -07:00
Julian Thilo 78d64e97e9 Dusting the docs
* Fix some typos, grammar, sentence structure
* Fix left-over error tr class
* Remove uneditable inputs section
* Make compatibility sections stand out as sidenotes
* Make modal example scrollable on big screens, too
* Make some examples more self-explanatory
2013-04-10 19:18:04 +02:00
Agustin Colchado 7fb1c1cb89 Reordering variables that were being used before they were declared. Under some compilers (dotless & sublime 2 package), this would cause the compile to break. Variables in question were:
@dropdown-link-active-bg
@navbar-link-color
@navbar-inverse-link-color
2013-04-10 02:27:11 -07:00
Mark Otto 78df99c8bd Merge pull request #7523 from juthilo/3.0.0-wip
Fully update docs to col-...-* schema
2013-04-09 22:43:30 -07:00
Julian Thilo ece78ff086 cololol
Correct all span, push, pull, offset classes to col- schema
Fix a typo
2013-04-10 00:04:44 +02:00
Mark Otto 24f8d9e137 don't use table for label variatons 2013-04-09 10:43:37 -07:00
Mark Otto 1a546278b9 make back to top and big headings only for tablets and up 2013-04-09 10:20:50 -07:00
Mark Otto dd533aaaf0 better buttons on mobile 2013-04-09 10:16:37 -07:00
Mark Otto 5b04985722 Merge pull request #7504 from acmetech/3.0.0-wip
variable update - fixed
2013-04-08 10:16:15 -07:00
Tom Pietschker 09b97a3b95 hopefully fixed messed up stylesheet... 2013-04-08 08:46:12 -04:00
Tom Pietschker bd789ed158 Merge remote-tracking branch 'upstream/3.0.0-wip' into 3.0.0-wip 2013-04-08 08:39:22 -04:00
Mark Otto c2a35f1ec8 Merge pull request #7148 from retlehs/3.0.0-wip
Remove -webkit-backface-visibility on skew mixin
2013-04-07 23:01:28 -07:00
Mark Otto 92977fb13e fixes #7503: don't do dat 2013-04-07 22:58:16 -07:00
Tom Pietschker a05ff7e507 rename btn bg variables so that they are consistent with the other variables 2013-04-07 17:52:12 -04:00
Tom Pietschker c4d8aa2b0f rename the navbar-inverse-brand variables for consistency 2013-04-07 17:47:53 -04:00
Mark Otto cfea6d295e Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-04-07 11:49:53 -07:00
Mark Otto fedf4c5677 Merge pull request #7500 from JamieKnight/patch-3
Update docs to add warning about accessibility implications of using icons without any text
2013-04-07 11:46:23 -07:00
Mark Otto 7ff40635d4 fixes #7497: use var for jumbotron border radius 2013-04-07 11:44:17 -07:00
Jamie Knight c78c66527d Update docs.html
Added heads up regarding lone icons providing accessibility issues for screen readers.
2013-04-07 16:25:00 +02:00
Mark Otto 647e930e49 Merge pull request #7495 from philfreo/3.0.0-wip
Fix typo in docs
2013-04-06 22:33:44 -07:00
Phil Freo 06a4bb38c0 Fix typo in docs 2013-04-06 21:02:24 -07:00
Garvin 05710e10f7 Added min-height to modal-header for modals with no header text 2013-04-06 21:48:53 -04:00
Mark Otto 330e9b16c2 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-04-05 11:47:12 -07:00
Mark Otto 7a8d071735 use font-size-base var 2013-04-05 11:42:29 -07:00
Mark Otto b99c170ef7 Merge pull request #7469 from apotropaic/3.0.0-wip
updated docs, changed out span* for col-span-*
2013-04-03 11:51:42 -07:00
Andrew Scofied c1ab200985 updated docs, changed out span* for col-span-* 2013-04-03 09:48:39 -07:00
Mark Otto eadfa59d92 Add small grid for phones and tablets 2013-04-02 19:40:43 -07:00
Mark Otto 610eb8fb78 sidenote edit under customization section 2013-04-02 18:02:53 -07:00
Mark Otto c570ae49ef fix that sidenav 2013-04-02 16:22:42 -07:00
Mark Otto b78dfb5a4c refactor some of the carousel caption stuff to center it and tighten styles up; update carousel template to start to redo mobile first 2013-04-02 16:17:04 -07:00
Mark Otto 0ac711059b refactor some of the carousel caption stuff to center it and tighten styles up; update carousel template to start to redo mobile first 2013-04-02 16:17:04 -07:00
Mark Otto 0f51a750a8 Merge branch 'example-fix' of https://github.com/Boulox/bootstrap into Boulox-example-fix 2013-04-02 14:49:42 -07:00
Mark Otto 2cd34a1a85 Fixes #7462: add radial-gradient spec to mixin 2013-04-02 14:48:45 -07:00
Mark Otto 54b2a0b541 Merge pull request #7453 from burnsra/3.0.0-wip-nav
Fix responsive view for inverted navbar example
2013-04-02 08:44:25 -07:00
Fabien 8093426e40 Improve responsiveness for tablet and below of navbar in carousel example
- Remove margin-top of navbar-wrapper
- Remove border radius of navbar
- Space out the carousel
2013-04-02 13:39:04 +02:00
Fabien e56461fbd7 Improve responsiveness for tablet and below of navbar in carousel example
- Remove margin-top of navbar-wrapper
- Remove border radius of navbar
- Space out the carousel
2013-04-02 13:39:04 +02:00
Fabien 8f99692f56 remove unused img from previous commit 2013-04-02 13:31:15 +02:00
Fabien 6e6820b388 Replace png img by holder.js in carousel example 2013-04-02 13:30:13 +02:00
Fabien e0bce6af12 Replace png img by holder.js in carousel example 2013-04-02 13:30:13 +02:00
Fabien fb94710d9a Fix corss link for sticky footer 2013-04-02 13:26:35 +02:00
Fabien aa51a36686 Fix corss link for sticky footer 2013-04-02 13:26:35 +02:00
Fabien ed54b6dcf7 Fix link to navbar doc 2013-04-02 13:22:31 +02:00
Fabien 9ecc43d21a Fix link to navbar doc 2013-04-02 13:22:31 +02:00
Robert Burns 3233155bb4 Fix responsive view for inverted navbar example 2013-04-01 22:02:35 -04:00
Mark Otto 7e31bea114 run make 2013-04-01 13:25:51 -07:00
Mark Otto 8454d07372 Merge branch '3.0.0-wip-carousel' of https://github.com/burnsra/bootstrap into burnsra-3.0.0-wip-carousel 2013-04-01 13:17:31 -07:00
Mark Otto 12f043f1bb Merge branch '3.0.0-wip-carousel' of https://github.com/burnsra/bootstrap into burnsra-3.0.0-wip-carousel 2013-04-01 13:17:31 -07:00
Mark Otto 292734d7f3 Docs examples update
* Remove unused fluid image
* Add image, link, and description for new grid example
* Update sign in example image
2013-04-01 13:14:39 -07:00
Mark Otto a1d64950a9 only negative indent nested grid rows; add new grid example 2013-04-01 12:55:48 -07:00
Mark Otto eac987c0d2 only negative indent nested grid rows; add new grid example 2013-04-01 12:55:48 -07:00
Mark Otto a0726e605f add type attr 2013-04-01 12:10:53 -07:00
Mark Otto e6d6fcffb0 button for navbar toggle 2013-04-01 12:09:49 -07:00
Mark Otto 93db7c2c74 more link fixing 2013-04-01 11:14:11 -07:00
Mark Otto c231dba7ee updated links on homepage 2013-04-01 11:10:56 -07:00
Robert Burns 7991062f93 Additional cleanup to responsive navbar 2013-04-01 12:58:40 -04:00
Robert Burns 89bbeec898 Additional cleanup to responsive navbar 2013-04-01 12:58:40 -04:00
Robert Burns 994e36806c Add carousel indicators to example 2013-04-01 09:29:43 -04:00
Robert Burns 1816483baa Add carousel indicators to example 2013-04-01 09:29:43 -04:00
Robert Burns ff363323e6 Update carousel-caption btn styles 2013-04-01 09:27:49 -04:00
Robert Burns e183dd46a2 Update carousel-caption btn styles 2013-04-01 09:27:49 -04:00
Mark Otto 19d5e61668 clearer separation with section headers; simpler customizing copy 2013-04-01 00:34:58 -07:00
Mark Otto 7bee10a5ef oops, restore customizer 2013-04-01 00:11:47 -07:00
Mark Otto 9df6dc81b5 bring in customizing bootstrap section from old gist 2013-04-01 00:02:51 -07:00
Mark Otto d8b3e48e14 add proper markup to list group in panels section 2013-03-31 22:58:01 -07:00
Mark Otto 2f8deea95a add .panel-primary 2013-03-31 22:22:52 -07:00
Mark Otto 0fbfa167e1 fix text class in docs 2013-03-31 19:55:05 -07:00
Mark Otto 3365d4a06a Merge branch '3.0.0-wip-fixes' of https://github.com/burnsra/bootstrap into burnsra-3.0.0-wip-fixes 2013-03-31 19:28:27 -07:00
Mark Otto c69310153e Fixes #7438: remove max-height from justified nav tabs with some CSS wankery 2013-03-31 19:26:40 -07:00
Robert Burns ccb9ecfe44 Fix image paths and carousel controls for carousel example 2013-03-31 21:47:02 -04:00
Robert Burns d299ff4fce Fix image paths and carousel controls for carousel example 2013-03-31 21:47:02 -04:00
Mark Otto 4c49458336 remove text-rendering optimizeLegibility from headings 2013-03-31 18:40:07 -07:00
Mark Otto 8e59357bc5 Merge branch 'SBoudrias-patch-1' into 3.0.0-wip
Conflicts:
	less/type.less
2013-03-31 18:39:49 -07:00
Mark Otto db284a97d6 more consistent navbar vars 2013-03-31 17:56:31 -07:00
Mark Otto 4cbefa1179 remove unused responsive navbar vars 2013-03-31 17:37:28 -07:00
Mark Otto 0441bbba42 more consisten dropdown vars 2013-03-31 17:36:23 -07:00
Mark Otto 896ee79473 more consistent forms vars; drop search border radius since no more search form 2013-03-31 17:33:55 -07:00
Mark Otto 8b9d488377 more consistent btn vars 2013-03-31 17:32:45 -07:00
Mark Otto b7fa0d3434 -background to -bg for body and table vars 2013-03-31 17:29:05 -07:00
Mark Otto d6f37f3c56 @link-color-hover to @link-hover-color 2013-03-31 17:27:22 -07:00
Mark Otto 376bd20b3a -background to -bg on wells vars 2013-03-31 17:25:52 -07:00
Mark Otto 52e4148302 better grid var comments 2013-03-31 17:25:27 -07:00
Mark Otto 626189dbfc @state-*-background to @state-*-bg vars 2013-03-31 17:24:06 -07:00
Mark Otto d5fa1d80bb use @pagination- vars on pager component; change @pagination-bg-active to @pagination-active-bg 2013-03-31 17:22:12 -07:00
Mark Otto 996ec4ca69 -background to -bg on pagination vars 2013-03-31 17:20:16 -07:00
Mark Otto f2e5c32936 -background to -bg on jumbotron vars 2013-03-31 17:19:47 -07:00
Mark Otto 6b23a66c29 -background to -bg on tooltip and popover vars 2013-03-31 17:19:12 -07:00
Mark Otto cf843c5cad -background to -bg on labels vars 2013-03-31 17:18:07 -07:00
Mark Otto b56371b145 active item on list group should use @component-active-bg 2013-03-31 17:17:25 -07:00
Mark Otto c5042e050e fix nav divider 2013-03-31 17:17:10 -07:00
Mark Otto 388a4c878d remove lingering rem 2013-03-31 13:20:54 -07:00
Mark Otto 5c601e7ac2 new @component-active-bg variable 2013-03-31 12:16:16 -07:00
Mark Otto 674768b177 restore px unit on @font-size-base 2013-03-31 12:00:04 -07:00
Mark Otto a2145df7c4 run make after that breadcrumbs tweak 2013-03-31 11:58:25 -07:00
Mark Otto 42b6934930 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-03-31 11:58:08 -07:00
Mark Otto b018513aa5 lingering nav-list use 2013-03-31 11:58:00 -07:00
Mark Otto e62f2901d0 Merge pull request #7431 from burnsra/3.0.0-wip-fixes
Cleanup items for 3.0.0
2013-03-31 11:55:48 -07:00
Mark Otto fc16e37aaa Remove the handful of rem font-sizes 2013-03-31 11:26:13 -07:00
Mark Otto 4df128264b add some container padding for examples 2013-03-31 11:24:31 -07:00
Mark Otto b96ab36d38 add some container padding for examples 2013-03-31 11:24:31 -07:00
Robert Burns 74e06cb279 Add styles for tooltip and popover examples 2013-03-31 09:59:02 -04:00
Robert Burns a1587e2629 Remove breadcrumb divider after last element 2013-03-31 09:12:02 -04:00
Mark Otto 85cd847e47 actually readd the padding and set it to smaller amount for narrow viewports 2013-03-30 22:54:31 -07:00
Mark Otto 6c1ed5638b actually readd the padding and set it to smaller amount for narrow viewports 2013-03-30 22:54:31 -07:00
Mark Otto f8d78eba5c remove padding form sign in form example 2013-03-30 22:53:35 -07:00
Mark Otto 70ba9a880e remove padding form sign in form example 2013-03-30 22:53:35 -07:00
Mark Otto 40f671a531 add basic back to top link via affix 2013-03-30 18:41:26 -07:00
Mark Otto e560c41ed1 simpler nav links 2013-03-30 17:06:59 -07:00
Mark Otto 6edd5f291a not quite #fff on .list-group-item-text 2013-03-30 17:00:11 -07:00
Mark Otto 1683669eaa Remove .nav-list given new .list-group 2013-03-30 16:56:49 -07:00
Mark Otto 2a9604fdd2 add list group component 2013-03-30 16:07:50 -07:00
Mark Otto 731903a175 panels subnav and links 2013-03-30 14:16:30 -07:00
Mark Otto 9fff2d3fb6 Change error to danger for all classes; add panels component 2013-03-30 14:15:18 -07:00
Mark Otto aee25786a7 fuck everything about .clear_float() -- restore .clearfix() as mixin 2013-03-30 13:23:18 -07:00
Mark Otto 8d8f4e0cdd Merge pull request #7375 from thomas-mcdonald/fix-filter-gradient
Fix horizontal-three-colors to a horizontal filter gradient
2013-03-30 13:17:45 -07:00
Mark Otto 62df38586a navbar links in sidenav 2013-03-30 13:16:34 -07:00
Mark Otto 171c7feae2 navs nav links 2013-03-30 13:14:04 -07:00
Mark Otto e9dd1826be fix brok btn-dropdowns links 2013-03-30 13:12:03 -07:00
Mark Otto 9336a827c6 fix submenu docs height given border-box 2013-03-30 13:11:15 -07:00
Mark Otto bd69269426 more component nav updates 2013-03-30 13:09:56 -07:00
Mark Otto 7c3c5ed7cc Merge branch 'pickypg-patch-1' into 3.0.0-wip
Conflicts:
	less/dropdowns.less
2013-03-30 12:54:16 -07:00
Mark Otto 906ff98601 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-03-30 12:12:28 -07:00
Mark Otto 6ba341b2d5 Merge pull request #7428 from burnsra/3.0.0-wip-fixes
Fix path to examples to account for new layout
2013-03-30 12:11:33 -07:00
Robert Burns 501dfbe8ae Fix path to examples to account for new layout 2013-03-30 10:10:51 -04:00
Mark Otto a4901e2da8 mention responsive image and google maps 2013-03-30 01:55:39 -07:00
Mark Otto 1dcadede36 fix broke grid classes 2013-03-30 01:09:30 -07:00
Mark Otto af470f4c7b more content and nav twerks 2013-03-30 01:06:50 -07:00
Mark Otto 361c776e2b whitespace and taglines for main sections 2013-03-30 00:27:50 -07:00
Mark Otto 49ebf542a2 reorder docs 2013-03-30 00:19:05 -07:00
Mark Otto 9a0ee742f6 drop .muted for .text-muted 2013-03-30 00:11:38 -07:00
Mark Otto 601013ca04 drop .muted for .text-muted 2013-03-30 00:11:38 -07:00
Mark Otto 3359b8d5f6 nav change to go with that 2013-03-29 23:37:55 -07:00
Mark Otto 21d6a5933a fix buttons links 2013-03-29 23:37:43 -07:00
Mark Otto 8814125259 Add subnav support to CSS section 2013-03-29 23:33:08 -07:00
Mark Otto 23d7215dbe Modify scrollspy to add .active to all parent li items /cc @fat 2013-03-29 23:32:47 -07:00
Mark Otto 4dfc4e1022 clarify small docs 2013-03-29 22:40:42 -07:00
Mark Otto f367090671 countypo 2013-03-29 22:38:25 -07:00
Mark Otto 4ce9203f2c Merge branch '3.0.0-wip' into bs3_new_nav 2013-03-29 14:21:03 -07:00
Mark Otto 9f59648702 add link to github project on getting started section 2013-03-29 14:04:11 -07:00
Mark Otto 2ebc060795 mo padding on side nav links 2013-03-29 13:43:37 -07:00
Mark Otto d3fe506f04 clearer js instructions on how to include plugins 2013-03-29 13:43:30 -07:00
Mark Otto 3055f09a90 dat red 2013-03-29 10:45:00 -07:00
Ivan Khalopik 41c7825677 Fixes #7213 Collapse plugin does not correctly set the "collapsed" class on accordion heading links 2013-03-29 19:17:03 +03:00
Mark Otto e25ad912e2 correct page title and nuke liquid description 2013-03-28 17:20:17 -07:00
Mark Otto 384926a1d6 remove nonexistant example 2013-03-28 17:19:41 -07:00
Mark Otto b844d5dd2f Merge pull request #7409 from andriijas/3.0.0-wip-formactions
Make sure form actions are properly aligned with form-horizontal
2013-03-28 10:46:23 -07:00
Andreas Cederström 090545ffdf Make sure form actions are properly aligned with form-horizontal 2013-03-28 11:33:18 +01:00
Mark Otto 3278c40631 move nav into partial; rejigger content some more 2013-03-28 03:06:00 -07:00
Mark Otto df35e26142 rejigger some content and start exploring section headings 2013-03-28 01:34:42 -07:00
Mark Otto ba46d859e3 none of that 2013-03-28 01:12:07 -07:00
Mark Otto 4b8b8d2e46 holy crap new docs layout separate from home, no more top navbar 2013-03-28 01:08:14 -07:00
Mark Otto 081c061281 new subnav on all pages 2013-03-28 00:21:21 -07:00
Mark Otto fe414d8566 turn docs navbar into left navbar 2013-03-27 23:33:45 -07:00
Mark Otto 6696ff5d92 clarify docs on unstyled lists 2013-03-27 15:54:17 -07:00
Mark Otto f0f33eb9a3 Refactor .list-inline and .list-unstyled
* Instead of shared and separate CSS, isolate by class for easier mixin-ability
* .list-unstyled is now used as a mixin in .list-inline
2013-03-27 15:42:11 -07:00
Mark Otto 5b298a2aaf docs fixes with new .bs-docs-container; fixing some lingering grid classes 2013-03-26 23:54:17 -07:00
Mark Otto 2d47cb699e Remove grid example; update grid classes in examples 2013-03-26 17:17:39 -07:00
Mark Otto d5303906bd Remove grid example; update grid classes in examples 2013-03-26 17:17:39 -07:00
Mark Otto ca31f060a8 New grid classes 2013-03-26 17:12:17 -07:00
Mark Otto 64946ce93b remove .navbar-inner from starter template 2013-03-26 12:31:03 -07:00
Mark Otto 1e9be3644c remove .navbar-inner from starter template 2013-03-26 12:31:03 -07:00
Mark Otto 37ba2824bf Merge branch '3.0.0-wip' of https://github.com/psylabs/bootstrap into psylabs-3.0.0-wip
Conflicts:
	less/tests/navbar-fixed-top.html
	less/tests/navbar-static-top.html
	less/tests/navbar.html
2013-03-26 12:28:00 -07:00
Mark Otto 954dcc0dc5 Merge branch '3.0.0-wip' of https://github.com/psylabs/bootstrap into psylabs-3.0.0-wip
Conflicts:
	less/tests/navbar-fixed-top.html
	less/tests/navbar-static-top.html
	less/tests/navbar.html
2013-03-26 12:28:00 -07:00
mo 597d9e8965 Fixed the navbar toggle in example templates by changing all the ".btn .btn-navbar" to ".navbar-toggle" 2013-03-25 18:13:13 -07:00
mo ab09fb25b9 Fixed the navbar toggle in example templates by changing all the ".btn .btn-navbar" to ".navbar-toggle" 2013-03-25 18:13:13 -07:00
mo 110c5b70a1 Fixed all the .brand in navbar to .navbar-brand 2013-03-25 17:46:44 -07:00
mo a9e9d9d544 Fixed all the .brand in navbar to .navbar-brand 2013-03-25 17:46:44 -07:00
Thomas McDonald f8b9e428f0 Give horizontal-three-colors a horizontal filter gradient
Previously the filter had GradientType=0, which would render a vertical
gradient rather than the horizontal one implied by name
2013-03-23 19:21:37 +00:00
Mark Otto 3c82ccaa2b color border in table contextual classes 2013-03-17 17:26:02 -07:00
Simon Boudrias cae90f3010 Remove text-rendering 2013-03-17 17:22:26 -03:00
Mark Otto 3aee2adb4b Fixes #7297: add support for .success, .error, and .warning on td and th elements in tables 2013-03-17 12:10:58 -07:00
Mark Otto 28cdc8dc5f incorporate print utilities classes into responsive docs; rejigger some content 2013-03-17 11:57:00 -07:00
Mark Otto 160ff23c85 Merge branch 'jfroom-2.3.1-jfroom-wip' into 3.0.0-wip 2013-03-17 11:45:21 -07:00
Mark Otto 8d5a9371be update readme to resolve conflict 2013-03-17 11:45:13 -07:00
Mark Otto 4aba489cfd Remove all #font mixins; replace single instance of its use in Bootstrap with the @font-family-monospace variable 2013-03-17 11:34:27 -07:00
Mark Otto 6012d8221b Exploring rems as font-size unit
* Added a new mixin to calculate rems and pixels for IE fallback
* Updated the body, p, and .lead elements to use the new .font-size() mixin
* New mixin has default value of 14px or 1.4rem
* Still needs exploration, and change this means lots of work rejiggering margins and line-heights
* Related, started to reorganize the mixins a bit to call out mixins that are used by the framework and not utilities or snippets
2013-03-17 11:33:07 -07:00
Mark Otto 47f69c0d9e mixin, not copypasta 2013-03-17 11:15:04 -07:00
Mark Otto ef4898990f convert to preboot's retina mixin 2013-03-16 17:19:05 -07:00
Mark Otto 71d4b5b6e7 Merge branch '3.0.0-wip' of https://github.com/dannykeane/bootstrap into dannykeane-3.0.0-wip 2013-03-16 17:06:20 -07:00
Mark Otto 68dfd322f4 fixes #7140: hide navbar toggle in print 2013-03-16 16:17:32 -07:00
Mark Otto fe2658ed61 Fixes #7150: colorize links in alerts 2013-03-16 15:31:03 -07:00
Mark Otto 7e933db2dd comment 2013-03-16 15:03:22 -07:00
Mark Otto 070c77a960 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-03-16 14:59:43 -07:00
Mark Otto 1d94d777c3 Merge pull request #7258 from acconrad/patch-1
Update buttons.less to disable btn pointer events
2013-03-16 14:59:33 -07:00
Mark Otto e0de08c389 typo 2013-03-16 14:49:21 -07:00
Mark Otto 8c9e9e28cf Fix vertical button groups 2013-03-16 13:03:31 -07:00
Mark Otto efbf8373a5 Use form elements in checkbox and radio button groups
* Uses .btn on label elements with nested checkbox and radio controls within
* Updated examples to reflect change in HTML and CSS
* Had to add .active all buttons for proper state highlighting (mimicing the :active pseudo state)
* Still needs JavaScript plugin updated by @fat
2013-03-16 12:34:07 -07:00
Mark Otto be8f992c94 remove inner shadow from .highlight 2013-03-16 12:09:26 -07:00
Mark Otto f77dc548a1 update pygments highlighting with customizations from preboot 2013-03-16 12:07:00 -07:00
Mark Otto bb38fa5286 Overhaul the grid system and its docs
* Add new grid mixins adapted from Preboot (http://github.com/mdo/preboot)
* Drop the @grid-row-width and @grid-column-width variables
* Add the @grid-float-breakpoint variable, as used in Preboot
* Add support for .push* and .pull* classes for column ordering manipulation
* Document all the things
2013-03-15 23:21:10 -07:00
Mark Otto 145eb054d9 begin to rewrite the grid docs 2013-03-15 21:57:16 -07:00
Mark Otto 2a0fb08fad getting started as navbar link label 2013-03-15 21:23:59 -07:00
Mark Otto ecfdecea00 Use translucent box shadow on hr elements; colorize hr elements within alert components 2013-03-14 23:01:23 -07:00
pickypg 812b99263f Fix dropdown (and therefore typeahead) wrap
I have recently been experimenting with a lot of Typeahead controls, and I ran into a situation where my Typeahead was too wide for my screen, particularly on mobile devices, and it was not wrapping as I had expected it to do.

http://jsfiddle.net/Mtxkn/3/

Changing the CSS for `.dropdown-menu > li > a` to `white-space: normal` causes it to wrap in every scenario that I have seen, whereas leaving it as `nowrap` never does what I want when the text is too long for a given row.

It's possible that this has ramifications for other dropdown menus, but honestly I expect that even those would prefer to wrap than to extend the screen horizontally.  If that is not the case, then it would work to change the typeahead version of this only:

```css
.typeahead > li > a {
    white-space: normal;
}
```
2013-03-15 02:54:24 -03:00
Mark Otto 4c0719ea5f fix derpy linenos in pygments for thumbnails component 2013-03-14 22:34:20 -07:00
Mark Otto 7e07c89b8b Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-03-14 22:25:53 -07:00
Mark Otto 37d0a30589 Merge pull request #7287 from waynn/patch-1
fix pluralization since "a" is in front for issue #6342
2013-03-14 22:21:06 -07:00
Mark Otto ed7fe0e5ba unfuck misaligned main container 2013-03-14 21:45:31 -07:00
Mark Otto 8f04096205 Merge pull request #7285 from stilliard/patch-1
Additional heading font-size classes
2013-03-14 20:55:43 -07:00
Mark Otto 4247008e23 more readme copy 2013-03-14 20:55:23 -07:00
Mark Otto b375283597 readme copy 2013-03-14 20:54:53 -07:00
Mark Otto 2b9c936a3a start listing other bootstrap powered starter doodads in the readme 2013-03-14 19:19:06 -07:00
Andrew Stilliard 706dd8c045 Additional heading font-size classes
This relates to changes in issue #7284
2013-03-15 02:11:37 +00:00
Mark Otto c9bfcfcfd5 underp license maybe 2013-03-14 19:08:09 -07:00
Mark Otto 45606ae6a0 herp derp, spelling booboo 2013-03-14 19:06:47 -07:00
Mark Otto 8f20a5ac91 Rename license to license.md; point readme to it via link 2013-03-14 19:05:54 -07:00
Mark Otto 85e5d40099 fix example navbar brand 2013-03-14 18:54:43 -07:00
Mark Otto 3cd6d00cc4 use the proper selector 2013-03-14 18:53:46 -07:00
Mark Otto b5eca07be1 modify copy 2013-03-14 18:23:08 -07:00
Mark Otto d8234b38cb Merge branch '3.0.0-wip' of https://github.com/addyosmani/bootstrap into addyosmani-3.0.0-wip 2013-03-14 13:34:48 -07:00
Mark Otto 224296f695 Fixes #7281: make tables super specific for hovers and striping to avoid nesting issues 2013-03-14 13:29:43 -07:00
Mark Otto 00169b48bd Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	less/grid.less
2013-03-14 13:25:59 -07:00
Mark Otto 7bff231ea5 Merge pull request #7227 from parndt/patch-1
Fix minor grammatical problem
2013-03-14 13:04:50 -07:00
Addy 0c65a0e1ee Added bower install to download/install options in getting started guide 2013-03-14 10:58:16 +00:00
Adam Conrad e488e709a0 Update buttons.less to disable btn pointer events
Buttons that are disabled are still clickable and can still fire click events (such as hopping up to the top of the page if your anchor href points to "#"). Adding the pointer-events:none property will truly disable the button so situations like this don't happen.
2013-03-12 17:58:41 -03:00
Mark Otto d0e1b56603 Merge pull request #7181 from lukeapage/3.0.0-wip
make less files compile with strict maths in 1.4.0
2013-03-11 01:16:08 -07:00
Mark Otto d344ca4475 Merge pull request #7208 from benilovj/3.0.0-wip
fix grammatical mistakes in carousel docs
2013-03-10 23:32:13 -07:00
Philip Arndt 086e8a5b3c Fix minor grammatical problem
"check out" makes more sense here.
2013-03-11 12:07:52 +13:00
Mark Otto d219b8b964 Set border-box globally instead 2013-03-10 13:24:07 -05:00
Mark Otto e0a740ca9a Merge pull request #7220 from jooag/patch-1
Fix Typo sucess to success
2013-03-10 10:40:00 -07:00
Ufuk Avcu 33913e4586 Fix Typo sucess to success
Mini typo fix in the docs...
2013-03-09 21:04:09 +01:00
Jake Benilov d5c3307ffa fix grammatical mistakes in carousel docs 2013-03-08 00:13:56 +00:00
Waynn Lue 1c7fe5d887 fix pluralization since "a" is in front 2013-03-06 22:01:21 -08:00
Luke Page 5054c17ab8 make less files compile with strict maths in 1.4.0 2013-03-06 16:38:20 +00:00
Ben Word ee5c7d7ece Remove -webkit-backface-visibility on skew mixin
Ref #5319 - This rule is causing pixelated edges on iOS. Removing
it makes everything smooth across all OS's, browsers, and devices.
2013-03-04 13:03:05 -06:00
Mark Otto 6e8ee02421 tweak icons alignment 2013-03-03 23:41:16 -08:00
Mark Otto bfdc6f8607 Remove support for .uneditable-input 2013-03-03 23:31:09 -08:00
Mark Otto 6239094ca6 Nuke the gallery, punt it to the new http://expo.getbootstrap.com 2013-03-03 19:40:47 -08:00
Mark Otto b83fc82aed fix row change at breakpoint 2013-03-03 18:19:31 -08:00
Mark Otto 6e0815bf4e Merge pull request #6968 from twitter/bs3_makefile_separated_done
More accurate makefile step confirmation
2013-03-01 14:11:24 -08:00
Mark Otto 1f160d4c12 Merge branch '3.0.0-wip' into bs3_makefile_separated_done
Conflicts:
	Makefile
2013-03-01 13:53:21 -08:00
Mark Otto e0647e8273 nuke commented out unused var 2013-03-01 12:37:36 -08:00
Mark Otto a70c50d1f7 Merge branch 'master' into 3.0.0-wip
Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap-affix.js
	docs/assets/js/bootstrap-alert.js
	docs/assets/js/bootstrap-button.js
	docs/assets/js/bootstrap-carousel.js
	docs/assets/js/bootstrap-collapse.js
	docs/assets/js/bootstrap-dropdown.js
	docs/assets/js/bootstrap-modal.js
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap-scrollspy.js
	docs/assets/js/bootstrap-tab.js
	docs/assets/js/bootstrap-tooltip.js
	docs/assets/js/bootstrap-transition.js
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/index.html
	docs/templates/pages/index.mustache
	js/bootstrap-affix.js
	js/bootstrap-alert.js
	js/bootstrap-button.js
	js/bootstrap-carousel.js
	js/bootstrap-collapse.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tab.js
	js/bootstrap-tooltip.js
	js/bootstrap-transition.js
	js/bootstrap-typeahead.js
	less/bootstrap.less
	less/responsive.less
	package.json
2013-03-01 12:37:21 -08:00
Mark Otto 77e8e2aee9 Fix alignment of .navbar-brand 2013-03-01 00:50:08 -08:00
Mark Otto 492c249537 improve navbar toggle and hide code snippets on mobile devices for now 2013-03-01 00:18:10 -08:00
Mark Otto 2e3ba4afe6 redo the buttons examples 2013-03-01 00:04:41 -08:00
Mark Otto ba633949dc customize navbar in docs 2013-02-28 23:36:54 -08:00
Mark Otto 38ba057dee Fixes #6998: disabled background color properly on pagination 2013-02-28 23:23:05 -08:00
Mark Otto 5a30e52aac Fixes #6995: Add disabled navbar nav link support 2013-02-28 23:20:58 -08:00
Mark Otto 4418c82888 Fixes #6954: properly reset grid classes within tables 2013-02-28 22:47:32 -08:00
fat-kun eb24718add Merge pull request #7111 from twitter/2.3.1-wip
2.3.1 wip
2013-02-28 21:24:27 -08:00
Mark Otto bfc4aaf6e8 Holy fucking shit fix that input group with buttons rounded corner noise 2013-02-28 21:19:02 -08:00
fat 6b2a010357 update changelog 2013-02-28 21:16:08 -08:00
fat 839b0c893f shiiiit 2013-02-28 21:15:33 -08:00
fat 0992a85932 woops that should stay 2.3.0 2013-02-28 21:00:21 -08:00
fat 3469339068 2.3.1 2013-02-28 20:55:14 -08:00
fat cec434a4c3 rebuild 2013-02-28 20:48:48 -08:00
fat 2f27d9851c whitespace 2013-02-28 20:48:02 -08:00
fat a61322c2fb WHOOPS ( >_>) 2013-02-28 20:46:51 -08:00
fat 01e0f8c653 only pass unique options through to child nodes in tooltips 2013-02-28 20:39:07 -08:00
fat cf998040ec rebuild 2013-02-28 19:49:08 -08:00
fat ef80765726 pass true to cycle 2013-02-28 19:47:01 -08:00
Mark Otto b19eb88b5a Fixes #6935: Use standard decimal points for .opacity() mixin 2013-02-28 19:46:49 -08:00
Mark Otto 0dea8b0c74 Fixes #6897: Print styles get own .less file 2013-02-28 19:42:51 -08:00
fat 40b7a909a6 le sigh 2013-02-28 19:37:30 -08:00
Mark Otto 9d763e805b Remove margin between buttons in button groups; use border-radius mixins to avoid reseting border-radii that don't need resetting 2013-02-28 19:34:02 -08:00
Mark Otto 877d64dd77 remove auto regen 2013-02-28 19:32:39 -08:00
Mark Otto 81a0306cce add new example thumbnails; update links to point to new windows 2013-02-26 00:56:06 -08:00
Mark Otto 044b094b22 nuke remaining less/tests/ files and move grid over to examples dir 2013-02-26 00:49:21 -08:00
Mark Otto ea01e8bbc4 nuke remaining less/tests/ files and move grid over to examples dir 2013-02-26 00:49:21 -08:00
Mark Otto e2e5580c0e nuke glyphicons changes in buttons for now because it's whack 2013-02-26 00:44:15 -08:00
Mark Otto 61174c3c1d moved examples added 2013-02-26 00:42:24 -08:00
Mark Otto 5b3b11c02a moved examples added 2013-02-26 00:42:24 -08:00
Mark Otto 91660a0489 Move navbar examples to /examples directory 2013-02-26 00:37:59 -08:00
Mark Otto e1bb94c383 try out new table-based type example 2013-02-24 01:29:19 -08:00
Mark Otto 16111a5e45 Merge pull request #6967 from twitter/readme_npm_fix
Update readme npm instructions
2013-02-21 13:10:21 -08:00
Mark Otto c6343a9d4a Merge pull request #6990 from acmetech/3.0.0-wip
Additional minor updates to the docs
2013-02-19 16:09:18 -08:00
Tom Pietschker 1780873173 forgot navbar-fixed-bottom in the commit 2013-02-19 14:54:56 -05:00
Tom Pietschker ba7b1e8234 tweak the position of the fixed to top/bottom navbars to remove double border 2013-02-19 14:50:44 -05:00
Tom Pietschker ec9b01e691 remove the search-query class and increase the width 2013-02-19 14:40:05 -05:00
Tom Pietschker 62b54605a7 replace navbar-search with navbar-form 2013-02-19 14:35:48 -05:00
Tom Pietschker 3b7e5214e3 remove navbar-inner 2013-02-19 14:32:28 -05:00
Mark Otto a1913cbe7e Merge pull request #6979 from acmetech/3.0.0-wip
Minor fixes to docs
2013-02-18 18:26:26 -08:00
Tom Pietschker 722ba5f227 added missing slash in the src for Gather Content 2013-02-18 21:03:52 -05:00
Tom Pietschker 4c00f290f2 fix incorrect section id for labels 2013-02-18 20:57:54 -05:00
Mark Otto 023568fe3d Navbar realignment:
* Change .brand to .navbar-brand
* Change .btn-navbar to .navbar-toggle
* Redesign navbar toggle to be a bit lighter and wider
* Center align the navbar brand with a max-width of 200px (to minimize hit area) while still centering
2013-02-18 01:28:35 -08:00
Mark Otto f51862f158 remove unused include 2013-02-18 01:27:08 -08:00
Mark Otto acdffe696c Bring back the label, make it scale somewhat with the font-size of the parent using percentages and ems 2013-02-17 22:20:49 -08:00
Mark Otto f6ec2c5dac Drop the recently added .counter class for .badge 2013-02-17 21:06:20 -08:00
Mark Otto d3cc8f79f4 remove old todo comment 2013-02-17 20:26:44 -08:00
Mark Otto 53091be6d2 remove unnecessary select border reset 2013-02-17 20:26:21 -08:00
Mark Otto e2d829e511 fix inaccurate text classes code 2013-02-17 20:23:31 -08:00
Mark Otto 82d059de87 fix broken marketing section with updated class 2013-02-17 20:18:29 -08:00
Mark Otto 159167041f forgot about those quotes 2013-02-17 19:15:09 -08:00
Mark Otto 56e60d0468 fix the docs include logic 2013-02-17 19:12:30 -08:00
Mark Otto 42488cbb45 more narrow jumbotron example fixes in the mobile first arena 2013-02-17 19:04:38 -08:00
Mark Otto 9b3262cb15 more narrow jumbotron example fixes in the mobile first arena 2013-02-17 19:04:38 -08:00
Mark Otto 9f279c6077 Refactor some common classes from docs css and examples, then prevent examples from using docs.css 2013-02-17 18:58:40 -08:00
Mark Otto c6f341bd17 Refactor some common classes from docs css and examples, then prevent examples from using docs.css 2013-02-17 18:58:40 -08:00
Mark Otto c65063271a revamp narrow jumbotron to avoid conflicts with docs .masthead 2013-02-17 18:48:00 -08:00
Mark Otto dba9eea98d revamp narrow jumbotron to avoid conflicts with docs .masthead 2013-02-17 18:48:00 -08:00
Mark Otto 36aec5e484 decrease top/bottom padding a bit in mobile fixed navbars 2013-02-17 18:47:44 -08:00
Mark Otto ee9a0f4b94 css to go with it 2013-02-17 18:46:49 -08:00
Mark Otto 13ff3aced0 Add class to body for special styles to avoid conflict with examples 2013-02-17 18:46:30 -08:00
Mark Otto c0ea077fb4 Revert the statis navbar in mobile views--they're back to being fixed all the time 2013-02-17 18:33:55 -08:00
Mark Otto 4cbb663d9d Update some links and rename #gridsystem to #grid-system 2013-02-17 18:10:29 -08:00
Mark Otto f59e4fdba3 remove duplicate done text; change label on docs prep step 2013-02-17 16:58:43 -08:00
Mark Otto 9134fa4eda correct version 2013-02-17 16:56:57 -08:00
Mark Otto 6663a35562 Resolve conflicts 2013-02-17 16:56:30 -08:00
Mark Otto e6a6fd2585 Backport v3's readme update on npm install to 2.3 2013-02-17 15:36:24 -08:00
Mark Otto 077b70112f add note to readme about fubared npm installs 2013-02-17 13:54:47 -08:00
Mark Otto e2fabe2317 clarification on readme makefile 2013-02-17 13:42:31 -08:00
Mark Otto 6ccf588a8e Restore submenu support 2013-02-17 13:35:14 -08:00
Mark Otto fdeb7f5743 restore auto regen of docs 2013-02-17 13:35:08 -08:00
Jeff Froom ba8ba1fe72 Added Development > build: "make bootstrap" notes. 2013-02-16 21:37:08 -06:00
Mark Otto 5fecb4a9f4 add visibility note to docs about captions 2013-02-16 02:49:12 -08:00
Mark Otto 6dce3f63d8 Scrach that: carousel caption is always left aligned, but still hidden for mobile views 2013-02-16 02:47:48 -08:00
Mark Otto 6d048471c4 Re-add carousel captions as optional
* They're hidden by default in the mobile-first views because otherwise they just cover up the slides
* In mobile they're centered, and then are shown left aligned at larger viewports
2013-02-16 02:47:15 -08:00
Mark Otto 34ca3d645a Nuke the fluid example since it's no longer applicable 2013-02-16 01:43:23 -08:00
Mark Otto e74fb39080 Nuke the fluid example since it's no longer applicable 2013-02-16 01:43:23 -08:00
Mark Otto 401d4fabd1 Nuke the old_docs.css file 2013-02-16 01:39:09 -08:00
Mark Otto b6ec72a3a2 Nuke @mdo's photos from the repo since we're using holder.js for carousel demo 2013-02-16 01:38:32 -08:00
Mark Otto ce21926704 All Glyphicons now require a base class, e.g. .glyphicon.glyphicon-star 2013-02-16 01:26:43 -08:00
Mark Otto d8e2668c1d Overhaul carousel a bit more:
* Drop custom type arrow controls for glyphicons icons instead for more consistent rendering
* Remove the captions and instead let folks implement what they want in the carousel
* Move the indicators to the bottom middle instead of top right
* Lighten up gradients on the edges for less harsh lighting
2013-02-16 01:22:15 -08:00
Mark Otto b688d8dcd4 More accurate padding for fixed navbars at >768px 2013-02-16 00:20:20 -08:00
Mark Otto f38e50cdf1 Don't affix the fixed navbars in mobile views 2013-02-16 00:19:17 -08:00
Mark Otto d1aae5f82b twerk gallery examples to stay at 400px or less for proper retinafying 2013-02-15 17:27:05 -08:00
Mark Otto 3d041096ba Update gallery examples on homepage; make all gallery entries open in new tabs 2013-02-15 17:21:41 -08:00
Mark Otto 6789a30a3d fix #6950: use var for font-family 2013-02-15 16:51:16 -08:00
Mark Otto 866c8d60e9 restore jekyll-based css.html to docs 2013-02-15 12:22:26 -08:00
Mark Otto 64ae9e5bd8 Merge pull request #6944 from canburak/3.0.0-wip
Fixed typo on JavaScript documentation
2013-02-15 12:17:27 -08:00
Can Burak Cilingir a77cd6cb5d Fix typo on JavaScript documentation 2013-02-15 18:47:34 +08:00
Mark Otto e44f8cc560 Fixes #6941: add alt attribute to images 2013-02-14 23:55:04 -08:00
Mark Otto c4b2bb5bcd fix spelling as pointed out by @jodytate that got nuked in the merge 2013-02-14 23:51:35 -08:00
Mark Otto bcb6dd5ee6 fix spelling as pointed out by @jodytate that got nuked in the merge 2013-02-14 23:51:35 -08:00
Mark Otto 0c25546e1c rearrange readme 2013-02-14 23:48:29 -08:00
Mark Otto 87a317f42f Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	docs/examples/sticky-footer-navbar.html
	docs/examples/sticky-footer.html
2013-02-14 23:44:50 -08:00
Mark Otto 5ac2f304a8 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	docs/examples/sticky-footer-navbar.html
	docs/examples/sticky-footer.html
2013-02-14 23:44:50 -08:00
Mark Otto ae525258af Merge branch 'bs3_jekyll' into 3.0.0-wip
Conflicts:
	docs/css.html
	docs/templates/pages/css.mustache
2013-02-14 23:42:47 -08:00
Mark Otto 0765ea43dd Make example pages use Jekyll; add sticky footer navbar image to examples 2013-02-14 23:38:00 -08:00
Mark Otto aa5f090371 Make example pages use Jekyll; add sticky footer navbar image to examples 2013-02-14 23:38:00 -08:00
Mark Otto 41ef649aa3 no need for scrollspy in example template 2013-02-14 23:07:36 -08:00
Mark Otto b1d4c589c5 Update makefile 2013-02-14 22:57:25 -08:00
Mark Otto 979ca4ea7a Convert JS page to pygments; nuke prettify assets 2013-02-14 22:33:26 -08:00
Mark Otto 37becbab8c convert components code examples to pygments 2013-02-14 21:42:33 -08:00
Mark Otto 0ff7fb0d05 pygmentize the rest of the css page 2013-02-14 16:43:50 -08:00
Mark Otto edfee83ac2 Specify new local URL 2013-02-14 16:17:16 -08:00
Mark Otto dc09979b51 Merge pull request #6936 from jodytate/3.0.0-wip
minor update to sticky-footer examples
2013-02-14 13:59:05 -08:00
jody tate b9291929bf Update docs/examples/sticky-footer.html
again, "it's" to "its" for grammar fun!
2013-02-14 13:30:22 -08:00
jody tate f273170f16 Update docs/examples/sticky-footer.html
again, "it's" to "its" for grammar fun!
2013-02-14 13:30:22 -08:00
jody tate 83f55eab5b Update docs/examples/sticky-footer-navbar.html
contraction "it's" to possessive "its", aka pedantic grammar fix
2013-02-14 13:26:52 -08:00
jody tate 33a529f398 Update docs/examples/sticky-footer-navbar.html
contraction "it's" to possessive "its", aka pedantic grammar fix
2013-02-14 13:26:52 -08:00
Mark Otto 6b14de292a pygmentize grid section; update bs-docs-example corners 2013-02-14 00:43:43 -08:00
Mark Otto 7e6211e244 twerk dat manni pygment style 2013-02-14 00:39:32 -08:00
Mark Otto 5f0ecb740a Start pygmentizing css.html; add new theme for pygments 2013-02-14 00:23:23 -08:00
Mark Otto d709dba284 Start using some includes; test out some pygments highlighting 2013-02-13 23:37:08 -08:00
Mark Otto b12ff91d48 update readme to point to getting started page; twerk link 2013-02-13 22:01:34 -08:00
Mark Otto 0c1142f6fb readme improvements 2013-02-13 20:02:00 -08:00
Mark Otto 2b05b335b0 update readme to reflect jekyll docs and local npm install method 2013-02-13 12:51:25 -08:00
Mark Otto d3c458c7d8 make same css docs fix from upstream 2013-02-13 12:32:29 -08:00
Mark Otto 96953c2072 update makefile to work again; gitignore the compiled docs _gh_pages folder; test makefile with darkened navbar active bg 2013-02-13 12:30:56 -08:00
Mark Otto b57c20a057 Restore gallery page, add active nav class jankitude, auto regenerate docs on file save 2013-02-13 11:48:22 -08:00
Mark Otto b1e7010bfc Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-02-13 11:28:00 -08:00
Mark Otto 407e935c9c rearrange jekyll and docs 2013-02-12 12:44:41 -08:00
Mark Otto e45f12ad42 rearrange jekyll and docs 2013-02-12 12:44:41 -08:00
Mark Otto 8174705be8 update makefile to work given nuked docs dir 2013-02-12 12:27:18 -08:00
Mark Otto eb02887bc3 nuke what we don't need for jekyll 2013-02-12 12:25:05 -08:00
Mark Otto 8b9733b288 nuke what we don't need for jekyll 2013-02-12 12:25:05 -08:00
Mark Otto 5de8557398 convert to jekyll 2013-02-12 12:16:32 -08:00
Mark Otto 1f5f23f869 nuke dat extend docs page 2013-02-11 21:38:44 -08:00
Danny Keane e8dc036d25 Added retina image support mixin 2013-02-11 18:23:21 -08:00
Mark Otto 1dda3c395a Merge pull request #6863 from devknoll/fix-css-docs
Fix the Star glyphicon in the CSS docs
2013-02-08 23:28:18 -08:00
Gerald Monaco 876a412c90 Fix the Star glyphicon in the CSS docs 2013-02-08 19:52:50 -05:00
Mark Otto 63c1377ee7 Fixes #6852: add cursor pointer to carousel indicators 2013-02-08 09:56:04 -08:00
Mark Otto 1b2b049ef8 Fixes #6841: Add new Firefox placeholder, comments 2013-02-08 08:32:29 -08:00
Mark Otto 3eed90c187 Fixes #6837: Enable text alignment utility classes on tables
* Removes text-align from td elements (no need to set that one)
* Specifically sets th to text-align: left; at a global level (no longer within .table) to override browser defaults
* Removes font-weight: bold; from th while we're at it since that's browser default already
2013-02-08 08:24:10 -08:00
Mark Otto ab1dc25ffc clean up responsive docs and global css styles 2013-02-08 00:13:44 -08:00
Mark Otto 2aa1a4dc70 Merge branch 'master' into 3.0.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
2013-02-07 22:18:53 -08:00
fat 8c7f9c66a7 Merge branch '2.3.0-wip' 2013-02-07 22:13:13 -08:00
Mark Otto c4d47fb1ea Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-07 22:08:13 -08:00
Mark Otto 30fd4be093 add 2.3 changelog section 2013-02-07 22:08:04 -08:00
fat 501aabf572 remove prevent default on focus 2013-02-07 21:42:34 -08:00
fat 366e1e0a6d only fire hidden once backdrop has been removed 2013-02-07 20:13:40 -08:00
fat 1bf070b4ce Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
2013-02-07 19:47:01 -08:00
fat d8a7a380bc if no callback, don't try to call callback ya goof 2013-02-07 19:45:42 -08:00
Mark Otto a9729c5fd0 fix js from @fat feedback for modal 2013-02-07 19:38:46 -08:00
Mark Otto 52581839c7 remove modal test file 2013-02-07 19:34:23 -08:00
Mark Otto 9b1520ee60 update example code 2013-02-07 19:34:06 -08:00
Mark Otto cfa1e39510 nuke that whitespace 2013-02-07 19:32:30 -08:00
Mark Otto b04acb37e8 finish modal tweaks 2013-02-07 19:31:12 -08:00
Mark Otto a623b8c10f update docs modals 2013-02-07 19:21:56 -08:00
Mark Otto cdb2147b13 add new modal to docs example 2013-02-07 19:00:48 -08:00
Mark Otto e3f3542d0b Fixes #6823: add some docs notes about tooltips in input groups 2013-02-06 17:25:58 -08:00
Mark Otto c8874ff285 Merge pull request #6813 from Yohn/patch-12
don't remove title attribute for tooltips for 2.3-wip
2013-02-06 13:19:50 -08:00
Yohn 60c9ff4364 unit tests 2013-02-06 06:20:05 -05:00
Yohn beb60309d1 dont remove title attribute part 2 2013-02-06 06:17:48 -05:00
Mark Otto 8ca70bd83a Overhaul modal to make it responsive and not super lame 2013-02-06 02:07:40 -08:00
Mark Otto 0b4668368b Merge branch '2.3.0-wip' into 3.0.0-wip 2013-02-05 22:47:00 -08:00
Mark Otto 2fa77bf197 Update link to changelog 2013-02-05 22:46:45 -08:00
Mark Otto 421f9f67c4 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap.js
	docs/css.html
	docs/templates/pages/base-css.mustache
	js/bootstrap-popover.js
	less/mixins.less
	less/tooltip.less
2013-02-05 22:42:54 -08:00
fat 3b56227553 Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
2013-02-05 22:30:54 -08:00
fat 4814281540 clean up styles 2013-02-05 22:29:59 -08:00
Mark Otto 6d21d86007 port docs fix from 2.3.0-wip to new css page 2013-02-05 22:29:01 -08:00
Mark Otto accfdaafdb Fixes #6808: mention IE lame-itude in docs for invalid inputs 2013-02-05 22:28:18 -08:00
Mark Otto 0fe9148b91 Fixes #6190: Add print utility classes 2013-02-05 22:17:28 -08:00
fat 5e4db94c24 Merge branch '2.3.0-wip' of git://github.com/ghusse/bootstrap into ghusse-2.3.0-wip 2013-02-05 22:10:41 -08:00
fat-kun 6a9cd513c0 Merge pull request #6783 from joprice/popoverOptionsOverride
reordered access of options in tooltip and popover
2013-02-05 21:48:34 -08:00
fat-kun 042bb9b515 Merge pull request #6780 from agatronic/2.3.0-wip
less: Move to new selector interpolation, supported from 1.3.1
2013-02-05 21:29:59 -08:00
Mark Otto 1629df8008 screwed up a merge and an old version number crept in 2013-02-05 21:20:29 -08:00
fat a4b31d39a2 don't hide if already hidden ya n00b 2013-02-05 21:08:56 -08:00
Mark Otto 4270496e8a add codecademy to gallery 2013-02-05 21:07:30 -08:00
Mark Otto a920697382 Dat compression 2013-02-05 21:05:24 -08:00
Mark Otto fb1db88256 Update homepage examples, add hella new sites to gallery 2013-02-05 21:04:46 -08:00
Mark Otto 37a6879ca5 White navbar brand text for inverted navbar 2013-02-05 20:39:09 -08:00
fat a866a51a2e clear interval in cycle + rebuild 2013-02-05 20:34:39 -08:00
fat-kun ee91afba63 Merge pull request #6481 from pseidemann/patch-1
don't remove title attribute for tooltips
2013-02-05 20:13:57 -08:00
fat-kun 566380b257 Merge pull request #6488 from nanek/dropdowns-remove-touchstart
Remove touchstart from bootstrap-dropdown.js.
2013-02-05 20:08:42 -08:00
fat c25e8182ba Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-05 20:01:25 -08:00
fat 45656fc7fc update jquery to 1.9 2013-02-05 20:00:50 -08:00
Mark Otto 31fdb2e25e Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-05 19:59:25 -08:00
Mark Otto 28e1702052 nuke rogue conflict comment and remake 2013-02-05 19:59:02 -08:00
Mark Otto 3db1b902c8 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/examples/hero.html
	less/buttons.less
	less/carousel.less
	less/close.less
	less/dropdowns.less
	less/labels-badges.less
	less/mixins.less
	less/navbar.less
	less/navs.less
	less/pagination.less
	less/responsive-navbar.less
	less/scaffolding.less
	less/sprites.less
	less/thumbnails.less
	less/type.less
2013-02-05 19:53:44 -08:00
Mark Otto 43da258bd9 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/examples/hero.html
	less/buttons.less
	less/carousel.less
	less/close.less
	less/dropdowns.less
	less/labels-badges.less
	less/mixins.less
	less/navbar.less
	less/navs.less
	less/pagination.less
	less/responsive-navbar.less
	less/scaffolding.less
	less/sprites.less
	less/thumbnails.less
	less/type.less
2013-02-05 19:53:44 -08:00
Mark Otto c97d304c0c derp, fix broke css and recompile 2013-02-05 19:43:49 -08:00
Mark Otto 9443eb6e21 restore comma between selectors 2013-02-05 19:40:32 -08:00
Mark Otto 0a8d834af6 Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	less/navbar.less
2013-02-05 19:39:49 -08:00
Mark Otto 15c7e73abd Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	less/navbar.less
2013-02-05 19:39:49 -08:00
fat-kun 31b9240dd0 Merge pull request #6737 from openwide-java/fix-tooltip-positioning-for-ie8
Fix tooltip positioning for IE8 broken in 2.3.0
2013-02-05 19:22:34 -08:00
Mark Otto e4a74607b0 simplify media docs 2013-02-05 01:12:39 -08:00
Mark Otto b65293dec0 reorganize progress bars docs 2013-02-05 01:11:41 -08:00
Mark Otto 3949623eee simpler alerts docs 2013-02-05 01:07:43 -08:00
Mark Otto 238566b445 mo betta thumbnails docs 2013-02-05 01:01:23 -08:00
Mark Otto 2576e6d1d6 reorder counters docs 2013-02-05 00:59:22 -08:00
Mark Otto cf78f4b010 pagination docs cleanup 2013-02-05 00:54:48 -08:00
Mark Otto 1f673b77bb simpler breadcrumbs docs 2013-02-05 00:51:19 -08:00
Mark Otto 74c8a5611d Increase margins and line-height on h3; overhaul button dropdown docs 2013-02-05 00:49:54 -08:00
Mark Otto c09b994eea Add justified button groups for link buttons; reorganize dropdowns and button groups docs sections 2013-02-05 00:30:03 -08:00
Mark Otto 5c1cc722e7 Forgot to remove base-css.mustache 2013-02-05 00:22:20 -08:00
Mark Otto cb0fed6693 Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-04 11:25:46 -08:00
Mark Otto 2c92b5f6a4 Remove base-css.html after recent merges 2013-02-04 11:12:32 -08:00
Mark Otto 0a3e3a50fe Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	less/type.less
2013-02-04 11:12:09 -08:00
Mark Otto 1f6a988190 Fixes #6794: incorrect docs mention of th element 2013-02-04 11:11:25 -08:00
Mark Otto db8a78fae6 Fixes #6794: incorrect docs mention of th element 2013-02-04 11:11:04 -08:00
Joseph Price 4b86a91e53 fix typo 2013-02-04 09:10:48 -05:00
Mark Otto 7ec817ea46 Merge pull request #6638 from GeoffYoung/2.3.0-wip
Update package.json to current Recess version
2013-02-02 19:53:22 -08:00
Mark Otto 9480eb89cb Revamp button mixins and pseudo states
* Remove .darken-button-states and .buttonBackground mixins (latter wasn't being used anyway)
* Create new .btn-pseudo-states mixin for setting button background and border colors for default and pseudo states
2013-02-02 19:16:15 -08:00
Mark Otto 2f7087eae9 Merge branch '3.0.0-wip' of https://github.com/vickash/bootstrap into vickash-3.0.0-wip 2013-02-02 19:08:59 -08:00
Mark Otto d6048031ed Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-02 18:58:08 -08:00
Mark Otto b1f1d7871f Add changelog file to repo instead of relying on the wiki 2013-02-02 18:57:24 -08:00
Mark Otto 5638b2559a Verion number in JS makefile 2013-02-02 18:50:13 -08:00
Mark Otto 3d74c670d3 Rearrange forms content 2013-02-02 18:30:52 -08:00
Mark Otto 6993fadf7e Simplify input and input group sizing
* Remove .input-mini because who really needs inputs that small
* Remove unnecessary border-radius resets from large and small input groups
2013-02-02 17:31:26 -08:00
Mark Otto 04aae2f56c Merge branch '3.0.0-wip' of https://github.com/gilbarbara/bootstrap into gilbarbara-3.0.0-wip 2013-02-02 17:01:29 -08:00
Joseph Price 1fe4ed8823 reordered access of options in tooltip and popover to allow overriding data attrs from js 2013-02-02 18:58:56 -05:00
Mark Otto c64aa26d06 Add @btn-color variable and use in buttons and carets; fixes dropup caret as well 2013-02-02 13:03:18 -08:00
Mark Otto dbe8aed76e Merge pull request #6763 from rjregenold/2.3.0-wip
fixes jankiness with anchor tags in carousel.
2013-02-02 12:35:39 -08:00
Luke Page 6b9bb547bf Move to new selector interpolation, supported from 1.3.1 2013-02-02 07:58:27 +00:00
Mark Otto 94e256c016 Refactor navbar dividers
* Instead of .divider-vertical, use .divider
* Makes use of .nav-divider mixin
* Dividers are horizontal to start, matching the default state of navbar nav links
* Dividers become vertical above 768px via media queries
2013-02-01 22:56:09 -08:00
Mark Otto dad9889aeb Fixes #6657: Upgrade Normalize to 2.1.0 2013-02-01 21:49:54 -08:00
Mark Otto 0bfbf1446d Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-01 21:44:35 -08:00
Mark Otto 8f0bc9e79b Merge branch 'dospuntocero-master' into 2.3.0-wip 2013-02-01 21:41:13 -08:00
Mark Otto d2ea2cdedd add horizontal-three-color gradient test 2013-02-01 21:41:02 -08:00
Mark Otto d53af49afe Refactor colors and progress bars
* Buttons and progress bars now make use of more semantic global @brand- colors
* Progress bars have been rewritten to reduce the number of possible selectors
* Instead of .progress .bar, it's .progress-bar for individual bars of color, ultimately making for less CSS
2013-02-01 16:21:38 -08:00
Mark Otto f328ebbc73 Merge pull request #6776 from ndabas/fix-inline-lists-ie7
Fix inline lists for IE7
2013-02-01 13:04:17 -08:00
Nikhil Dabas b7b2e4f8a1 Fixing inline lists for IE7 2013-02-02 02:04:30 +05:30
Mark Otto e4aa1fcef4 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/examples/hero.html
	docs/examples/sticky-footer-navbar.html
2013-02-01 10:34:25 -08:00
Mark Otto 2553d74b54 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/examples/hero.html
	docs/examples/sticky-footer-navbar.html
2013-02-01 10:34:25 -08:00
Mark Otto cc58a65fa1 Use button element instead of a for responsive navbar buttons 2013-02-01 10:33:36 -08:00
Mark Otto 7d655c3549 Use button element instead of a for responsive navbar buttons 2013-02-01 10:33:36 -08:00
Mark Otto ce497ae730 start to refactor justified nav example 2013-02-01 10:32:08 -08:00
Mark Otto 725cf7f6ec start to refactor justified nav example 2013-02-01 10:32:08 -08:00
Mark Otto b1088a2d49 button element instead of href-less a tag for navbar button 2013-02-01 10:30:48 -08:00
Mark Otto 7528b6e10a button element instead of href-less a tag for navbar button 2013-02-01 10:30:48 -08:00
Gil Barbara 24f0505bde Update input-group-addon for input sizes 2013-02-01 01:39:26 -02:00
Mark Otto 7c55cf0660 Refactor jumbotron-narrow.html example
* Make it mobile-first
* Add a handful of comments to explain CSS
* Instead of an <hr> between custom header and jumbotron, use border for a tighter mobile layout
2013-01-31 18:34:12 -08:00
Mark Otto 755f1776da Refactor jumbotron-narrow.html example
* Make it mobile-first
* Add a handful of comments to explain CSS
* Instead of an <hr> between custom header and jumbotron, use border for a tighter mobile layout
2013-01-31 18:34:12 -08:00
Mark Otto c3fefca1be Rename marketing-narrow to jumbotron-narrow for mo betta naming schemes 2013-01-31 18:25:44 -08:00
Mark Otto 19b5ebcf24 Rename marketing-narrow to jumbotron-narrow for mo betta naming schemes 2013-01-31 18:25:44 -08:00
Mark Otto c16aee941f Refactor jumbotron example:
* Add hella CSS comments
* Reduce padding on body to height of navbar, then set top margin on jumbotron at +768px
* Wrap marketing copy and footer in an extra div so we can set some padding for ideal responsive views
2013-01-31 18:22:47 -08:00
Mark Otto dfdf343825 Refactor jumbotron example:
* Add hella CSS comments
* Reduce padding on body to height of navbar, then set top margin on jumbotron at +768px
* Wrap marketing copy and footer in an extra div so we can set some padding for ideal responsive views
2013-01-31 18:22:47 -08:00
Mark Otto 52aa67fa1c only round jumbotron corners at 768px+ 2013-01-31 18:11:45 -08:00
Mark Otto b02a0fe768 Button up navbar form which was adding 2px padding to .navbar 2013-01-31 18:09:49 -08:00
Mark Otto fe5150d5dc Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-01-31 18:07:07 -08:00
Mark Otto bd265daa82 Update starter template to include left/right padding on inner container; also include body padding 2013-01-31 18:06:56 -08:00
Mark Otto 061d2849a6 Update starter template to include left/right padding on inner container; also include body padding 2013-01-31 18:06:56 -08:00
Mark Otto 5e5670a1b4 Remove gallery link from navbar; add to homepage examples section instead 2013-01-31 18:00:11 -08:00
Mark Otto 83e5c01856 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/css/docs.css
	docs/assets/js/application.js
	docs/components.html
	docs/templates/pages/components.mustache
	less/sprites.less
2013-01-31 17:57:31 -08:00
Gil Barbara e69912c163 Update line-height and padding for input sizes 2013-01-31 19:00:22 -02:00
RJ Regenold 2f44d8d2da removes anchor tag definition. 2013-01-31 12:49:53 -06:00
RJ Regenold 6014e63054 lets see how much i can mess this pull request up. :| 2013-01-31 11:10:41 -06:00
RJ Regenold ed2cf5b3e3 its not dyslexic being easy. 2013-01-31 11:04:12 -06:00
RJ Regenold e38d08d4c0 fixes jankiness with anchor tags in carousel. 2013-01-31 10:03:53 -06:00
Mark Otto baadc33c88 make on prev commit 2013-01-30 18:22:20 -08:00
Mark Otto 135e834bf4 Merge branch 'baslr-master' into 2.3.0-wip 2013-01-30 18:22:11 -08:00
Mark Otto 3cc65cb86c clear up show-grid stuff 2013-01-30 18:16:14 -08:00
Mark Otto dd4ce35ddc add meta tag to second example 2013-01-30 17:46:18 -08:00
Mark Otto a5fc3e0667 make on prev commit 2013-01-30 17:45:02 -08:00
Mark Otto 3b6b8e9f41 Merge branch 'greg-raven-patch-2' into 2.3.0-wip 2013-01-30 17:44:45 -08:00
Mark Otto f20c3368e4 Update pagination example HTML to match examples 2013-01-30 17:42:03 -08:00
Mark Otto d44acb7f88 Merge pull request #6750 from nextgenthemes/3.0.0-wip
Update less/carousel.less
2013-01-30 12:44:10 -08:00
nextgenthemes 72da31e028 Update less/carousel.less
lessified .carousel-caption
2013-01-30 18:14:22 +01:00
pseidemann c4eea3abde don't remove title attribute for tooltips
fixes #6445
2013-01-29 22:54:00 +01:00
Guillaume Smet b7764d8a33 Fix tooltip positioning for IE8
IE8 defines a placeholder object getBoundingClientRect which breaks the new getPosition() method
2013-01-29 19:50:13 +01:00
Mark Otto ab0c055bc6 Merge pull request #6728 from fredsa/2.3.0-wip
Fix `form-actions` documentation
2013-01-28 10:35:16 -08:00
Fred Sauer d6e3b6b5a4 Fix form-actions documentation 2013-01-28 10:01:59 -08:00
Guillaume Gautreau ee71fb492f No semicolumns 2013-01-27 10:56:01 +01:00
Guillaume Gautreau 5b0f956a60 Arrow replacement 2013-01-26 21:45:21 +01:00
Guillaume Gautreau d9a0abaa06 works with fixed test 2013-01-26 21:39:49 +01:00
Guillaume Gautreau db9ec13ce4 Test for replacing tooltip when resized 2013-01-26 21:39:05 +01:00
Guillaume Gautreau e5be883bb9 lint + wrong comparison 2013-01-26 14:31:33 +01:00
Guillaume Gautreau 929598784f Unit test for replacing tooltip inside window 2013-01-26 14:06:58 +01:00
Guillaume Gautreau 6803ff70f9 Tooltip positionning on special cases 2013-01-26 13:50:26 +01:00
baslr 6afb1055e3 .icon-folder-close same width as icon-folder-open
.icon-folder-close same width as icon-folder-open. this prevents
buttons from wobbling if the icon changes from closed folder
to open folder
2013-01-26 01:01:10 +01:00
Francisco arenas 2428904b4b Update less/mixins.less
horizontal three color gradient added
2013-01-24 03:37:52 -02:00
Greg Raven 22f1cc44ca Update docs/templates/pages/getting-started.mustache
Add meta tag for viewport in the <head>; revise the URL for the latest version of jQuery.
2013-01-22 06:46:53 -08:00
Mark Otto d30f47efb2 Tighten up badges docs; less bottom margin on h3 2013-01-19 18:53:41 -08:00
Mark Otto c21c3f101b Merge branch '3.0.0-wip-badges-to-counters' of https://github.com/vickash/bootstrap into vickash-3.0.0-wip-badges-to-counters 2013-01-19 17:06:40 -08:00
Vickash Mahabir c77a459b35 IE8 compatible fix for disabled button hover 2013-01-19 19:32:55 -04:00
Geoff Young f3268db4b4 Update Recess version 2013-01-19 16:27:10 -05:00
Mark Otto 5762b67a9f remove .navbar-inner from sticky footer navbar 2013-01-19 09:40:26 -08:00
Mark Otto 64bc5dc91f remove .navbar-inner from sticky footer navbar 2013-01-19 09:40:26 -08:00
Mark Otto 57a66ee7cd mo betta links between sticky footer examples 2013-01-19 09:39:56 -08:00
Mark Otto 1a88367b72 mo betta links between sticky footer examples 2013-01-19 09:39:56 -08:00
Mark Otto d7d5069be1 Add sticky footer navbar example to list; fix docs padding 2013-01-19 09:38:49 -08:00
Mark Otto 4e938ff018 update sticky footer templates 2013-01-19 09:34:08 -08:00
Mark Otto 7c9295d44b update sticky footer templates 2013-01-19 09:34:08 -08:00
Vickash Mahabir 67ec13a44c Counters example doesn't need to be a table 2013-01-18 18:03:43 -04:00
Vickash Mahabir 964cb77383 Make the counter example more meaningful 2013-01-18 17:50:58 -04:00
Vickash Mahabir 665de0455c Change .badge to .counter, make appearance more OSX-ish, and remove colors 2013-01-18 17:35:23 -04:00
Vickash Mahabir b741c731a2 Fix logic error where a disabled button would change color in an enabled fieldset 2013-01-18 12:12:30 -04:00
Vickash Mahabir 6e96cd1a7c Forgot to add built docs css file 2013-01-18 11:58:12 -04:00
Vickash Mahabir 27ff51dae6 Fix that thing with disabled buttons changing color on hover 2013-01-18 11:55:17 -04:00
Mark Otto e405a22301 unified and simplified sign in form example 2013-01-18 01:52:16 -08:00
Mark Otto 411e6b18cb unified and simplified sign in form example 2013-01-18 01:52:16 -08:00
Mark Otto 07543a9403 cleanup more examples 2013-01-18 01:37:31 -08:00
Mark Otto 82bfa965a7 cleanup more examples 2013-01-18 01:37:31 -08:00
Mark Otto a4ad96b848 mo betta justified nav 2013-01-18 01:33:55 -08:00
Mark Otto d4cb7077fe mo betta justified nav 2013-01-18 01:33:55 -08:00
Mark Otto 8713fa1edf overhaul justified nav example 2013-01-17 21:05:23 -08:00
Mark Otto 604f76dcf8 overhaul justified nav example 2013-01-17 21:05:23 -08:00
Mark Otto 70fca06f25 Remove docs and prettify css from examples thus far; update narrow page 2013-01-17 20:39:38 -08:00
Mark Otto 8111e307b9 Remove docs and prettify css from examples thus far; update narrow page 2013-01-17 20:39:38 -08:00
Mark Otto 56f8b735a5 fix up jumbotron example 2013-01-17 20:35:59 -08:00
Mark Otto caed3a9dbb fix up jumbotron example 2013-01-17 20:35:59 -08:00
Mark Otto 0f1af68e69 Rename hero.html to jumbotron.html 2013-01-17 20:32:07 -08:00
Mark Otto 6466fe00a1 Rename hero.html to jumbotron.html 2013-01-17 20:32:07 -08:00
Mark Otto 5075f4973b Semibold dat .navbar .brand 2013-01-17 20:30:40 -08:00
Mark Otto 0050688fec finish updating starter template 2013-01-17 20:30:19 -08:00
Mark Otto ac3c907799 finish updating starter template 2013-01-17 20:30:19 -08:00
Mark Otto dd58217712 comment tweaks and updating starter template 2013-01-17 20:28:05 -08:00
Mark Otto 1b128b3431 comment tweaks and updating starter template 2013-01-17 20:28:05 -08:00
Mark Otto fd89531f6a Update commenting and structure of layout.mustache 2013-01-17 20:26:17 -08:00
Mark Otto 68475f8707 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/css.html
	docs/customize.html
	docs/examples/fluid.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/layout.mustache
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	less/navbar.less
2013-01-17 20:23:33 -08:00
Mark Otto d9b35c2602 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/css.html
	docs/customize.html
	docs/examples/fluid.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/layout.mustache
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	less/navbar.less
2013-01-17 20:23:33 -08:00
Mark Otto f068cdeb63 Combine .thumbnail and .img-thumbnail into simpler selectors 2013-01-17 20:18:03 -08:00
Mark Otto ca74b9882b Change .img-polaroid to .img-thumbnail
* Same code, but different classes was confusing
* Now .img-thumbnail just extends .thumbnail
2013-01-17 20:16:04 -08:00
Mark Otto 89b6477bdc Remove .info from table rows 2013-01-17 20:13:11 -08:00
Mark Otto 5663833bfc Restore .btn-info 2013-01-17 19:51:22 -08:00
Mark Otto b30b8c2c12 Restore nav tabs, pills, justified variation, disabled links, and a few more things. Still need to add the dropdowns back though. 2013-01-17 17:02:35 -08:00
Mark Otto 41ecc2a171 derp, numbers 2013-01-17 16:35:30 -08:00
Mark Otto 2523b91dad dat min 2013-01-17 16:11:01 -08:00
Mark Otto 8765df47cd remove global text-shadow from alerts components because it was fucking up buttons in a real way 2013-01-17 15:43:23 -08:00
Mark Otto e304798194 scrollspy example twerks 2013-01-17 15:42:52 -08:00
Mark Otto 3a1e1167d6 restore scrollspy example 2013-01-17 15:40:43 -08:00
Mark Otto 97975c5fcf Readd focused example of inputs to docs; clean up alerts section 2013-01-17 15:36:36 -08:00
Mark Otto 32bcbe5671 cleanup example templates 2013-01-17 15:00:49 -08:00
Mark Otto f6226c9b91 Update Getting Started page to include mention of Respond 2013-01-17 14:49:52 -08:00
Mark Otto 237f5e15d3 Nuke shadows around thumbnails 2013-01-17 14:25:40 -08:00
Mark Otto bb94de7873 Larger homepage headings 2013-01-17 14:22:41 -08:00
Mark Otto 5c76518f7d Add respond.js to main docs pages, but only for IE8 and down 2013-01-17 14:00:03 -08:00
Mark Otto 01b465928e overhaul alerts section of tests 2013-01-17 12:24:16 -08:00
Mark Otto bbb3c0a0e6 Merge branch 'ravage84-patch-2' into 2.3.0-wip 2013-01-17 12:21:34 -08:00
Mark Otto 7c23d889bb Change subheading of alerts page 2013-01-17 12:13:37 -08:00
Mark Otto 26f9f4e3a5 Remove navbar search 2013-01-17 12:02:17 -08:00
Mark Otto 32ebe2efd1 mo betta navbar dropdowns 2013-01-17 11:55:37 -08:00
Mark Otto 597a248d4a Rearrange navbar.less and improve vertical divider support 2013-01-17 11:34:46 -08:00
Mark Otto 360f0c5359 Fix floats in navbar 2013-01-17 11:20:19 -08:00
Mark Otto 01b32f472d Simplify and bring back the grid mixin for generating spans and offsets 2013-01-17 10:49:10 -08:00
ravage84 650c77ddb9 Update less/tests/css-tests.html
Extended css-tests with alerts (alerts and alert-blocks)
2013-01-17 11:34:00 +01:00
Mark Otto 7e46b6f636 Update nav and add bounds for tablet container 2013-01-17 00:58:34 -08:00
Mark Otto 267d3e7ed7 streamline css docs 2013-01-17 00:50:19 -08:00
Mark Otto 2398245e17 Remove all old responsive styles since we're motherfucking mobile first son 2013-01-17 00:43:58 -08:00
Mark Otto 687d4a3eeb Move grid/container styles to grid.less; update docs; add offsetting back 2013-01-17 00:42:31 -08:00
Mark Otto 255cb87734 update getting started to reflect latest changes; pull list of components because fuck that 2013-01-17 00:27:46 -08:00
Mark Otto a8a60e94e3 padding twerk 2013-01-17 00:24:18 -08:00
Mark Otto 33864b4a3d dat docs messaging (on the homepage) 2013-01-17 00:23:25 -08:00
Mark Otto 9374965b83 docs css cleanup 2013-01-17 00:20:00 -08:00
Mark Otto 630005687d Remove ported navbar css that was already commented out 2013-01-17 00:13:12 -08:00
Mark Otto 4129be6ebd Update sidenav and responsive css 2013-01-17 00:13:04 -08:00
Mark Otto f535201781 improve navbar vars and fix side nav alignment 2013-01-16 23:33:26 -08:00
Mark Otto 6b193dc22d More navbar tweaks, including making fixed navbars work in the docs by adding padding to body 2013-01-16 16:20:29 -08:00
Mark Otto 9ba14cfb7c More navbar derping 2013-01-16 16:14:41 -08:00
Mark Otto 960804cea3 mo betta new navbar styles; hook up some changed vars 2013-01-16 15:35:41 -08:00
Mark Otto ee9403e2d2 flatten the progress bars 2013-01-16 15:19:55 -08:00
Mark Otto baa8c3ec9e restore alerts, and make them suck much less 2013-01-16 15:16:04 -08:00
Mark Otto 0b81dd217f tuck some margins 2013-01-16 15:11:17 -08:00
Mark Otto 1288304e91 Make jumbotron mo responsive 2013-01-16 15:07:57 -08:00
Mark Otto cf693b5632 Add in responsive for 1200px+ layout; increase padding for that viewport size 2013-01-16 14:48:25 -08:00
Mark Otto 13a80f33c8 fix up sidenav and components page 2013-01-16 14:10:33 -08:00
Mark Otto 3e40e7dfbf mo betta sidenav for responsive hotness 2013-01-16 13:20:32 -08:00
Mark Otto beb2c13f4d Prevent grids from collapsing, fix affixed side nav for docs 2013-01-16 13:11:45 -08:00
Mark Otto a7a06a05a4 Remove commented out files; leave responsive stuff commented out for now 2013-01-16 13:08:27 -08:00
Mark Otto 910ca85a70 restore remaining components 2013-01-16 13:07:41 -08:00
Mark Otto bc7fd582ed restore pagination and pager 2013-01-16 13:07:08 -08:00
Mark Otto 2127690e73 restore breadcrumbs 2013-01-16 13:06:15 -08:00
Mark Otto 2407217686 restore wells and close 2013-01-16 13:05:20 -08:00
Mark Otto ab38493e91 Restore button groups 2013-01-16 13:04:29 -08:00
Mark Otto c18b5b9735 restore glyphicons docs styles and then overhaul the shit out of them 2013-01-16 13:02:15 -08:00
Mark Otto a4cc704220 Restore dropdowns.less 2013-01-16 12:44:31 -08:00
Mark Otto eb3cd5d7d2 Restore responsive docs 2013-01-16 12:44:25 -08:00
Mark Otto c76f1cd97e restore glyphicons 2013-01-16 12:30:44 -08:00
Mark Otto 992e0d922a Re-add and update form styles:
* Restore forms.less file
* Overhaul .radio.inline .checkbox.inline to be .radio-inline or .checkbox-inline
* Update docs to reflect changes
2013-01-16 12:23:05 -08:00
Mark Otto b6b8633542 twerk docs code examples 2013-01-16 12:02:45 -08:00
Mark Otto cb99c4b63a restore table styles 2013-01-16 11:48:20 -08:00
Mark Otto 6ac6be2a5e more subhead/jumbotron tweaks for docs 2013-01-16 11:45:16 -08:00
Mark Otto 0df7411362 Derp on type styles a bit more; bring back and fix up more more docs styles 2013-01-16 11:38:34 -08:00
Mark Otto 81a22e189a add back docs footer 2013-01-16 11:03:54 -08:00
Mark Otto cb0691d92f mo betta type margins for headings 2013-01-16 10:57:00 -08:00
Mark Otto 8fd26040d8 Port over temp responsive styles to bootstrap.less; readd buttons 2013-01-16 10:52:33 -08:00
Mark Otto 5a3cb0d778 remove extra border-radius props 2013-01-16 10:49:19 -08:00
Mark Otto b80bf2c138 Merge pull request #6600 from Yohn/patch-12
added missing class to doc example
2013-01-16 10:28:02 -08:00
Mark Otto 38c5c13d38 Merge pull request #6591 from Quy/2.3.0-wip
Add text alignment classes info to docs
2013-01-16 10:24:13 -08:00
Yohn 598e9e6f13 Update docs/templates/pages/components.mustache 2013-01-16 07:46:42 -05:00
Yohn 60bb95e611 adding class to example code 2013-01-16 07:45:31 -05:00
Quy Ton 1da1994ba4 Add text alignment classes info to docs 2013-01-15 18:16:44 -08:00
Mark Otto 85db846b65 mobile-first navs, navbar, grids, and type 2013-01-15 17:55:14 -08:00
Mark Otto 094767fbfe code changes 2013-01-15 14:34:04 -08:00
Mark Otto 267690eb1b docs changes, more type improvements, add grid system basics back 2013-01-15 14:30:00 -08:00
Mark Otto a67c86e40f Fixes #6586: remove top 5px margin from navbar input group button groups 2013-01-15 10:27:30 -08:00
Mark Otto c34ef69100 add text alignment classes from 3.0 2013-01-15 10:15:02 -08:00
Mark Otto 09696143e0 type and stuff 2013-01-15 10:14:12 -08:00
Patrick H. Lauke c55329085e Revert "Leave tabindex=-1 alone"
This reverts commit 370fa45fbe.
2013-01-15 07:22:02 +00:00
Patrick H. Lauke 370fa45fbe Leave tabindex=-1 alone
It seems that, as misguided as I personally think it is, ARIA does
indeed want dropdown menus not to behave as regular keyboard users
expect them, killing TAB/SHIFT+TAB in favor of cursor keys. Fair
enough, the issue I have is then with ARIA, not with bootstrap. I would
sugges thought that if you really do want to follow ARIA consistently,
*any* navigation bar should also become an ARIA menu, further making it
impossible for keyboard users to use TAB/SHIFT+TAB to navigate through
it, and that these changes should be reflected in the bootstrap
examples as well...
2013-01-15 07:16:33 +00:00
Patrick H. Lauke 4503ad7808 Revert "Keyboard accessibility in documentation"
This reverts commit a809daf284.
2013-01-15 07:13:19 +00:00
Mark Otto 25c9b6b59a nuke and flatten and stuff 2013-01-14 22:05:55 -08:00
Nicolas Dudebout 6512c5a5bc Changes some more commands to use the local npm install. 2013-01-14 09:02:25 -05:00
Nicolas Dudebout 915ebf9f30 Allows the user to set different source and destination in Makefile.
A user can use the following command to determine where to copy the resulting css file:

    $ BOOTSTRAP=<my-path> make
2013-01-14 09:01:19 -05:00
Nicolas Dudebout 10a83b1e62 Modifies the Makefile to use local npm install **when available**
The change introduced in 5bd8cdca9 was:

  - partial, as not all the command were translated
  - preventing the use of a global npm installation
2013-01-14 09:01:19 -05:00
Nicolas Dudebout 2a151d9e2f Moves one @printf statement to be more accurate. 2013-01-14 08:58:47 -05:00
Nicolas Dudebout 25803a966b Replaces some @echo recipes by @printf.
The echo command does not understand the -n argument on Mac OS X.
This is due to the fact that:

  - Makefile calls /bin/sh to execute a command
  - in Mac OS X, /bin/sh is a link to bash
  - in Mac OS X, bash is compiled with --enable-strict-posix-default

Therefore, the echo command does not have the -n argument.

printf on the other hand is a builtin function that works well on Mac OS X and Linux.
2013-01-14 08:58:16 -05:00
Nicolas Dudebout 5204f206b9 Splits the progress @echo statements in the Makefile. 2013-01-14 08:57:44 -05:00
Mark Otto 337741fc9a Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-01-14 00:33:16 -08:00
Mark Otto 0f9073c5cd Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing 2013-01-14 00:11:55 -08:00
Mark Otto f9ee99cf6f Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing 2013-01-14 00:11:55 -08:00
Mark Otto 5ae1df617f Merge pull request #6568 from Yohn/patch-12
Updating docs -> popover to show container option
2013-01-14 00:03:55 -08:00
Yohn a23eb06536 fix typo 2013-01-13 15:32:51 -05:00
Yohn ecc24953a5 fix typo 2013-01-13 15:32:03 -05:00
Yohn 98aeb0acf1 added container options to docs for popover 2013-01-13 15:23:22 -05:00
Yohn fdd1daeae1 added container options to docs for popover 2013-01-13 15:21:31 -05:00
Mark Otto d247f71217 Reset docs jumbotron button to blue defaults 2013-01-13 04:27:51 -08:00
Mark Otto cecabeadec Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap-affix.js
	docs/assets/js/bootstrap-alert.js
	docs/assets/js/bootstrap-button.js
	docs/assets/js/bootstrap-carousel.js
	docs/assets/js/bootstrap-collapse.js
	docs/assets/js/bootstrap-dropdown.js
	docs/assets/js/bootstrap-modal.js
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap-scrollspy.js
	docs/assets/js/bootstrap-tab.js
	docs/assets/js/bootstrap-tooltip.js
	docs/assets/js/bootstrap-transition.js
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/components.html
	docs/css.html
	docs/examples/fluid.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/extend.mustache
	docs/templates/pages/getting-started.mustache
	docs/templates/pages/index.mustache
	docs/templates/pages/javascript.mustache
	js/bootstrap-affix.js
	js/bootstrap-alert.js
	js/bootstrap-button.js
	js/bootstrap-carousel.js
	js/bootstrap-collapse.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tab.js
	js/bootstrap-tooltip.js
	js/bootstrap-transition.js
	js/bootstrap-typeahead.js
	less/bootstrap.less
	less/buttons.less
	less/forms.less
	less/navbar.less
	less/popovers.less
	less/responsive-767px-max.less
	less/responsive.less
	less/tables.less
	less/tooltip.less
	less/type.less
	less/variables.less
	package.json
2013-01-13 04:26:52 -08:00
Mark Otto 7d8d5c7838 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap-affix.js
	docs/assets/js/bootstrap-alert.js
	docs/assets/js/bootstrap-button.js
	docs/assets/js/bootstrap-carousel.js
	docs/assets/js/bootstrap-collapse.js
	docs/assets/js/bootstrap-dropdown.js
	docs/assets/js/bootstrap-modal.js
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap-scrollspy.js
	docs/assets/js/bootstrap-tab.js
	docs/assets/js/bootstrap-tooltip.js
	docs/assets/js/bootstrap-transition.js
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/components.html
	docs/css.html
	docs/examples/fluid.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/extend.mustache
	docs/templates/pages/getting-started.mustache
	docs/templates/pages/index.mustache
	docs/templates/pages/javascript.mustache
	js/bootstrap-affix.js
	js/bootstrap-alert.js
	js/bootstrap-button.js
	js/bootstrap-carousel.js
	js/bootstrap-collapse.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tab.js
	js/bootstrap-tooltip.js
	js/bootstrap-transition.js
	js/bootstrap-typeahead.js
	less/bootstrap.less
	less/buttons.less
	less/forms.less
	less/navbar.less
	less/popovers.less
	less/responsive-767px-max.less
	less/responsive.less
	less/tables.less
	less/tooltip.less
	less/type.less
	less/variables.less
	package.json
2013-01-13 04:26:52 -08:00
Mark Otto 76ed6b0b2c Remove comment out code and simplify what's left for button group toggles 2013-01-13 04:05:34 -08:00
Mark Otto 1916eb7c7f Fix btn link hover and tweak dropdown border/shadows 2013-01-13 04:04:16 -08:00
Mark Otto 0b31cfc90e Fix up .brand in navbar of docs 2013-01-12 20:10:42 -08:00
Mark Otto 01db5db2f6 white text on buttons on hover for links 2013-01-12 20:08:13 -08:00
Mark Otto 4b34f4947a Update Holder.js 1.6 to 1.9 2013-01-12 19:49:15 -08:00
Mark Otto ea1a12593d Nuke shadow on pagination 2013-01-12 19:46:47 -08:00
Mark Otto 8670021935 fixed navbars fixings 2013-01-12 19:44:51 -08:00
Mark Otto 1ea647ce98 Remove shadows from active links in navbar 2013-01-12 19:02:58 -08:00
Mark Otto 7bcd02c167 Tweak button 2013-01-12 19:02:48 -08:00
Mark Otto 583fc4b962 buttons and button group flattening improvements 2013-01-12 18:52:06 -08:00
Mark Otto fb4fc323a2 remove font-sizes from button group btn sizes 2013-01-12 17:54:30 -08:00
Mark Otto a9a66e9c34 finetune buttons flattened colors 2013-01-12 17:51:57 -08:00
Mark Otto ff02043bbc Flatten navbar 2013-01-12 14:31:18 -08:00
Mark Otto a33d45f308 Merge branch '3.0.0-wip' into bs3-flatten 2013-01-12 14:16:49 -08:00
Mark Otto 24f7df15e6 Remove mention of Extend page from readme and index page 2013-01-12 13:57:41 -08:00
Mark Otto b1f0a7e62b Remove Extend page from the docs entirely
* Information was old and out of date on compiling Bootstrap
* Information was also not directly related to Bootstrap with background info on Less and apps for compiling (Google it, yo)
* Starter template and recommended HTML is already in use on the Getting Started page
2013-01-12 13:46:07 -08:00
Mark Otto 7a3f078fb4 Remove parent div from pagination component
* No more div.pagination; it's now just ul.pagination
* No more .pagination-right or .pagination-centered
* Sizes remain
* Any further customization, such as alignment, should be done on the individual application or site level.
2013-01-12 13:15:19 -08:00
Mark Otto 6f275c6148 Update extend page to point to readme for compiling.
Note that we'll be dropping this page entirely as it's out of date and other compiling options are not recommended for contributing back to the project.
2013-01-12 12:41:01 -08:00
Patrick H. Lauke a809daf284 Keyboard accessibility in documentation
Removed unnecessary (?) and harmful (from a keyboard access point of
view) tabindex=-1 in the documentation examples.
2013-01-12 17:04:51 +00:00
Patrick H. Lauke 77c68e4bc2 Cleaned up dirty CSS
Used recess rather than less
2013-01-12 11:02:13 +00:00
Mark Otto a7231854c9 Address #6459 and add mention of disabled links in dropdowns to le docs 2013-01-12 00:33:12 -08:00
Mark Otto 8a16746542 Merge pull request #6462 from cvrebert/input-required-docs-fix-2.3.0
update 2.3.0 docs to reflect #5786
2013-01-12 00:29:34 -08:00
Mark Otto 3773b99969 Merge pull request #6463 from cvrebert/input-required-docs-fix-3.0.0
update 3.0.0 docs to reflect #5786
2013-01-12 00:29:23 -08:00
Mark Otto e195457728 Merge pull request #6472 from RWOverdijk/patch-1
Update composer.json
2013-01-12 00:21:08 -08:00
Mark Otto d034ec74c4 fix username navbar text in fluid example for responsive variations 2013-01-12 00:20:13 -08:00
Mark Otto aaf80d410a fix username navbar text in fluid example for responsive variations 2013-01-12 00:20:13 -08:00
Mark Otto 19e2ad0eb6 Fixes #6538: Add th support to all the .table-rounded selectors 2013-01-11 23:38:53 -08:00
Mark Otto 6f894c62a5 Fixes #6528: Make .navbar a:hover .caret use @navbarlinkcolorhover and not -active 2013-01-11 23:35:22 -08:00
Mark Otto 42efd9f730 Address #6545: clarify initialization of tooltips in docs 2013-01-11 20:58:24 -08:00
Mark Otto 4de3a77a64 Fixes #6547: Make blockquotes use multiple of @baseFontSize 2013-01-11 20:55:09 -08:00
Mark Otto 88e816956a Fixes #6552: example fix for button group 2013-01-11 20:52:39 -08:00
Mark Otto b242ff7851 Fixes #6553: example fix for validation states 2013-01-11 20:51:11 -08:00
Mark Otto 767a293b4d Increase input group margin on bottom and vertically center to match inputs 2013-01-11 20:46:21 -08:00
Mark Otto 56a24027c3 Fixes #6473: Make .input-prepend and .input-append inline-block to match other form states 2013-01-11 20:42:44 -08:00
Mark Otto d3b3b4c48f Fixes #6474: remove duplicate .btn border colors to make @btn-border work 2013-01-11 20:40:17 -08:00
Mark Otto d7c93fc647 Fixes #6478: scope table backgrounds to immediate td/th elements 2013-01-11 20:38:14 -08:00
Mark Otto 07a5563a0b Comment fix 2013-01-11 20:30:56 -08:00
Mark Otto 53f9e25150 Comment fix 2013-01-11 20:30:56 -08:00
Mark Otto 7b3f74311e Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-01-11 20:27:00 -08:00
Mark Otto 7626cc629f Remove overflow: auto; from .tab-content 2013-01-11 20:26:48 -08:00
Mark Otto b9b5cd786d Fixes #6555: remove .controls-row from responsive 2013-01-11 20:23:37 -08:00
Mark Otto 0f34666f07 Merge pull request #6550 from Boulox/font-variable-fix
Add glyphicons font path variable
2013-01-11 11:11:32 -08:00
Mark Otto 99649aad71 Remove navbar links from sticky footer navbar example 2013-01-11 11:00:45 -08:00
Mark Otto 649d8c985e Remove navbar links from sticky footer navbar example 2013-01-11 11:00:45 -08:00
Mark Otto 98b0d4946f Merge branch 'wilfra-patch-2' into 2.3.0-wip 2013-01-11 10:58:17 -08:00
Mark Otto 839f83c610 Merge branch 'wilfra-patch-2' into 2.3.0-wip 2013-01-11 10:58:17 -08:00
Fabien c91bf424b0 Add glyphicons font path variable 2013-01-11 18:32:00 +01:00
Mark Otto 6e5a2fedaa Nuke .popover-inner from the JS since we nuked it from the CSS/HTML long ago 2013-01-10 18:51:04 -08:00
William Franceschine e7a13a9416 Update docs/examples/marketing-narrow.html
Updated copyright to 2013
2013-01-10 02:14:14 -08:00
William Franceschine cf852c1f62 Update docs/examples/marketing-narrow.html
Updated copyright to 2013
2013-01-10 02:14:14 -08:00
William Franceschine d05006349e Update docs/examples/marketing-alternate.html
Updated copyright to 2013
2013-01-10 02:13:57 -08:00
William Franceschine 9fdc9887cf Update docs/examples/marketing-alternate.html
Updated copyright to 2013
2013-01-10 02:13:57 -08:00
William Franceschine 82eeba11b1 Update docs/examples/hero.html
Updated copyright to 2013
2013-01-10 02:13:43 -08:00
William Franceschine edfc0bf8b3 Update docs/examples/hero.html
Updated copyright to 2013
2013-01-10 02:13:43 -08:00
William Franceschine 69cc97dd34 Update docs/examples/carousel.html
Updated copyright to 2013
2013-01-10 02:13:26 -08:00
William Franceschine 1eb6a1d8c8 Update docs/examples/carousel.html
Updated copyright to 2013
2013-01-10 02:13:26 -08:00
William Franceschine ebd17141e8 Update docs/examples/fluid.html
Updated copyright to 2013
2013-01-10 02:10:52 -08:00
William Franceschine 5eff3cdd5d Update docs/examples/fluid.html
Updated copyright to 2013
2013-01-10 02:10:52 -08:00
Mark Otto 1d87bcc9f5 Merge branch 'aronwoost-patch-1' into 2.3.0-wip 2013-01-09 21:37:11 -08:00
Mark Otto a2854c8307 Merge branch 'Justin-John-master' into 2.3.0-wip 2013-01-09 21:35:50 -08:00
Mark Otto 976b4ea263 Merge branch 'Justin-John-master' into 2.3.0-wip 2013-01-09 21:35:50 -08:00
Mark Otto ee9cd0180d add sticky footer with navbar 2013-01-09 19:53:42 -08:00
Mark Otto ccf4c2fbe3 add sticky footer with navbar 2013-01-09 19:53:42 -08:00
Mark Otto 91dd77939b Add text alignment utility classes 2013-01-09 18:56:08 -08:00
Justin John Mathews 7b4971e4d1 Corrected carousel arrows to active.#6494, #6489
Corrected the carousel arrows to active on resizing the browser window.
2013-01-09 15:53:17 +05:30
Justin John Mathews 2c2a847e75 Corrected carousel arrows to active.#6494, #6489
Corrected the carousel arrows to active on resizing the browser window.
2013-01-09 15:53:17 +05:30
Aron Woost aeb0e85151 replaced tabs with spaces 2013-01-09 10:15:15 +01:00
Kenan Shifflett b5ad50686c Removed touchstart from bootstrap-dropdown.js. 2013-01-07 20:13:28 -05:00
Wesley Overdijk bf3dea668f Update composer.json
target-dir is not needed. All it does, is nest everything another level deeper. It should only be used for completing psr-0 paths.
2013-01-06 16:43:41 +01:00
Chris Rebert 206205a6b2 update docs to reflect #5786 2013-01-05 17:36:20 -08:00
Chris Rebert 684c9d8d05 update docs to reflect #5786 2013-01-05 17:14:22 -08:00
Patrick H. Lauke 034155ec21 Basic keyboard accessibility CSS tweaks
Mostly doubling-up :hover styles to also cover :focus, as a first step
to making the framework more keyboard-friendly.
Additionally, fixed two small markup issues in the docs/examples to
make the "Learn more" large primary button-styled links
keyboard-focusable (as without href they're treated as non-tabable
anchors).
2013-01-02 22:39:21 +00:00
Patrick H. Lauke 848ca6e315 Basic keyboard accessibility CSS tweaks
Mostly doubling-up :hover styles to also cover :focus, as a first step
to making the framework more keyboard-friendly.
Additionally, fixed two small markup issues in the docs/examples to
make the "Learn more" large primary button-styled links
keyboard-focusable (as without href they're treated as non-tabable
anchors).
2013-01-02 22:39:21 +00:00
Mark Otto 3d04d9ba75 Super lame typo on my part, sorry @necolas :) 2012-12-28 19:24:13 -06:00
Mark Otto 5a2dc0b897 Improve documentation for new form validation styles 2012-12-28 14:47:55 -06:00
Mark Otto 1c0e4fc7bb Popovers are now flexible width:
* Instead of a fixed width, we use max-width
* Width has been increased from 240px to 280px
* Added ability to hide the title via CSS :empty selector if no title is provided
2012-12-28 14:18:59 -06:00
Mark Otto f69d12af3d Merge pull request #6407 from aurnik/master
Fix link to File structure anchor
2012-12-28 11:10:46 -08:00
Mark Otto 6f8e315b1d Merge branch 'sparanoid-transition-duration' into 2.3.0-wip
Conflicts:
	docs/assets/img/bootstrap-docs-readme.png
2012-12-28 13:08:49 -06:00
Tunghsiao Liu 3096a377a2 Add transition-duration mixin 2012-12-28 16:19:12 +08:00
Aurnik Islam aa997e274e Fix link to File structure anchor 2012-12-27 01:49:09 -08:00
Mark Otto dc5c6d6be8 Simplify form validation states while enabling them to be applied to one field at a time. 2012-12-26 15:57:52 -06:00
Mark Otto d0baa99aed Remove .text-info and .info form validation states 2012-12-26 14:59:58 -06:00
Mark Otto 2ef4fde09f Drop .input-block-level modifier as inputs are already width: 100%; 2012-12-26 14:19:48 -06:00
Mark Otto 12b738bf30 Add grid column example to form input sizing 2012-12-26 14:13:44 -06:00
Mark Otto 070109abc1 Remove .controls-row; instead, folks should use .row and .span* for all their grid input sizing needs when multiple inputs per line are required 2012-12-26 14:09:36 -06:00
Mark Otto 0da31ceb51 Cleanup spacing in variables file 2012-12-26 14:06:21 -06:00
Mark Otto c17673dc61 Restore .form-horizontal 2012-12-26 13:59:09 -06:00
Mark Otto 9921d21969 Run make on previous commits 2012-12-26 13:59:01 -06:00
Mark Otto b19fd8e4fa Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2012-12-26 10:15:23 -06:00
Mark Otto 330b143b40 Add longer tooltip example to docs, tighten up line-height on tooltip; run make 2012-12-26 09:36:07 -06:00
Mark Otto 9749d6afc2 Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2012-12-26 09:21:34 -06:00
fat-kun b9c7f29134 Merge pull request #6378 from Yohn/patch-7
fixes tooltip insert problems
2012-12-24 16:17:25 -08:00
Yohn 340d90138c Update docs/templates/pages/javascript.mustache 2012-12-24 19:03:13 -05:00
Yohn 2a5fde272c Update docs/javascript.html 2012-12-24 19:01:56 -05:00
Yohn 9835549faf made container option be false 2012-12-24 18:59:37 -05:00
Yohn e867ae7b60 removed the length check
updated it to @fat's suggestion
2012-12-24 18:07:41 -05:00
Mark Otto c063f7c9c2 Update docs to reflect latest on .clearfix 2012-12-24 02:08:45 -08:00
Mark Otto d206ec1659 Remove .badge-info and .badge-inverse; change docs label of .badge-important to .badge-danger 2012-12-24 02:06:28 -08:00
fat-kun 90cdef8dfe Merge pull request #6380 from Yohn/patch-10
promote using data-toggle instead of rel for tooltip and popover
2012-12-23 19:22:51 -08:00
fat-kun 0a7c840173 Merge pull request #6375 from tkawachi/tooltip-events-2.3.0
Tooltips fires show, shown, hide, hidden events
2012-12-23 19:19:58 -08:00
Yohn dfbac13ad1 data-toggle instead of rel for tooltip and popover 2012-12-23 07:04:24 -05:00
Yohn 5da8b315c0 data-toggle instead of rel for tooltip and popover 2012-12-23 07:00:03 -05:00
Yohn da0217405f data-toggle instead of rel for tooltip and popover 2012-12-23 06:51:46 -05:00
Yohn f152dead92 Update docs/javascript.html 2012-12-23 04:25:27 -05:00
Yohn 68ff08cc91 Update docs/templates/pages/javascript.mustache 2012-12-23 04:23:18 -05:00
Yohn b6960d8cf9 Update js/tests/unit/bootstrap-tooltip.js 2012-12-23 04:21:02 -05:00
Yohn d594d6377a adding container option to tooltips 2012-12-23 04:18:16 -05:00
KAWACHI Takashi defe85bb51 Assign event variables at declarations 2012-12-23 15:17:41 +09:00
KAWACHI Takashi 7a3a88acc6 Tooltips fires show, shown, hide, hidden events
It is re-worked from #3691.
2012-12-23 14:42:13 +09:00
fat-kun 48211ad9f5 Merge pull request #6374 from whyisjake/2.3.0-wip
Update docs/templates/pages/javascript.mustache
2012-12-22 21:18:36 -08:00
Jake Spurlock 0834bd51ec Update docs/templates/pages/javascript.mustache
Adding spaces around the pipes. Makes it consistent with the rest of the docs.
2012-12-22 21:03:58 -08:00
Mark Otto f74990d898 Version bump 2012-12-22 16:10:06 -08:00
fat-kun d09b46fe37 Merge pull request #6349 from Yohn/patch-6
Fixes #5753 with tooltip('toogle')
2012-12-22 14:53:24 -08:00
fat effba9e55c add data-api namespace to dropdown 2012-12-22 14:22:45 -08:00
fat 2c0ed072b0 shifting focus to parent and adding aria menuitem for dropdown 2012-12-22 13:57:57 -08:00
fat 4d195222d4 remake js 2012-12-22 13:48:28 -08:00
fat a9e661a2b5 read data options in constructor for collapse 2012-12-22 13:48:16 -08:00
fat fad0fb683b allow multiple trigger types in tooltip and popover + default tooltip to hover & focus 2012-12-22 13:24:37 -08:00
fat e2434fefbd chnage for #6248 2012-12-21 20:27:53 -08:00
fat-kun 356e47efe1 Merge pull request #6247 from jimwebb/scrollspy-documentation-clarify
change scrollspy documentation to clarify javascript usage
2012-12-21 20:23:44 -08:00
fat f59bf47081 Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2012-12-21 20:20:04 -08:00
fat ddd59f22c7 update mustace to reflect changes to data-slide-to 2012-12-21 20:19:33 -08:00
fat 24a36df9f6 add support for [data-slide-to] attr on carousel 2012-12-21 19:45:19 -08:00
Mark Otto 4fa4d5254d Fixes #6189: Add holder.js to carousel example 2012-12-21 19:10:05 -08:00
Mark Otto 7f7039321d Fixes #6189: Add holder.js to carousel example 2012-12-21 19:10:05 -08:00
Mark Otto a55605ca57 add readme image 2012-12-21 19:04:59 -08:00
Mark Otto 442012f0f5 Smaller image update to readme 2012-12-21 19:02:33 -08:00
Mark Otto 5a2966a2c2 Downsize image 2012-12-21 18:59:51 -08:00
Mark Otto d23006a6bd Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2012-12-21 18:59:14 -08:00
Mark Otto ccafc8a010 Explore adding icon to readme 2012-12-21 18:58:59 -08:00
Mark Otto 558bc52432 Add docs readme icon 2012-12-21 18:54:36 -08:00
fat 818c56f078 rewrite makefile to make a bit more "efficient" + rebuild 2012-12-21 17:42:24 -08:00
fat 82a758344d add direction prop to carousel slide event 2012-12-21 17:31:54 -08:00
fat e194c3e4f4 rebuild 2012-12-21 17:25:31 -08:00
fat 5da30ee5fb Merge branch 'marcelkorpel-master' into 2.3.0-wip 2012-12-21 17:24:45 -08:00
fat d5345f806c Merge branch 'master' of git://github.com/marcelkorpel/bootstrap into marcelkorpel-master 2012-12-21 17:19:36 -08:00
Mark Otto dc32555f5b Fixes #6370: Add comment to docs on typeahead and autocomplete 2012-12-21 15:46:10 -08:00
Mark Otto c11f41ba04 flatten buttons and forms 2012-12-21 00:50:28 -08:00
Mark Otto 704dfb2f1d Merge pull request #6360 from Quy/2.3.0-wip
Miscellaneous changes to docs
2012-12-21 00:28:07 -08:00
Mark Otto 7c04d573d0 update docs regarding normalize and clearfix 2012-12-20 21:44:45 -08:00
Quy Ton a27bf30f0d Miscellaneous changes to docs 2012-12-20 21:38:53 -08:00
Mark Otto 5d4e718446 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2012-12-20 20:56:00 -08:00
Mark Otto 5508d3d5b3 Remove reset.less now that Normalize 2 is fully integrated 2012-12-20 20:52:43 -08:00
Mark Otto 7b7581d44a Finish migrating to Normalize 2:
* Port print styles from reset.less to scaffolding.less
* Port responsive image styles from reset.less to scaffolding.less
2012-12-20 20:52:20 -08:00
Mark Otto b7f2a382b6 Update new example name and links 2012-12-20 20:27:07 -08:00
Mark Otto c1e82732cf Update new example name and links 2012-12-20 20:27:07 -08:00
Mark Otto d6d828154a Merge pull request #6354 from cvrebert/3.0.0-wip
add comment regarding caveat of #6199 impl per discussion in/of 14844db862
2012-12-20 15:33:52 -08:00
Mark Otto a24e47b5b8 Update the examples index:
* Retina ready screenshots
* Added screenshot and link to justified nav example (previously unlinked marketing-alternate.html)
2012-12-20 15:08:05 -08:00
Mark Otto 0f9490bf3e Fixes #6352: marketing-alternate broken nav in FF17 2012-12-20 14:40:39 -08:00
Mark Otto 43d130762b Fixes #6352: marketing-alternate broken nav in FF17 2012-12-20 14:40:39 -08:00
Mark Otto 69f6149489 Normalize indentation from 4 to 2 spaces 2012-12-20 14:11:40 -08:00
Mark Otto 1c33b857a6 Convert normalize comments to // style 2012-12-20 14:08:09 -08:00
Mark Otto be74ad7e0d Merge branch '3.0.0-wip' into bs3-normalize
Conflicts:
	less/bootstrap.less
2012-12-20 14:02:54 -08:00
Mark Otto 8eb1549842 remove .hide specificity override from grid classes 2012-12-20 13:57:14 -08:00
Mark Otto 6bd5dc7d9f Add important flag to .show/.hide utility classes; remove .hide requirement from modals 2012-12-20 13:53:38 -08:00
Mark Otto a5e04c0799 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	docs/templates/pages/base-css.mustache
	less/dropdowns.less
	less/forms.less
2012-12-20 13:47:36 -08:00
Mark Otto 5e4f663e69 Undo important on hide/show utilties; punt to 3.0 2012-12-20 13:46:07 -08:00
Mark Otto 00ff34b9e6 fix up code snippet 2012-12-20 13:41:45 -08:00
Mark Otto b6575cc72e fix up code snippet 2012-12-20 13:41:08 -08:00
Chris Rebert 30f72e69e3 add comment regarding caveat of #6199 impl per discussion in/of 14844db862 2012-12-20 11:00:47 -08:00
Yohn a6705246d0 Update js/tests/unit/bootstrap-tooltip.js 2012-12-20 04:36:57 -05:00
Yohn e21b6459ad fixes tooltip('toggle') 2012-12-20 04:34:28 -05:00
Mark Otto 30d8eb3ed5 Merge branch 'blakeembrey-dropdown-selectors' into 2.3.0-wip 2012-12-20 01:34:19 -08:00
Mark Otto 0a1434b23b Merge branch 'dropdown-selectors' of https://github.com/blakeembrey/bootstrap into blakeembrey-dropdown-selectors 2012-12-20 01:34:10 -08:00
Mark Otto 3f493f0d0d Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2012-12-20 01:30:43 -08:00
Mark Otto f706acb11c Fixes #6339: Use important flag on .hide and .show utility classes 2012-12-20 01:30:32 -08:00
Mark Otto cdb25e11ef lighter buttons closer to todays versions 2012-12-20 01:21:09 -08:00
fat 5abe33f5d8 reset carousel in the case that it is reinstantiated twice 2012-12-20 01:13:03 -08:00
fat 6b67a83631 Merge branch '2.2.3' into 2.3.0-wip 2012-12-20 01:05:55 -08:00
fat 2c9f43f685 if carousel element already open, don't reopen it duh bruh bruh 2012-12-20 01:05:07 -08:00
Mark Otto c00f29e4d4 Fixes #6236: Fix popover font-size in input groups 2012-12-20 00:54:58 -08:00
Mark Otto 4e54e7bb35 Remove dropdown submenu docs 2012-12-20 00:27:46 -08:00
Mark Otto cc6974b74e Remove dropdown submenu CSS 2012-12-20 00:27:05 -08:00
Mark Otto acde2dc1ee Nuke third lines form carousel examples 2012-12-20 00:20:00 -08:00
Mark Otto 3e64d03731 Merge branch '2.2.3' into 3.0.0-wip
Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap-affix.js
	docs/assets/js/bootstrap-alert.js
	docs/assets/js/bootstrap-button.js
	docs/assets/js/bootstrap-carousel.js
	docs/assets/js/bootstrap-collapse.js
	docs/assets/js/bootstrap-dropdown.js
	docs/assets/js/bootstrap-modal.js
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap-scrollspy.js
	docs/assets/js/bootstrap-tab.js
	docs/assets/js/bootstrap-tooltip.js
	docs/assets/js/bootstrap-transition.js
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/index.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/index.mustache
	docs/templates/pages/javascript.mustache
	js/bootstrap-affix.js
	js/bootstrap-alert.js
	js/bootstrap-button.js
	js/bootstrap-carousel.js
	js/bootstrap-collapse.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tab.js
	js/bootstrap-tooltip.js
	js/bootstrap-transition.js
	js/bootstrap-typeahead.js
	less/bootstrap.less
	less/responsive.less
	less/type.less
	package.json
2012-12-20 00:02:52 -08:00
Mark Otto 72f13e2870 Merge branch '2.2.3' into 3.0.0-wip
Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap-affix.js
	docs/assets/js/bootstrap-alert.js
	docs/assets/js/bootstrap-button.js
	docs/assets/js/bootstrap-carousel.js
	docs/assets/js/bootstrap-collapse.js
	docs/assets/js/bootstrap-dropdown.js
	docs/assets/js/bootstrap-modal.js
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap-scrollspy.js
	docs/assets/js/bootstrap-tab.js
	docs/assets/js/bootstrap-tooltip.js
	docs/assets/js/bootstrap-transition.js
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/index.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/index.mustache
	docs/templates/pages/javascript.mustache
	js/bootstrap-affix.js
	js/bootstrap-alert.js
	js/bootstrap-button.js
	js/bootstrap-carousel.js
	js/bootstrap-collapse.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tab.js
	js/bootstrap-tooltip.js
	js/bootstrap-transition.js
	js/bootstrap-typeahead.js
	less/bootstrap.less
	less/responsive.less
	less/type.less
	package.json
2012-12-20 00:02:52 -08:00
Mark Otto 9726fded1c Get on that carousel indicator lifestyle with some new hawtness 2012-12-19 23:52:38 -08:00
Mark Otto 5d776bcfd2 Merge branch '2.2.3' of github.com:twitter/bootstrap into 2.2.3 2012-12-19 23:39:40 -08:00
fat bbe4625672 lol we dont' have affix(refresh) 2012-12-19 23:39:26 -08:00
Mark Otto 14844db862 Holy shit, buttons, button states, and input states updated 2012-12-19 23:37:33 -08:00
fat 7f9ff0ba5b add js support for carousel indicators 2012-12-19 23:25:25 -08:00
Mark Otto 09dde5c84a Merge branch '3.0.0-wip' of https://github.com/cvrebert/bootstrap into cvrebert-3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	less/mixins.less
2012-12-19 23:18:02 -08:00
Mark Otto a27952efd0 Unfuck the fucked gradient with it's fucked mix() of background colors; nuke commented out code 2012-12-19 23:12:38 -08:00
Mark Otto 9b4e5746a4 More button tweaks 2012-12-19 22:54:04 -08:00
fat e9eff0cbff wait 100ms before engaging affix (allows for initial browser scroll) 2012-12-19 22:37:41 -08:00
Mark Otto afef81c0d7 remove commented out buttons css, update docs 2012-12-19 22:30:08 -08:00
fat 96e5fa6143 whitespace in tooltip + don't pass empty selector to $() in dropdown.js 2012-12-19 22:26:36 -08:00
Mark Otto c38b7206eb overhaul buttons 2012-12-19 22:25:56 -08:00
Mark Otto a932476f80 Unfuck the fucked homepage 2012-12-19 22:07:11 -08:00
fat 7c456c8554 fix tooltip doc dumbness 2012-12-19 22:05:33 -08:00
fat 219d275ae6 can't extend bounding box thingy 2012-12-19 22:03:57 -08:00
Mark Otto 7449e2e5a1 Remove @black and just use #000 2012-12-19 22:02:57 -08:00
fat dc4e80a655 fix ghetto ass timeout shit 2012-12-19 21:55:23 -08:00
Mark Otto 65edc9cd6e Change .jumbotron usage in docs layout to .bs-docs-jumbotron 2012-12-19 21:42:36 -08:00
Mark Otto b6945a2168 Rename .hero-unit to .jumbotron becaue fuck dashes in filenames and sports metaphors are cooler than ad ones 2012-12-19 21:37:16 -08:00
fat 5bd8cdca91 remove inside support from tooltip + fix tooltip svg support + change makefile to rely on local npm install 2012-12-19 21:36:50 -08:00
Mark Otto 2011a0d50f Drop labels from the docs 2012-12-19 21:29:57 -08:00
Mark Otto c6cc1b1a1d Drop .label component. Instead, just use .badge because fuck dupe code and stuff. 2012-12-19 21:18:32 -08:00
Mark Otto 85971ff3e8 Drop .form-search support 2012-12-19 21:12:37 -08:00
Mark Otto ec623c176b Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2012-12-19 21:03:43 -08:00
Mark Otto 51b1a027da Merge branch 'bs3-input-groups' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
2012-12-19 21:02:54 -08:00
Mark Otto 26b999b76a no need for margin-top on .typeahead, it's set on .dropdown-menu 2012-12-19 19:46:44 -08:00
Mark Otto 19a94d08d6 Remove support for multiple buttons in input groups because fuck that shit. 2012-12-19 19:33:14 -08:00
Mark Otto dc6142751f Fixes #6337: scope '.media .pull-left' and '.media .pull-right' to immediate children only 2012-12-19 18:47:34 -08:00
Mark Otto 28c928f010 Use normalize as separate file instead of with other resets; still need to punt other styles 2012-12-19 18:43:55 -08:00
Mark Otto 840e47eabd Update clearfix mixin and class per @necolas's feedback 2012-12-19 17:49:20 -08:00
Mark Otto ac20a08281 Use @border-radius-base var for nav tabs 2012-12-17 10:11:33 -08:00
Mark Otto cdff0a0ca8 Merge pull request #6267 from valorin/composer-fix
Removing "target-dir" option to stop extra nesting
2012-12-15 18:45:50 -08:00
Stephen Rees-Carter 2183ab63b7 Removing "target-dir" option to stop extra nesting
There is no valid reason to set this since it causes extra nesting:
    ./vendor/twitter/bootstrap/twitter/bootstrap/
2012-12-14 16:38:09 +11:00
Jim Webb ecfa09decb * modify scrollspy documentation to clarify javascript usage
* add scrollspy 'target' option
2012-12-12 11:48:44 -05:00
Mark Otto 529ecc5a77 Version bump 2012-12-10 18:31:04 -08:00
Mark Otto cddca18f12 Fixes #6174: Caret alignment in small and mini buttons 2012-12-10 10:59:57 -08:00
Mark Otto 9d985978a3 Escape HTML of section element 2012-12-10 10:55:42 -08:00
Mark Otto 847b632577 IE10 fix in responsive utilities, not regular utilities 2012-12-10 10:29:16 -08:00
Mark Otto e324a1beb0 Simplify syntax of nesting with inline lists 2012-12-10 10:28:18 -08:00
Mark Otto 83a6a55d2c Move IE10 responsive fix to responsive utilities so Customizer gets it 2012-12-10 10:25:18 -08:00
Mark Otto 165729254b squash new line 2012-12-10 10:13:04 -08:00
Mark Otto ab5d7f863c move reset after vars and mixins 2012-12-10 09:57:23 -08:00
Chris Rebert 8c8a14ab59 document caveat regarding fieldset legend and #6199 2012-12-10 01:46:16 -08:00
Chris Rebert 48759eee94 document fieldset[disabled] styling added in #6199; per @mdo 2012-12-10 01:33:02 -08:00
Mark Otto 9f29785783 Merge pull request #6195 from nathanb/example-carousel-nav-fix
lowered carousel beneath the nav (in carousel example)
2012-12-10 00:21:35 -08:00
Chris Rebert 3b5d4f52a3 fixes #5605: style as disabled all form controls & btns under a disabled fieldset
this is a resubmission of #5875, but now against branch 3.0.0-wip
does not exclude elements under a fieldset's legend
issue #6058 is a duplicate of #5605
2012-12-09 23:42:05 -08:00
Blake Embrey c105906780 Update .dropdown-menu selectors to avoid conflicts with other elements. Fixes #6197 2012-12-10 16:42:58 +10:00
Mark Otto 4245e8ebb5 Fix checkbox and radios example 2012-12-09 22:13:40 -08:00
Mark Otto 6e9bbe6232 Nested columns docs tweaks 2012-12-09 22:08:11 -08:00
Mark Otto 4c82dd3645 Refactor input groups
* Deprecate .input-append and .input-prepend
* Use new, single base class for component, .input-group
* Deprecate .addon for .input-group-addon
* For compatibility with all buttons, require .input-group-btn to wrap buttons and button dropdowns
* Still need to reimplement with segmented button dropdowns, but that's dependent on a refactor of those first
2012-12-09 21:46:14 -08:00
Nathan Bridgewater 312509e1c0 lowered carousel beneath the nav 2012-12-09 22:10:38 -06:00
Nathan Bridgewater 18adc44171 lowered carousel beneath the nav 2012-12-09 22:10:38 -06:00
Mark Otto 6649918c7f Merge conflicts 2012-12-08 22:45:39 -08:00
Mark Otto 070c125cec Restore print styles 2012-12-08 21:05:05 -08:00
Mark Otto 68d1d7fc83 Test removal of print styles for customized builds 2012-12-08 21:02:37 -08:00
Mark Otto b5ceca14db Fix docs typos 2012-12-08 18:46:34 -08:00
Mark Otto bc0b94a3fd Merge branch 'master' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/css.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/javascript.mustache
	less/breadcrumbs.less
	less/tables.less
	less/tests/css-tests.html
2012-12-08 17:40:42 -08:00
Mark Otto 9376a7c221 Fixes #5729: Nested striped tables
* Scopes striping to immediate children of the tbody and tr
* For nested tables, sets a background color of @bodyBackground, to override the default transparent bg
2012-12-08 12:57:21 -08:00
Mark Otto cacc213762 Nesting tables
* Add simple test to css-tests.html
* Scope .table-bordered to immediate children th/td elements only
2012-12-08 12:52:19 -08:00
Mark Otto b9292ff90c Merge pull request #6165 from Quy/2.2.2-wip
Apply code tag to data attribute on javascript page
2012-12-08 12:17:46 -08:00
Quy Ton 3bd9a26c01 Apply code tag to data attribute on javascript page 2012-12-08 12:06:46 -08:00
fat 820a3b27b6 get tests passing for typeahead :P 2012-12-07 19:16:48 -05:00
fat 1747caf19d insert menu of typeahead after input which it suggests on #3529
note: this will likely break things for people in the same way that doing
this to tooltip did… however we think this is a better insertion model for
z-index,scrolling,modal,etc. applications
2012-12-07 18:59:13 -05:00
fat 437654030a focus on escape in typeahead 2012-12-07 18:37:32 -05:00
fat 10e72e158d Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip 2012-12-07 17:50:34 -05:00
fat 91fbadad5b remove slide from carousel constructor #5579 2012-12-07 17:49:05 -05:00
billy gates c362e72660 Merge pull request #5862 from pmclanahan/issue-5806-typeahead-keyboard-nav
Fix issue with double move event firing in typeahead.
2012-12-07 14:16:51 -08:00
fat 66b70016d0 rebuild and only select visible dropdown items 2012-12-07 17:14:49 -05:00
billy gates 2526c3fdbe Merge pull request #6118 from godric7/master
scrollSpy - add parent scrollTop to offset calculation
2012-12-07 14:11:18 -08:00
fat a7eb9c294a add noConflict functionality to all bootstrap plugins 2012-12-07 17:06:01 -05:00
Mark Otto 1c5b8e967e Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip 2012-12-07 09:51:57 -08:00
Mark Otto be45a821bb Fixes #6148: Icons in mini buttons properly aligned 2012-12-07 09:51:01 -08:00
Mark Otto 1413f976ae Merge pull request #6151 from tierra/pre-code-white-space-fix
Fix code block white-space breaks within pre tags.
2012-12-07 09:48:14 -08:00
Mark Otto cc6fda2262 Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip 2012-12-07 09:43:32 -08:00
Mark Otto 2c7ab23d7a Fixes #6136: Proper scoping of breadcrumbs divider 2012-12-07 09:43:09 -08:00
Mark Otto 2877f84579 Merge pull request #6143 from Quy/2.2.2-wip
Escape &times;
2012-12-07 09:41:17 -08:00
Bryan Petty f4466dd9c7 Fix code block white-space breaks within pre tags. 2012-12-06 11:33:00 -07:00
Quy Ton 81679981c5 Escape &times; 2012-12-05 15:28:14 -08:00
Mark Otto be5f31480b Nuke all i18n tags from .mustache templates 2012-12-05 11:09:02 -08:00
Mark Otto 306c1b4914 Remove commented out old popover CSS 2012-12-05 11:06:16 -08:00
Mark Otto cb67366206 Merge branch '2.2.2-wip' into 3.0.0-wip
Conflicts:
	README.md
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/examples/fluid.html
	docs/scaffolding.html
	less/breadcrumbs.less
	less/popovers.less
	less/responsive.less
2012-12-05 11:05:10 -08:00
Mark Otto 33e14fe5bf Merge branch '2.2.2-wip' into 3.0.0-wip
Conflicts:
	README.md
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/examples/fluid.html
	docs/scaffolding.html
	less/breadcrumbs.less
	less/popovers.less
	less/responsive.less
2012-12-05 11:05:10 -08:00
Mark Otto b3019d7aab add gallery page, fill with a few screenshots to start 2012-12-04 20:30:21 -08:00
Mark Otto ed74992853 Fixes #4550: Temporary fix for dropdown taps on mobile
* Fix as documented here: https://github.com/twitter/bootstrap/issues/4756#issuecomment-9952781
* Stops propagation for touchstart for dropdowns
2012-12-04 18:36:18 -08:00
Mark Otto 12916b06aa Fix up display of dropdown submenu examples on responsive views 2012-12-04 18:25:16 -08:00
Mark Otto e31c7fb8a5 correct link on index page to grid system 2012-12-04 09:49:18 -08:00
Godric 8b959cacbc Update js/bootstrap-scrollspy.js
Fix for Bootstrap issue #6013 "scrollSpy - offset calculation"
https://github.com/twitter/bootstrap/issues/6013
2012-12-04 01:21:07 +01:00
Mark Otto 5cf2e8a1cb Once more, update all the favicons to retina 2012-12-03 13:25:56 -08:00
Mark Otto 0f2a423b8d Once more, update all the favicons to retina 2012-12-03 13:25:56 -08:00
Mark Otto 15a4399015 Align the touch icons attributes 2012-12-03 13:22:10 -08:00
Mark Otto 869b69c66c Fixes #6115: scope breadcrumb styles to immediate children only 2012-12-03 13:09:38 -08:00
Mark Otto d37d269230 Improve rendering of carousel example for IE10 2012-12-03 13:01:27 -08:00
Mark Otto 06582edb2a Improve rendering of carousel example for IE10 2012-12-03 13:01:27 -08:00
Mark Otto d470fb72da nuke comments 2012-12-03 09:23:02 -08:00
Andreas Cederström 68cbba347b Fixing header color for success, error and info alerts 2012-12-03 14:20:14 +01:00
Mark Otto eca23e9b0f add source attribution for IE10 fix 2012-12-02 21:01:53 -08:00
Mark Otto f514c87d6b Enable responsive features in IE10 when snapped 2012-12-02 20:57:34 -08:00
Mark Otto 30d6a71ccd Revert vertical gradient spec to 'to bottom' as 'top' doesn't work in IE10 2012-12-02 20:40:24 -08:00
Mark Otto 439ff09701 herpderp 2012-12-02 18:15:40 -08:00
Mark Otto c8862d91bc Readme reorg
* Consolidate quick start options into easier to read list
* Consolidate social and community options into a list
* Add link to Code Guide for contributions section
2012-12-02 13:14:49 -08:00
Marcel Korpel 0dece7a71f Set focus back to input field after clicking an item
Test 'focus is still set' added

Fixes issue #5933
2012-12-02 12:35:33 +01:00
Mark Otto 139f1be49d reset text align in popovers given inline insertion 2012-12-02 02:30:00 -08:00
Mark Otto ea61cdb740 remove overrides on inner html of popover-content 2012-12-02 01:34:58 -08:00
Mark Otto 32d425967a run make on js changes to popover 2012-12-02 01:32:23 -08:00
Mark Otto 85c57c6ba8 Merge branch 'Moveo-master' into 2.2.2-wip 2012-12-02 01:32:13 -08:00
Mark Otto e8b3c36068 run make on modal popover fix 2012-12-02 00:09:45 -08:00
Mark Otto 9c028ea54b follow button width 2012-12-01 18:51:03 -08:00
Mark Otto dbb244cb97 Merge pull request #6097 from blakeembrey/modal-body-relative
Add relative positioning to .modal-body
2012-12-01 17:45:33 -08:00
Blake Embrey fbec803b55 Add relative positioning to .modal-body - Fixes #5991 2012-12-02 09:53:05 +10:00
Mark Otto 19ee7999f4 remove single corner border-radius mixins 2012-12-01 14:25:28 -08:00
Mark Otto dd11d0a3fa move around social buttons 2012-12-01 13:47:07 -08:00
Mark Otto 98b0d475ae version bump to 3.0 2012-11-30 22:30:50 -08:00
Mark Otto 0947105656 section title change 2012-11-30 17:43:20 -08:00
Mark Otto 51b4de8eec docs content changed 2012-11-30 16:43:31 -08:00
Mark Otto 6961b284b6 remove responsive image from css docs page 2012-11-30 16:42:48 -08:00
Mark Otto ebd2215e49 remove deleted css files, run make 2012-11-30 16:31:24 -08:00
Mark Otto 10c14e8955 first pass at nuking scaffolding 2012-11-30 16:29:30 -08:00
Mark Otto 145ed23ac5 Remove more fluid grid stuff
* No more fluid layout
* No fluid grid overrides for tables.less
* No more fluid example page
2012-11-30 16:18:40 -08:00
Mark Otto 0fabca01db Remove more fluid grid stuff
* No more fluid layout
* No fluid grid overrides for tables.less
* No more fluid example page
2012-11-30 16:18:40 -08:00
Mark Otto adc2c779a0 grid vars updated 2012-11-30 15:43:07 -08:00
Mark Otto b8b266ca7c popovers and tooltips vars 2012-11-30 15:40:44 -08:00
Mark Otto e34b3730b7 form state vars 2012-11-30 15:38:31 -08:00
Mark Otto 0a93bc143d hero unit and pagination vars 2012-11-30 15:36:16 -08:00
Mark Otto 51c418d468 alignment 2012-11-30 15:34:35 -08:00
Mark Otto 62a2220035 navbar vars 2012-11-30 15:33:56 -08:00
Mark Otto a09cea44ae more vars changed 2012-11-30 15:27:13 -08:00
Mark Otto 01421ecd62 remove sprites vars, change zindex vars 2012-11-30 15:23:13 -08:00
Mark Otto 12a00f62a9 remove color variables, swap others were appropro 2012-11-30 15:18:49 -08:00
Mark Otto 0ef347706c more vars changing 2012-11-30 15:09:57 -08:00
Mark Otto 9239bfbc7b more vars changed, remove @white var 2012-11-30 15:05:23 -08:00
Mark Otto b0e2b5813d more consistent variable naming patterns 2012-11-30 14:45:25 -08:00
Mark Otto 7a3d15eb21 Part 1 of unCamelCasing variables 2012-11-30 14:37:24 -08:00
Mark Otto fe8061b84e more tests for form styles; includes lightening help text 2012-11-30 13:35:20 -08:00
Mark Otto f9a47e3a5f Refine containers and navbars
* Don't reset width on .container, .navbar-* .container, etc
* Instead, use max-width to ensure proper styling for all navbars
2012-11-30 12:42:37 -08:00
Mark Otto 030a058174 Remove .navbar-inner from navbar tests 2012-11-30 12:36:55 -08:00
Mark Otto 7313702cf3 Inputs now 100% width by default
* Includes text inputs, selects, and textareas
* Updated docs to include .span* sizes wherever possible
* Commented out responsive 1200px inputs grid
* Still some derp to be done to improve more, but this is a decent first stab
2012-11-30 00:53:07 -08:00
Mark Otto 8d09e7c24d remove some unhelpful comments 2012-11-30 00:26:02 -08:00
Mark Otto 4fd164d45b consolidate font resets into scaffolding 2012-11-30 00:24:17 -08:00
Mark Otto 71d8bebfbc remove from form styles 2012-11-30 00:21:44 -08:00
Mark Otto fca35c0dba Merge branch '2.2.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/alerts.less
	less/button-groups.less
	less/buttons.less
	less/tests/css-tests.html
2012-11-30 00:13:30 -08:00
Mark Otto bca3ff4ed6 Fixes #5853: Maintain 10px margin above help block when following input groups 2012-11-29 23:39:33 -08:00
Mark Otto f087b3428c remove element from selector 2012-11-29 23:33:09 -08:00
Mark Otto fe7b6decb1 Merge pull request #6039 from desheikh/2.2.2-wip
help-block margin-top should also apply after a span.uneditable-input
2012-11-29 23:32:38 -08:00
Mark Otto 322a56354f run make with nav img fix 2012-11-29 23:27:20 -08:00
Mark Otto 721b568303 update comment 2012-11-29 23:27:09 -08:00
Mark Otto c5173cdb92 Merge branch 'idavemm-patch-1' into 2.2.2-wip 2012-11-29 23:26:22 -08:00
Mark Otto 52e669d619 Merge branch '2.2.2-wip-holder' into 2.2.2-wip 2012-11-29 21:35:57 -08:00
Mark Otto 38c546c785 upgrade to holder 1.6 2012-11-29 21:35:45 -08:00
Mark Otto 12aa060efd Merge branch 'jblotus-patch-1' into 2.2.2-wip 2012-11-29 21:06:20 -08:00
Mark Otto e9c32fdf6d Merge branch 'patch-1' of https://github.com/jblotus/bootstrap into jblotus-patch-1 2012-11-29 21:06:11 -08:00
Mark Otto 4bfab509df add holder and replace placehold.it 2012-11-29 20:59:14 -08:00
Mark Otto acc037de15 add holder and replace placehold.it 2012-11-29 20:59:14 -08:00
Zulfiqar Ali ddd154481b added compiled css file 2012-11-29 17:40:23 +08:00
Mark Otto fa6a6dbb92 Merge pull request #6057 from ph-One/patch-3
Update Makefile's UglifyJS commands
2012-11-28 18:41:36 -08:00
Mark Otto 78390d12af Fix the carousel after we scoped selectors 2012-11-28 15:40:51 -08:00
Mark Otto cb69aa976f Merge branch 'trsteel88-master' into 2.2.2-wip 2012-11-28 15:35:16 -08:00
Kyle A. Matheny fe8df5022b Update Makefile
Fixed both instances of uglifyjs usage.
2012-11-28 23:33:05 +00:00
Mark Otto f1349a2450 Fixes #5533: Remove filter gradient from disabled links on dropdowns 2012-11-28 02:22:37 -08:00
Mark Otto 8fb36cb3dd Fixes #5594: Vertical button groups show use max-width, not width, and be scoped to immediate children buttons only 2012-11-28 02:21:34 -08:00
Mark Otto 296b838405 Fixes #5616: scope carousel state classes to immediate children only 2012-11-28 02:17:50 -08:00
Mark Otto bf3a5df371 Fixes #5930: redeclare font-size for popoves in btn-groups 2012-11-28 02:10:23 -08:00
Mark Otto 783120dffa Fixes #5927: Scope button group 5px button left margin to immediate children 2012-11-28 01:51:04 -08:00
Mark Otto 014d3cedf5 Fixes #5940: Prevent @headingsColor from changing alert colors 2012-11-28 01:48:34 -08:00
Mark Otto bfc97fdaf6 Fixes #4852: IE8 popover carets fixed
* IE8 refused a negative z-index to place the previous :after behind the .arrow, so I had to flip the styles.
* .arrow is the gray border/background, .arrow:after is now the white inner arrow
* Added a hex IE8 fallback to ensure the arrow shows for <IE9 as rgba() isn't supported
* Simplified some of the CSS for the popover carets
2012-11-28 01:38:21 -08:00
Zulfiqar Ali 693fd0db2a help-block margin-top should also apply after a span.uneditable-input 2012-11-28 16:47:59 +08:00
Mark Otto fda5bb135e Fixes #5963: Add large button example to icons, fix vertical alignment in large buttons 2012-11-28 00:46:09 -08:00
Mark Otto 74f51105e9 Fixes #6010: Navbar dropdown caret should match link hover color 2012-11-28 00:42:17 -08:00
Mark Otto 942f9c5df4 Fixes #6012: Updated docs sidenav media queries and reset width for exactly 980px 2012-11-28 00:37:55 -08:00
Mark Otto 02097700e8 Fixes #6035: use font-size vars in button groups 2012-11-28 00:31:52 -08:00
Mark Otto dc10e6bbf8 Fixes #5935: Updated vertical gradient mixin 2012-11-28 00:19:35 -08:00
Swaagie e6e4d93d5e leave it to the developer to decide how to use the content of the popover 2012-11-27 15:07:31 +01:00
Zulfiqar Ali 701f871e7d help-block margin-top should also apply after a span.input 2012-11-27 07:30:54 +08:00
Mark Otto 7e56e2265d Merge branch '2.2.2-wip' into exploratory
Conflicts:
	less/button-groups.less
2012-11-22 22:04:21 -08:00
Mark Otto e0d0190803 fix image sizes on homepage 2012-11-22 12:26:54 -08:00
Mark Otto 5d1b4206b1 Fixes #5986: single toggle button html examples 2012-11-22 12:06:36 -08:00
Mark Otto 8df2811d49 Simpler footer for docs
* Remove back to top link (ya'll are lazy :P)
* Center text
* Decrease vertical padding
2012-11-21 23:29:20 -08:00
Mark Otto 8b417c39e7 Merge pull request #5954 from tony/patch-2
Fix typo in reset.less
2012-11-19 15:31:14 -08:00
Tony Narlock ace6dc0c25 Fix typo in reset.less 2012-11-19 16:49:47 -05:00
Mark Otto a10d68f291 Fixes #5937: Border radius vars in button groups 2012-11-18 12:30:35 -08:00
Mark Otto a367fd4938 Fixes #5925: Adjust top margin of input group in navbar 2012-11-16 01:19:15 -08:00
Mark Otto 88c2497368 Fixes #5912: User correct selector for form field states.
Previously, we were using a generic label selector, but as this was changed in the main forms awhile back, we need to change it here.
2012-11-16 01:16:27 -08:00
Mark Otto 5702e1be6e widths on github buttons 2012-11-16 01:13:52 -08:00
Trent Steel 4d593618e0 add composer.json 2012-11-16 17:01:21 +10:00
Mark Otto fa1c130552 Change important badges/labels to danger 2012-11-15 09:17:11 -08:00
Mark Otto a43bf14ea5 Merge branch '2.2.2-wip' into exploratory 2012-11-15 09:15:37 -08:00
Mark Otto 05655ff4ff fixes #5922: clicking only button should download custom build 2012-11-15 09:14:54 -08:00
Mark Otto 1700e48e7f Fixes #5879: Manual update of Normalize credit 2012-11-14 15:20:38 -08:00
Mark Otto 0df0b5f1f5 run make after latest merges 2012-11-14 15:19:16 -08:00
Mark Otto cd1f72f484 Merge pull request #5894 from amid2887/patch-3
Update less/tables.less ( typing, use variable, add border-radius reset )
2012-11-14 01:20:20 -08:00
Mark Otto 303767350c Merge pull request #5874 from tacomanator/2.2.2-wip
fixes #5873: @navbarInverseBrandColor not used
2012-11-14 01:18:11 -08:00
Paul McLanahan 6ec7c72e5b Fix issue with double move event firing in typeahead.
Fix test to catch issue.
Fix #5806.
2012-11-13 11:00:34 -05:00
amid2887 41889f74d0 Update less/tables.less
Possible typing.

Add @baseBorderRadius as value for some rules.

Add border-radius clearing for first and last td in the last tbody for table with tfoot.
2012-11-13 17:49:33 +07:00
Drew Goodwin c8856eeff3 fixes #5873: @navbarInverseBrandColor not used 2012-11-10 17:58:00 -08:00
Mark Otto 1a4ce9ba18 Merge branch '2.2.2-wip' into exploratory 2012-11-09 10:09:04 -08:00
Mark Otto 54486de88c run make again 2012-11-09 09:21:14 -08:00
Mark Otto f2bbee2075 remove * line-height 2012-11-08 23:56:29 -08:00
Mark Otto ddf5ceccce typo fix 2012-11-08 23:49:04 -08:00
Mark Otto cf7d7a7b5d remove ; from customizer 2012-11-08 23:46:40 -08:00
Mark Otto 57eed7867b merge in latest 2012-11-05 19:00:34 -08:00
Mark Otto 9d1eefa4fb Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip 2012-11-05 18:44:22 -08:00
Mark Otto 23a7ab4b51 icon vertical align in buttons 2012-11-05 18:44:10 -08:00
Mark Otto 33beb93e1b new docs css for new icons 2012-11-05 18:40:00 -08:00
Mark Otto b82bc97023 update docs and all classes 2012-11-05 18:38:59 -08:00
Mark Otto cea2a701f0 adding new fonts and css for glyphicons update 2012-11-05 18:36:16 -08:00
Mark Otto c0bbe1692c Merge branch '2.2.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	less/navbar.less
	less/variables.less
2012-11-05 18:27:25 -08:00
Mark Otto 02c0b788cd Merge pull request #5795 from globocom/missing-i18n-customize-and-download
insert missing i18n tag at customize and download string
2012-11-05 17:47:45 -08:00
Alexandre Magno 0a1d296e19 insert missing i18n tag at customize and download string 2012-11-05 18:38:59 -02:00
Mark Otto 79b7017227 version bump 2012-11-05 09:32:48 -08:00
Mark Otto d38bda1480 Fixes #5471: Remove color from .navbar and .navbar-inverse and reassign to .navbar-text to prevent unintended cascading 2012-11-04 22:50:07 -08:00
Mark Otto 34880e3ef5 Fixes #5596: switch vars in .size mixin 2012-11-04 19:59:50 -08:00
Mark Otto ee93541421 Merge branch '2.2.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	less/buttons.less
	less/forms.less
2012-11-04 19:59:07 -08:00
Mark Otto 62c78e46f8 more required input tweaks 2012-11-04 19:53:13 -08:00
Mark Otto 91bcccd9a8 simplify invalid input css 2012-11-04 19:43:09 -08:00
Mark Otto ebed09ec01 Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip 2012-11-04 19:42:13 -08:00
Mark Otto f3b3814606 Merge pull request #5786 from cvrebert/2.2.2-wip
fixes #5494: style invalid fields as invalid regardless of required-ness
2012-11-04 19:41:59 -08:00
Mark Otto 823b5accd3 start documenting html5 invalid form fields 2012-11-04 19:41:41 -08:00
Mark Otto 7e6cc0bf7e Fixes #5785: allow for segmented button groups in input groups 2012-11-04 19:08:02 -08:00
Chris Rebert 76f9c9128e fixes #5494: style invalid fields as invalid regardless of required-ness 2012-11-04 18:26:25 -08:00
Mark Otto 51f293ba4c Fixes #5662: white-space: nowrap; on code element 2012-11-04 13:30:36 -08:00
Mark Otto 075e320a83 remove unnecessary bg declarations in buttons per #5684 2012-11-04 13:26:03 -08:00
Mark Otto 21957a3d9e set background size for docs jumbotron for retina 2012-11-04 13:24:06 -08:00
Mark Otto 953dc3a6f2 higher res docs illustrations 2012-11-04 13:23:08 -08:00
Mark Otto fb51efcbd4 Fixes #5113: increase .typeahead z-index for proper use with modals 2012-11-04 13:01:31 -08:00
Mark Otto 2320a09898 fix modals display in docs on tablet view 2012-11-04 12:58:57 -08:00
Mark Otto 1af0021014 Merge branch '2.2.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	less/type.less
2012-11-04 12:42:00 -08:00
Mark Otto 22d1506d23 remove margin on .inline lists 2012-11-04 12:39:27 -08:00
Mark Otto 508cc1fef4 change up list classes to use .list- prefix 2012-11-04 12:38:35 -08:00
Mark Otto 269be76f4a Merge branch '2.2.2-wip' into exploratory 2012-11-04 12:37:44 -08:00
Mark Otto 28da31218f Refine new inline list option 2012-11-04 12:36:37 -08:00
Mark Otto 68f26d959f Merge branch '2.1.2-list-inline' of https://github.com/andriijas/bootstrap into andriijas-2.1.2-list-inline 2012-11-04 12:27:30 -08:00
Mark Otto e4866c4b3c clarify unstyled lists docs 2012-11-04 12:27:18 -08:00
Mark Otto 83a3789b5e add justified nav links for tabs and pills 2012-11-04 00:52:10 -07:00
Mark Otto 05a2d37559 run make after removing responsive css file 2012-11-04 00:37:49 -07:00
Mark Otto 25fded1ff4 responsive images, updated shadows on navbars, remove responsive file from docs 2012-11-04 00:31:43 -07:00
Mark Otto 3de6f3ff88 Swap old icons for new in docs 2012-11-03 16:18:02 -07:00
Mark Otto a56de2b84f Merge branch 'glyphicons_font' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/css/docs.css
	less/sprites.less
2012-11-03 16:15:54 -07:00
Mark Otto c0eacca0db Navs refactor, restoring .nav-list 2012-11-03 16:14:44 -07:00
Mark Otto a12eb2b9f5 rgba() tooltip bg 2012-11-03 13:44:55 -07:00
Mark Otto a249d1c8ee Merge branch '2.2.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	docs/scaffolding.html
	docs/templates/pages/scaffolding.mustache
2012-11-03 13:44:01 -07:00
Mark Otto 5d6cf2ee19 Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip 2012-11-03 13:43:23 -07:00
Mark Otto 2c93190283 Fixes #5776: Reside white-space for popovers 2012-11-03 13:42:08 -07:00
Mark Otto a8b9342aea Fixes #5739: Port in HTML5 BP print styles 2012-11-03 13:37:34 -07:00
Mark Otto c9dbd2d601 Fixes #5458: Clarify fluid nesting 2012-11-03 13:28:48 -07:00
Mark Otto 72e2d4bb77 Merge pull request #5766 from bradly/spelling-fixes-in-docs
Fixing various spelling typos in the docs.
2012-11-03 13:20:06 -07:00
Mark Otto 7ea343d570 Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip 2012-11-03 13:19:53 -07:00
Mark Otto ead5dbeba5 Fixes #5775: Collapse labels/badges
* When :empty, display: none;
* Add documentation for change in behavior
2012-11-03 13:18:23 -07:00
Mark Otto 2f39f86bd7 Merge pull request #5777 from bradly/change-example-emails-in-docs
Change example email addresses to use RFC 2606 reserved example domain.
2012-11-03 13:12:02 -07:00
Bradly Feeley 381d967ec8 Change example email addresses to use RFC 2606 reserved example domain. 2012-11-03 12:15:01 -06:00
Bradly Feeley 46b5e0cbc6 Fixing various spelling typos in the docs. 2012-11-02 16:34:21 -06:00
Mark Otto fc42ac6a56 fixes #5756: duplicate media CSS in compiled builds 2012-11-02 09:47:42 -07:00
Mark Otto 1477e081d4 Merge branch '2.2.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	docs/getting-started.html
	docs/templates/pages/getting-started.mustache
	less/accordion.less
	less/alerts.less
	less/breadcrumbs.less
	less/buttons.less
	less/code.less
	less/dropdowns.less
	less/forms.less
	less/navbar.less
	less/progress-bars.less
	less/responsive-navbar.less
	less/tables.less
	less/thumbnails.less
	less/tooltip.less
	less/wells.less
2012-11-02 09:36:51 -07:00
David 46d38b10b8 Prevent IE8 from misplacing imgs
Fixed imgs in a nav that were misplaced on IE8.
2012-11-02 15:04:34 +01:00
Mark Otto 4b3fb30877 tweaks to icons defaults and in buttons improve vertical align 2012-11-02 01:39:40 -07:00
Mark Otto 72198a59c0 removing glyphicons images, swapping in new icon font with new classes 2012-11-02 01:20:06 -07:00
Mark Otto d0c75bbc83 fixes #5742: add cursor: pointer; to labels and selects 2012-11-01 09:44:51 -07:00
Mark Otto d350f577e9 fixes #3222: simpler positioning of modals 2012-10-31 21:43:32 -07:00
Mark Otto 46347fff01 fixes #5692: add version # to readme 2012-10-31 11:17:01 -07:00
Ninir be03a53086 Replaced hardcoded CSS rules with mixins 2012-10-31 11:09:44 -07:00
Mark Otto 14b941744c fixes #5700: restore white text on active dropdown/typeahead text 2012-10-31 10:51:27 -07:00
Mark Otto bf48c31406 Merge branch 'bradly-affix-docs-fix' into 2.2.2-wip 2012-10-31 10:48:44 -07:00
Mark Otto 64326322b4 fixes #5725: hover state for a.muted; also reformatted CSS 2012-10-31 10:46:04 -07:00
Mark Otto d5697fcf6b fixes #5717: add retina favicon, recompile docs 2012-10-31 10:41:41 -07:00
fat 3b3dd3ac3c 2.2.1 - hotfix for carousel 2012-10-30 21:59:56 -07:00
fat 404e4d9e9a fix carousel and rebuild js 2012-10-30 21:32:15 -07:00
Bradly Feeley cbf1dace2f Fixing typos in affix options area in the docs. 2012-10-30 11:46:18 -07:00
Mark Otto b5af762ef5 Merge branch '2.1.2-wip'
Conflicts:
	js/bootstrap-dropdown.js
2012-10-29 22:01:58 -07:00
fat 68cfedb34a Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-10-29 21:55:07 -07:00
fat f1136228a7 add note about js style 2012-10-29 21:54:51 -07:00
Mark Otto bf10a43ed9 derp, add that in the right spot 2012-10-29 21:34:10 -07:00
Mark Otto 5bb6c42405 fixes #4511: remove focus on opened modal window 2012-10-29 21:33:20 -07:00
Mark Otto a6968c4934 Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-10-29 21:30:45 -07:00
Mark Otto 9352fe1750 add a ton of the new vars to the customizer 2012-10-29 21:30:39 -07:00
fat f595e146d6 http link 2012-10-29 21:29:05 -07:00
fat 31c1eba51b Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
Conflicts:
	bootstrap/css/bootstrap.css
	bootstrap/css/bootstrap.min.css
2012-10-29 21:28:17 -07:00
fat 92e7f166e7 remove haunt, remove bootstrap dir, add bower support 2012-10-29 21:27:34 -07:00
Mark Otto 81c3c1c68c add media.less to customizer page 2012-10-29 21:02:05 -07:00
Mark Otto 41ad16fe40 v2.2.0 instead of v2.1.2 2012-10-29 21:00:53 -07:00
Andreas Cederström 233e050adf Adding .inline for ul and ol 2012-10-26 09:47:55 +02:00
Mark Otto c33169a6ba fixes #5572: document .input-block-level 2012-10-18 11:19:16 -07:00
Jacob Thornton ba2a99e7c4 don't lookup typeahead when shift alt or ctrl are pushed 2012-10-17 23:39:41 -07:00
Jacob Thornton 45046544a6 when static, refocus on click 2012-10-17 23:36:22 -07:00
Jacob Thornton 0b9d4e78ad Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-10-17 23:06:58 -07:00
Jacob Thornton 7f3b94c453 Merge branch 'delegate-api-to-document' of git://github.com/badcarl/bootstrap into badcarl-delegate-api-to-document
Conflicts:
	js/bootstrap-carousel.js
2012-10-17 23:05:16 -07:00
billy gates d6ac499ca8 Merge pull request #5309 from erlendfh/dropdown-bugfix
Fixed bug in dropdown toggle where menu would only clear on the first dropdown
2012-10-17 23:00:41 -07:00
Jacob Thornton 280d4aeb30 rebuild 2012-10-17 22:51:39 -07:00
billy gates 7426ced0fb Merge pull request #5323 from artiz/master
Please check my fix for #4550
2012-10-17 22:50:52 -07:00
billy gates 24b5e6cb14 Merge pull request #5366 from Sinetheta/2.1.2-wip
Fix for #5362
2012-10-17 22:30:40 -07:00
Jacob Thornton a2fc01444e Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-10-17 22:27:00 -07:00
Jacob Thornton edc3eee5ea fix carousel event 2012-10-17 22:26:44 -07:00
billy gates 21f29a7682 Merge pull request #5389 from frntz/2.1.2-wip
Update js/bootstrap-tooltip.js
2012-10-17 22:15:48 -07:00
Jacob Thornton 8e6697f2b2 Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-10-17 21:38:01 -07:00
Jacob Thornton ac6625de5f add updater function and rebuild 2012-10-17 21:37:34 -07:00
billy gates 0a3e034891 Merge pull request #5524 from martinstein/fix-tooltip-delegate-click
Fix tooltip not working in delegate events on click-trigger
2012-10-17 21:34:01 -07:00
billy gates 97bf02d787 Merge pull request #5531 from dmitriybudnik/carousel-js-typo-fix
Fixed copy/paste caused typo
2012-10-17 21:25:21 -07:00
billy gates 3074737d90 Merge pull request #5549 from mfansler/2.1.2-wip
fixes #5336: reorder focus() call to avoid scrolling
2012-10-17 21:21:31 -07:00
Mark Otto e0a007b929 Merge pull request #5507 from bradly/2.1.2-wip
Fixing typo in docs.
2012-10-16 20:36:26 -07:00
Mark Otto b06724a1a4 Merge pull request #5508 from bradly/fix-readme-link
Updating README link about Less compilation.
2012-10-16 20:36:12 -07:00
Mark Otto 709870aa3e fixes #5496: use correct var for dropdown active link text 2012-10-16 20:34:42 -07:00
Mark Otto 57eb2a8018 more hellip on modals 2012-10-16 20:28:07 -07:00
Mark Otto 0ac50d28b5 fixes #5519: hellip in modal code 2012-10-16 20:18:50 -07:00
Mark Otto 78f7ad95f4 fixes #5542: move '.hero-unit p' font-styles to '.hero-unit' so they apply to all elements, including ul and ol, within the component. 2012-10-16 19:56:34 -07:00
Mark Otto 8db7111a63 add in latest carousel example, reorg examples on getting started 2012-10-16 12:50:10 -05:00
Mark Otto bf78333531 add in latest carousel example, reorg examples on getting started 2012-10-16 12:50:10 -05:00
Mark Otto 463eae25b0 clarify js docs individual or compiled section 2012-10-16 12:37:36 -05:00
mfansler e24b46b7f3 fixes #5336: reorder focus() call to avoid scrolling 2012-10-16 12:27:43 -04:00
Dmitriy Budnik ae0ba0686e set spesific assertions count for test 2012-10-16 11:16:38 +03:00
Dmitriy Budnik cd55963930 fixed test 2012-10-16 09:49:26 +03:00
dmitriybudnik 432eaff29c Fixed copy/paste caused typo 2012-10-15 22:35:32 +03:00
Mark Otto 814f9f17f9 improve spacing in carousel example 2012-10-15 13:57:09 -05:00
Mark Otto 0048446db9 improve spacing in carousel example 2012-10-15 13:57:09 -05:00
Martin Stein 6b017b9bea fixed reference to this.tip() so it works in delegate events 2012-10-15 15:17:59 +02:00
Bradly Feeley fda641fb6c Updating README link about Less compilation. 2012-10-13 18:38:34 -07:00
Bradly Feeley ed5c5994a7 Fixing typo in docs. 2012-10-13 18:31:41 -07:00
James Fuller d19ca23f8f Update package.json
when building using Makefile, dependency for hogan.js needs to be installed
2012-10-11 21:30:04 -03:00
Mark Otto fa778792c5 compress images and add new carousel example for .net magazine article 2012-10-10 17:58:22 -07:00
Mark Otto e83a974afe compress images and add new carousel example for .net magazine article 2012-10-10 17:58:22 -07:00
Mark Otto df9a1c29f4 Merge branch '2.1.2-wip' of https://github.com/twitter/bootstrap into 2.1.2-wip 2012-10-10 10:29:55 -07:00
Mark Otto 31007c01d8 fixes #5478: remove double background color on dropdown links 2012-10-10 10:29:22 -07:00
Mark Otto 5af5c2ed36 fixes #: remove double background color on dropdown links 2012-10-10 09:51:13 -07:00
Mark Otto b18c009051 fixes #5473: use baselineheight var for input bottom margin 2012-10-10 09:47:08 -07:00
Kevin Attfield 48a8dd2a23 Added test to fix for #5362 2012-10-08 22:29:44 -07:00
Mark Otto 9a25a10ba6 comments in template 2012-10-08 18:59:44 -07:00
Mark Otto 4702e75410 comments in template 2012-10-08 18:59:44 -07:00
Mark Otto 01a7f17579 adding another template for same-width nav links using 'display: table-cell;' 2012-10-08 18:58:35 -07:00
Mark Otto ec8394cb6e adding another template for same-width nav links using 'display: table-cell;' 2012-10-08 18:58:35 -07:00
Mark Otto 7e534ce98a fixes #5443: reset background gradient on disabled dropdown links 2012-10-07 21:45:16 -07:00
Mark Otto e4f522990e fixes #5416: use correct variable for inverse navbar responsive links 2012-10-07 21:43:37 -07:00
Mark Otto 6203535d2f Changing title of docs pages to simply say 'Bootstrap' like the docs home page 2012-10-07 21:38:28 -07:00
Mark Otto d76c305cbb remove 'at twitter' part of readme 2012-10-06 14:42:07 -07:00
Mark Otto 7d649c9d4a fixes #5430: scope link styles in .dropdown-menu to .dropdown-menu li > a 2012-10-05 11:13:21 -07:00
Mark Otto 3726ce24bb finish off scoping of grid sizing to table elements 2012-10-03 09:43:14 -07:00
Mark Otto 11ee1633b4 fixes #5257: add data-original-title attribute selector to abbr element 2012-10-03 09:36:45 -07:00
Mark Otto dd8b745b88 use border-radius vars where possible 2012-10-03 09:26:52 -07:00
Mark Otto e73cd15fc8 copy and style changes to improve docs rendering on mobile devices 2012-10-02 17:01:18 -07:00
Mark Otto 7732d8b9b0 Merge branch '2.1.2-wip' into exploratory 2012-10-02 15:41:31 -07:00
Mark Otto 630a88d3ce Merge pull request #5281 from GotenXiao/pagination-active-background
Use paginationActiveBackground var to finish fixing #4295
2012-10-02 15:23:59 -07:00
Mark Otto a2369021ce fixes #5352: update docs messaging for disable nav links 2012-10-02 15:10:22 -07:00
Mark Otto 1bd4723038 fixes #5392: hover on submenu should maintain white icons for active parent a tag 2012-10-02 13:19:11 -07:00
frntz b892a37320 Update js/bootstrap-tooltip.js
Avoid loosing events attached on Jquery object if added via function in popover content
2012-10-02 18:26:55 +03:00
Mark Otto 3bb9e0d753 increase border radius on navbar 2012-10-01 23:42:21 -07:00
Mark Otto 4ab7b77aa3 Merge branch '2.1.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/labels-badges.less
	less/navbar.less
	less/tables.less
2012-10-01 23:41:00 -07:00
Mark Otto 7c9597f4e7 remove double border effect: instead of inset shadow and border on fixed navbars, only border 2012-10-01 23:34:03 -07:00
Mark Otto 1b814458c9 improve dropdown submenu docs; add docs for left submenu; remove all dupe css for left submenu 2012-10-01 16:41:13 -07:00
Mark Otto 7763cab608 Merge branch '2.1.2-wip' of https://github.com/advancedrei/bootstrap into advancedrei-2.1.2-wip 2012-10-01 16:15:26 -07:00
Mark Otto 5cf7c803e2 Merge branch '2.1.2-wip-modal-responsivefix' of https://github.com/andriijas/bootstrap into andriijas-2.1.2-wip-modal-responsivefix 2012-10-01 15:29:21 -07:00
Mark Otto d36e37214b fixes #5319: add backface-visibility for webkit skewing 2012-10-01 15:26:17 -07:00
Mark Otto 86d5ed6f4f fixes #5377: change selectors for navbar collapse to be unique so only one open/closes at a time 2012-10-01 13:52:50 -07:00
Mark Otto fd1e9b1498 fix copy on modal popover button doodad 2012-10-01 13:28:54 -07:00
Mark Otto f8ac403d8b fixes #5123: scope table grid classes to td and th elements only, plus drop columns 13-24 2012-10-01 13:08:21 -07:00
Mark Otto bc4f5d565e fixes #5275: inline-block badges and labels, then fix padding accordingly 2012-10-01 12:04:10 -07:00
Mark Otto 5035592988 fixes #5193 manually: checkbox and radio padding in .controls-row 2012-10-01 11:53:52 -07:00
Mark Otto e6d6c7a413 Merge branch '2.1.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	less/navs.less
2012-10-01 11:27:40 -07:00
Mark Otto c6c1ada600 clarify tables support of responsive utility classes, of which there is none 2012-10-01 11:18:49 -07:00
Mark Otto a90334eebb fix docs sidenav width for ie8-9 2012-10-01 11:11:33 -07:00
Mark Otto 239ce24f92 fixes #5188: add .google-maps class to reset responsive images on case-by-case basis 2012-10-01 10:49:19 -07:00
Mark Otto 085d6d185d fixes #5055: wrap legend and form elements in fieldset so IE8 styles the legend properly 2012-10-01 10:42:45 -07:00
Mark Otto 32181816f7 run make on previous merge 2012-10-01 10:27:42 -07:00
Mark Otto c77d4266c0 Merge pull request #5369 from amid2887/2.1.2-wip
Add missing icon class definition for navs.less
2012-10-01 10:27:13 -07:00
amid2887 46764a7165 Add missing icon class definition for navs.less
add missing icon class definition for navs:
'[class*=" icon-"]'

P.S. Sorry for 2 pull requests with the same problem..
2012-10-01 14:32:51 +07:00
Mark Otto 8da78223ff reset input and button heights with updated padding 2012-10-01 00:19:29 -07:00
Mark Otto 56935c64c0 remove left margin reset from old grid system 2012-10-01 00:11:05 -07:00
Mark Otto eb555b7a9d remove .nav-list, instead use .nav-stacked on .nav-tabs or .nav-pills from now on 2012-10-01 00:06:44 -07:00
Mark Otto 26386ad615 remove tabbable tabs on left, right, and bottom; instead, from here out use stacked pills or tabs 2012-10-01 00:05:18 -07:00
Mark Otto ecf6077f48 remove table grid sizing, it can use the new default grid columns instead 2012-09-30 23:59:35 -07:00
Mark Otto c82b9d1e7c remove gradientbar mixin 2012-09-30 23:54:35 -07:00
Mark Otto 973646ea67 vars less spacing and cleanup 2012-09-30 23:52:02 -07:00
Mark Otto 142643589f remove bluedark var 2012-09-30 23:50:54 -07:00
Mark Otto 3f4076c635 consolidate border-radius on code 2012-09-30 23:49:26 -07:00
Mark Otto bfe51163e2 run make on prev commit 2012-09-30 23:47:00 -07:00
Mark Otto 3934e55254 remove dupe ff3/4 button fixes; also remove headingscolor var 2012-09-30 23:46:48 -07:00
Mark Otto 4b0d71abc1 carousel refinements 2012-09-30 23:44:23 -07:00
Mark Otto b6f6235e9b change notes about responsive in Scaffolding page: no longer separate file 2012-09-30 23:26:51 -07:00
Mark Otto de6ec034db single CSS file for all css, including responsive 2012-09-30 23:24:07 -07:00
Mark Otto 3f2938948d remove more ie7 css hacks 2012-09-30 23:20:43 -07:00
Mark Otto 08446563b9 clean up comments in reset, remove ie7 css hacks 2012-09-30 23:19:55 -07:00
Mark Otto 443b605246 remove -moz-box-shadow from .box-shadow() mixin, but keep -webkit since that's needed for most iOS and Android mobile browsers 2012-09-30 23:17:07 -07:00
Mark Otto 9872902e47 remove .border-radius mixin and replace with standard border-radius property, since -webkit-* and -moz-* are only needed for older versions 2012-09-30 23:11:54 -07:00
Mark Otto 0cd186183c add comment for filter opacity browser requirements 2012-09-30 22:54:44 -07:00
Mark Otto 840cad69af remove translucent bg mixin 2012-09-30 22:52:32 -07:00
Mark Otto 2b06edc7d7 remove firefox <3.6 css hacks for buttons 2012-09-30 22:49:14 -07:00
Mark Otto bbd543db53 Merge branch '2.1.2-wip' into exploratory
Conflicts:
	docs/getting-started.html
	docs/templates/pages/getting-started.mustache
2012-09-30 22:45:39 -07:00
Mark Otto da43c7c27c run make after merge 2012-09-30 22:41:26 -07:00
Mark Otto 40a8a93b22 Merge branch 'amid2887-master' into 2.1.2-wip 2012-09-30 22:41:11 -07:00
amid2887 d49dd766c8 Add missing icon class definition for buttons.less
add missing icon class definition for buttons:
'[class*=" icon-"]'
2012-10-01 12:27:37 +07:00
Mark Otto cfc032fd41 add sticky footer example per martin bean's suggestion, using the implementation by ryan fait 2012-09-30 22:09:51 -07:00
Mark Otto a4a6244eb7 add sticky footer example per martin bean's suggestion, using the implementation by ryan fait 2012-09-30 22:09:51 -07:00
Kevin Attfield 82715ae96d Fix for #5362
Fix for issue [5362](https://github.com/twitter/bootstrap/issues/5362):
tab events fired on wrong dropdown anchor.
2012-09-30 21:41:37 -07:00
Mark Otto a2690c6d86 add link to examples on index page; add back narrow marketing page and signin page examples 2012-09-30 21:28:20 -07:00
Mark Otto 6cfabf5e22 add link to examples on index page; add back narrow marketing page and signin page examples 2012-09-30 21:28:20 -07:00
Mark Otto 57f8dbe25c fixes #5360: typo in tables docs 2012-09-30 21:26:43 -07:00
Mark Otto f8374a754d clean up emphasis docs text 2012-09-28 15:01:12 -07:00
Mark Otto 8ecffcb32f fixes #5334: html snippet comments 2012-09-28 10:39:15 -07:00
Carl Porth e1f6458e36 don't wait for ready when binding events to document 2012-09-27 15:00:02 -07:00
Artem Kustikov 0944e036ae Fix for #4550
Also fixes dropdowns hiding behavior for case when two or more dropdowns
with [data-toggle=dropdown] exist on the page
2012-09-27 21:45:37 +03:00
Andreas Cederström ecbb0ed4df Making modal work with max width 767px - fixes #4860 2012-09-27 11:46:54 +02:00
Erlend Halvorsen e9a648cd39 Fixed bug in dropdown toggle where menu would only clear on the first drop down 2012-09-27 10:31:40 +02:00
Carl Porth 474471b831 bind data-api events to document instead of body to allow body replacement 2012-09-26 23:11:03 -07:00
Mark Otto ad96435d27 Merge branch '2.1.2-wip' into box-sizing-exercise 2012-09-26 16:02:33 -07:00
Mark Otto 24e277b85a Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-09-26 16:01:59 -07:00
Mark Otto 498a28b4cd dat new kippt hotness 2012-09-26 16:01:45 -07:00
Mark Otto cd5ae9e030 change up carousel 2012-09-26 11:20:27 -07:00
Mark Otto 6b578ec8de move mixins that generate css to utilities.less with different class names, but the same mixins 2012-09-26 08:59:57 -07:00
Mark Otto b6ba717b75 fix getting started examples 2012-09-25 23:01:18 -07:00
Mark Otto 80c4d5a9bf fix homepage example sites 2012-09-25 22:59:49 -07:00
Mark Otto 2eb4c6fc79 cleanup breadcrumbs less code (nesting) 2012-09-25 22:57:49 -07:00
Mark Otto ecbf1159a4 remove .dividers from breadcrumbs, instead use :after and content 2012-09-25 22:57:20 -07:00
Mark Otto d1affe6154 restore gradient to navbars 2012-09-25 22:53:41 -07:00
Mark Otto f8efc75a66 increase padding on navbar links, remove font-size override on .navbar from docs css 2012-09-25 22:51:05 -07:00
Mark Otto c59e5251e1 initial pass at removing navbar-inner from .navbar component 2012-09-25 22:48:02 -07:00
Mark Otto f12946be5a thumbnails cleanup: no more UL or LI elements needed, instead just use standard grid markup 2012-09-25 22:40:48 -07:00
Mark Otto 08eea302ef remove remaining fluid grid css 2012-09-25 22:20:24 -07:00
Mark Otto 151ed38cdc remove references to row fluid elsewhere 2012-09-25 22:18:34 -07:00
Mark Otto 9e97098802 make .input-* classes match .btn-* size classes 2012-09-25 22:16:47 -07:00
Mark Otto 0220015edd remove all ie7 conditionals and mixins 2012-09-25 22:07:53 -07:00
Mark Otto f0b4f05a27 remove ie7 support from mixins 2012-09-25 22:02:29 -07:00
Mark Otto ce19e63d5b Merge branch '2.1.2-wip' into box-sizing-exercise
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/base-css.html
	docs/templates/pages/base-css.mustache
	less/forms.less
	less/mixins.less
2012-09-25 22:00:41 -07:00
Mark Otto 527d01ce99 headway, cleanup, and tests 2012-09-25 15:01:03 -07:00
Robin Lewis b29d947477 Use paginationActiveBackground var to finish fixing #4295 2012-09-25 21:12:01 +01:00
Jacob Thornton 0540b63ab0 check affix pos on clicks - use timeout for clicks which scroll 2012-09-24 23:59:02 -07:00
Jacob Thornton aec8b08930 update docs for tooltip html + the dropdown methods api 2012-09-24 23:32:55 -07:00
Jacob Thornton 88b1e44dd6 change tooltip/popover insert strategy
remove modal-open class
hopefully resolve z-index headaches
2012-09-24 23:28:38 -07:00
Jacob Thornton 4a2443901f reverting d797a5fbd7 2012-09-24 23:19:33 -07:00
Jacob Thornton bda3d57a00 Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-09-24 23:16:09 -07:00
Jacob Thornton 003fcccceb change tooltip/popover html default to false for xss safety net 2012-09-24 23:15:36 -07:00
Mark Otto f4d3d7da2e ensure 100% width for .uneditable-inputs in <767px viewports 2012-09-23 16:06:28 -07:00
Mark Otto a4bf6ef0a0 match decimal placements in type.less 2012-09-23 15:16:13 -07:00
Mark Otto af871d57c9 fixes #5216: calculate heading sizes via math rather than fixed pixel amounts 2012-09-22 22:16:12 -07:00
Mark Otto c3ea955661 Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-09-22 21:37:08 -07:00
Mark Otto a419e70a42 add specific line items to contributing doc for issues, update branch list 2012-09-21 10:24:16 -07:00
Jacob Thornton ebf94c53a5 change transition.js, rebuild… travis maybe will be happy? 2012-09-20 16:50:36 -07:00
Jacob Thornton 1716b0fdb5 remove src's 2012-09-20 16:31:10 -07:00
Jacob Thornton fe38d12f12 rebuild - fix missing ( 2012-09-20 16:26:00 -07:00
Jacob Thornton 667179f406 added support for jquery 1.8.* 2012-09-20 16:23:54 -07:00
Mark Otto c92a75999f fixes #5127: add @inputHeight to replace static instances of '30px' throughout forms 2012-09-20 11:45:59 -07:00
Mark Otto 532ee08213 fixes #5150: add btn-group support to input groups 2012-09-20 11:37:34 -07:00
Mark Otto 443c43f6c4 fixes #5102, #5166, #5194, #5205: add overflow: visible; to .nav-collapse.collapse so that dropdowns overflow correctly in the navbar in IE7-8 2012-09-20 10:28:27 -07:00
Mark Otto 67585bd34e fixes #5211 manually: spacing in mixins to match others 2012-09-20 09:07:48 -07:00
Mark Otto 6c3cd6fd9d fixes #5212: text emphasis classes only get hover with links 2012-09-20 09:06:43 -07:00
Mark Otto a6206c98d5 increase padding on homepage button 2012-09-19 15:18:14 -07:00
Mark Otto 2d90c816ac add new vars for common border-radius, upping border-radius of inputs to 4px; add border-radius changes to -large, -small, -mini for buttons and paginations 2012-09-18 21:16:08 -07:00
Mark Otto 2769241aeb add new vars for common font-sizes and paddings with large, small, and mini components; resize pagination and buttons to better match each other 2012-09-18 20:56:20 -07:00
Mark Otto 37460e58d3 Merge branch '2.1.2-wip' of https://github.com/uberspeck/bootstrap into uberspeck-2.1.2-wip 2012-09-18 14:58:39 -07:00
Mark Otto cc3de8bd6e fixes #5177: remove color on .btn-large .caret, but keep sizing change; also start to add CSS tests for buttons 2012-09-18 12:00:57 -07:00
Mark Otto 13be8b2031 contributing edits 2012-09-18 11:50:11 -07:00
Mark Otto c15877445c Merge pull request #5187 from caniszczyk/2.1.2-wip
Add CONTRIBUTING.md
2012-09-18 11:44:43 -07:00
Mark Otto 78992bbf42 fixes #5178: update normalize to avoid resetting audio and video elements in android 2012-09-18 11:23:16 -07:00
Chris Aniszczyk 2a20761f07 Add CONTRIBUTING.md
Signed-off-by: Chris Aniszczyk <zx@twitter.com>
2012-09-18 10:50:04 -07:00
Mark Otto 3b3def4898 fixes #5087: add hover states to text emphasis classes for links 2012-09-17 23:19:52 -07:00
Mark Otto 239e6a7d21 fixes #5082 manually: reset font-size for .dropdown-menu within .input-prepend/-append 2012-09-17 23:11:49 -07:00
Mark Otto cedb3c7c56 fixes #5173: proper popover offsets; added docs examples to enable tests in the future 2012-09-17 23:03:32 -07:00
Mark Otto 783f4885ab add the media css to customizer 2012-09-17 18:17:22 -07:00
Mark Otto 26ca131a95 Merge branch 'wpbrains-media-component' into 2.1.2-wip 2012-09-17 18:15:44 -07:00
Mark Otto 143fef9f95 overhaul the docs and css to merge into 2.1.2 since this was against master 2012-09-17 18:15:39 -07:00
Mark Otto 917b46a343 resolve conflicts and remake 2012-09-17 16:43:18 -07:00
Mark Otto caa79ed594 fixes #5001: proper ids on form examples 2012-09-17 16:26:51 -07:00
Mark Otto 6881c193ca fixes #5039: properly set .row-fluid margins for .controls-row 2012-09-17 16:09:36 -07:00
Mark Otto 03a406d920 fixes #5041: add new navbar css tests for each variation, remove width: 100%; from .navbar-static-top 2012-09-17 15:49:22 -07:00
Mark Otto f69e244a60 Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-09-17 15:28:41 -07:00
Mark Otto cd876fb659 Merge pull request #5125 from tapcanvas/tab-body-bg
Use @bodyBackground on .nav-tabs active state instead of static color
2012-09-17 15:28:31 -07:00
Mark Otto f12b0239bc nuke new examples for now 2012-09-17 08:53:13 -07:00
Mark Otto 6f3bef195a nuke new examples for now 2012-09-17 08:53:13 -07:00
Mark Otto 1ea09b751e fixes #5163: add new var for navbar collapse's default view, use that in responsive navbar css 2012-09-17 08:52:19 -07:00
Mark Otto 2fd17aa6a8 more carouself example work 2012-09-16 21:54:06 -07:00
Mark Otto 6e25aacc91 more carouself example work 2012-09-16 21:54:06 -07:00
Robert McLaws 6aa15eb01f Support for left-opening dropdown submenus
Adds a new class called .dropdown-submenu-left. It is useful when you
have a .pull-right DropDown that has submenus. Without this, the menu
opens left past the page boundary, which can trigger the scrollbars and
cause other nastiness.
2012-09-16 03:02:31 -04:00
Mark Otto 6c4b276cd4 way cooler carousel example, along with updated screenshots for examples 2012-09-14 15:55:46 -07:00
Mark Otto fe4a2d2c96 way cooler carousel example, along with updated screenshots for examples 2012-09-14 15:55:46 -07:00
Mark Otto 7857089065 tweak copy on each template, add sign in template 2012-09-14 15:21:44 -07:00
Mark Otto 7ea4783df8 tweak copy on each template, add sign in template 2012-09-14 15:21:44 -07:00
Mark Otto 0bcbcf69ec adding new examples 2012-09-14 15:17:46 -07:00
Mark Otto 8d97ae98d2 adding new examples 2012-09-14 15:17:46 -07:00
Mark Otto e4e2e37c5c add in some more examples (will work em in later), removed fleetio per their request, and added gather content to replace it 2012-09-14 14:48:03 -07:00
Mark Otto 5aa1018496 i18n homepage 2012-09-14 14:31:14 -07:00
Mark Otto faa760f563 revert docs change 2012-09-14 10:30:55 -07:00
Martin Bean 2ead9a5bc3 Standardized spelling of 'JavaScript'; added icons to file trees 2012-09-14 14:06:15 +01:00
Adrien Cahen 5331fe39df fix active tab bg on non-white body 2012-09-13 12:16:18 -07:00
Mark Otto 595e1a189c fixes #5119: javascript in navbar typo 2012-09-13 10:07:57 -07:00
Brian Campbell a40ab1cd66 mistakenly committed ALL assets. since only bootstrap.css and bootstrap.min.css are changed i removed all others 2012-09-12 18:11:42 -06:00
Mark Otto 15bb78ce80 fixes #5107: make all .btn-group inline-block by default instead of just within a .btn-toolbar 2012-09-12 16:37:41 -07:00
Mark Otto e1deba30aa fixes #5097: js docs typos 2012-09-12 16:22:52 -07:00
Mark Otto 537c5cc33d use local var for a few other .box-shadow mixins to fix CSS not compiling 2012-09-12 16:18:52 -07:00
Mark Otto 65d322958c add space 2012-09-12 16:11:03 -07:00
Mark Otto 38303dd997 revert the js evaluation in .box-shadow mixin, fix last mixin usages to escape if using >1 shadows 2012-09-12 15:53:29 -07:00
Mark Otto bbadd429a8 change up box-shadow mixin usage everywhere to use escaping again, or local var if necessary for further var evaluation 2012-09-12 15:48:56 -07:00
Brian Campbell 2c8eff0eec Updated pagination to support .pagination-large, .pagination-small, .pagination-mini matching button sizes. Updated related docs. 2012-09-12 14:10:03 -06:00
Mark Otto 0489c708c7 fixes #5040 manually: remove overflow: auto; from .modal to resolve sporadic modal right padding issues with scrollbars 2012-09-10 22:51:16 -07:00
Mark Otto 39791a8ea8 fixes #5059 manually: include media type in css getting started block 2012-09-10 22:44:08 -07:00
Mark Otto cd2b12f788 fixes #5064 manually: remove fancy quote mark 2012-09-10 22:41:14 -07:00
Mark Otto 7110b243f5 more tests and experiments 2012-09-10 10:11:02 -07:00
Mark Otto 10faf28aef Merge pull request #5051 from GeoffYoung/2.1.2-wip
Update modal example code to match example
2012-09-10 10:04:34 -07:00
Geoff Young 76e42edb29 Updated sample markup to reflect live demo. 2012-09-09 18:58:23 -04:00
Mark Otto dd1bce2611 latest tweaks to grid classes for forms 2012-09-08 12:50:37 -07:00
Mark Otto b53da4b6e7 commenting out stuff and adding grid test page 2012-09-07 22:46:35 -07:00
Mark Otto 9a39306abe nuke fluid grid docs again 2012-09-07 22:35:51 -07:00
Mark Otto 7e29581210 Merge branch '2.1.2-wip' into box-sizing-exercise
Conflicts:
	docs/scaffolding.html
	docs/templates/pages/scaffolding.mustache
2012-09-07 22:34:51 -07:00
Mark Otto f29f98501c run make after merging #5028, which removes the left margin of responsive fluid grid offsets 2012-09-07 11:42:21 -07:00
Mark Otto 1f8e2d2617 Merge branch 'dionysiosarvanitis-master' into 2.1.2-wip 2012-09-07 11:41:35 -07:00
Mark Otto 61332d727e fixes #5020: submenu support in dropup 2012-09-07 11:34:05 -07:00
Mark Otto f2bd7d9f27 fixes #5018: .btn-block in .modal-footer no longer has left margin 2012-09-07 11:10:00 -07:00
Mark Otto 6c5c3c81ec Merge branch 'tiny-typos' of https://github.com/ramiro/bootstrap into ramiro-tiny-typos 2012-09-07 11:06:08 -07:00
Mark Otto 7a0f5c6c00 fixes #5010: .pager span selector should be scoped to immediate children only 2012-09-07 11:04:51 -07:00
Dionysios G. Arvanitis cc4f8b9f6c remove offset margin in row-fluid mobile layout 2012-09-07 17:54:15 +03:00
Giuliano Velli 501a2d69e1 Merge branch 'media-component' of github.com:wpbrains/bootstrap into media-component 2012-09-07 10:13:26 +02:00
Giuliano Velli 7762a77c21 Modified the file to conform to bootstrap standards and fix an IE7 css selector issue
Signed-off-by: Giuliano Velli <giuliano@giusi.org>
2012-09-07 09:59:52 +02:00
Ramiro Morales 138b5a8c05 Fix small documentatio typos. 2012-09-05 23:07:52 -03:00
Mark Otto d4a16d35eb fixes #4996: incorrect border radius on a table 2012-09-05 10:05:54 -07:00
Mark Otto 3fa4ca2d87 Merge branch 'spantaleev-patch-1' into 2.1.2-wip 2012-09-05 10:04:38 -07:00
Mark Otto dfb3175d4b rebuild after merge 2012-09-05 10:04:28 -07:00
Mark Otto 08b8571cb8 version bump to get this started 2012-09-05 10:00:57 -07:00
Slavi Pantaleev 5ff5d351bf Do not force white icons in active tab links
Active `.nav-tabs` elements are not blue (like pills),
so forcing a white icon there is not appropriate.
2012-09-05 19:07:53 +03:00
Jacob Thornton c52368d3c5 last rebuild before 2.1.1 release 2012-09-04 20:44:11 -07:00
Mark Otto df8e3c6ee3 Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip 2012-09-04 20:13:36 -07:00
Mark Otto bc4ecd9984 regrettably remove the animated button for download on homepage to improve page performance in some browsers 2012-09-04 20:13:27 -07:00
♒∆✝ 9341bb756b Merge pull request #4784 from rossj/2.1.1-wip
Fix Typeahead key navigation with Chrome + jQuery 1.8.0
2012-09-04 20:03:04 -07:00
♒∆✝ 9d890a8412 Merge pull request #4810 from mainerror/2.1.1-wip
Makefile misses a 'clean' directive
2012-09-04 19:54:16 -07:00
Mark Otto 7e4629fbbe fixes #4968 manually: typo in scaffolding docs about offset classes 2012-09-04 14:27:48 -07:00
Mark Otto 73ef263d5f improve comments in image styles 2012-09-04 11:31:48 -07:00
Mark Otto bf590d8c81 fixes #4958: add version to minified js 2012-09-04 11:13:08 -07:00
Mark Otto a1d2ee6542 fixes #4885: correct use of skew in .skew() mixin for FF 2012-09-04 11:08:08 -07:00
Mark Otto de36456f5d fixes #4957: use input border var for select element instead of #ddd 2012-09-04 11:00:25 -07:00
Mark Otto 1f0043a7f5 fixes #4959: docs example 2012-09-04 09:13:09 -07:00
Mark Otto acf2a64016 fixes #4935: properly comment responsive image techniques and add CSS tests to support 2012-09-03 17:35:35 -07:00
Mark Otto 8cda830eaf fixes #4146: IE7-8 responsive image helper 2012-09-03 01:13:42 -07:00
Mark Otto f25129361b add comment to go with updated box-shadow mixin 2012-09-03 01:04:53 -07:00
Mark Otto f46813a8c8 Merge pull request #4763 from Luis-TP/2.1.1-wip
Improve .box-shadow mixin by utilizing regex function to no longer require escaping
2012-09-03 01:03:37 -07:00
Mark Otto 9d5f9eca85 fixes #4909: add color utility classes .text-warning, etc and document them 2012-09-03 00:47:48 -07:00
Mark Otto 69d4c3f9a1 fixes #4925: ensure docs examples don't use fixed font-size and line-height for .lead 2012-09-02 20:54:41 -07:00
Mark Otto 3737904859 fixes #4922: use basefontsize for realz on .lead 2012-09-02 13:25:03 -07:00
Mark Otto 209852c805 fixes #4902: proper accordion html example 2012-09-01 12:03:55 -07:00
Mark Otto 02f6bd65f5 fixes #4910: use @baseLineHeight * 1.5 for .lead font-size 2012-09-01 12:00:13 -07:00
Mark Otto e8c5b3c9a5 fixes #4869: typo in getting started 2012-08-31 23:51:48 -07:00
Mark Otto b1bdca0fdb fixes #4901: attribute typo and reran make 2012-08-31 23:25:58 -07:00
Mark Otto 00d6f26270 fixes #4896: reflect media query order in docs 2012-08-31 23:12:02 -07:00
Mark Otto 0f85e8b7f8 fixes #4824: scope table grid sizes to .table instead of table 2012-08-31 22:37:46 -07:00
Mark Otto beb0b64096 fixes #4889: btn-link disabled styles 2012-08-31 14:02:18 -07:00
Mark Otto afd931262c Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip 2012-08-29 13:14:11 -07:00
Mark Otto 2da2169a56 fixes #4828: make fluid grid inputs size the same as fixed grid inputs 2012-08-29 13:06:47 -07:00
Mark Otto 2137cd65fb fixes #4819: manual fix of missing .control-label in responsive767 file, coupled with a remake 2012-08-29 13:05:43 -07:00
Mark Otto 010a5dd84d Merge pull request #4816 from desimone/master
Fixed a typo in docs/assets/css/docs.css
2012-08-29 10:48:04 -07:00
Bobby DeSimone 8878facc67 Fixed a typo in docs/assets/css/docs.css 2012-08-29 11:13:55 -03:00
Octavian Damiean a976a1583c Added 'clean' directive to the make file. 2012-08-29 13:24:00 +02:00
Mark Otto cb46ddee72 grid docs changes 2012-08-28 13:46:13 -07:00
Mark Otto 0b122bc5c5 remake the box-size grid, nuke fluid grid docs, fix up examples, clean up form styles 2012-08-28 13:33:06 -07:00
Mark Otto e27b1355b5 fixes #4771: widen .form-horizontal labels and .dl-horizontal terms given larger font-size of 2.1.0 2012-08-28 10:12:04 -07:00
Ross Johnson b5373d8561 Merge remote-tracking branch 'origin/2.1.0-wip' into 2.1.1-wip 2012-08-28 11:14:34 -05:00
Ross Johnson 66ad3d62c6 Fix key events with Chrome + jQuery 1.8.0 2012-08-28 00:55:56 -05:00
Mark Otto 545edf5459 Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip 2012-08-27 22:43:05 -07:00
Mark Otto 609142eee2 fixes #4729: only use margin-top on .help-block when it follows an input, select, textarea 2012-08-27 22:42:12 -07:00
Jacob Thornton 3568146b28 only stop prop on form – as people seem to be relying on dropdown hiding when clicking internal elements 2012-08-27 21:44:09 -07:00
Jacob Thornton 215d92bacd Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip 2012-08-27 21:27:31 -07:00
Jacob Thornton 4751a0a274 crude check to make sure element has a # for an id 2012-08-27 21:27:01 -07:00
Mark Otto 7d412b1e14 fixes #4741: undo previous version's attempt at firefox gradient changes and add gradient tests 2012-08-27 21:18:55 -07:00
Mark Otto 55982664d0 Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip 2012-08-27 21:06:29 -07:00
Mark Otto 1eaf1cf418 fixes #4653: add hover states to stateful table rows 2012-08-27 21:06:21 -07:00
Jacob Thornton 601e252074 fix for #4761 2012-08-27 20:58:51 -07:00
Jacob Thornton d797a5fbd7 fix for open elements under modal when .modal-open 2012-08-27 20:43:12 -07:00
Mark Otto 17d8c78e52 fix docs horizontal scroll on tablet viewports 2012-08-27 20:32:42 -07:00
Mark Otto 438f745ea2 Merge pull request #4765 from globocom/missing-i18n-tag-getting-started-download-page
i18n tags missing in some strings at getting started download page
2012-08-27 20:06:42 -07:00
Alexandre Magno b5a8c0a45e i18n tags missing in some strings at getting started download page 2012-08-27 23:54:07 -03:00
Luis Aleman 2719ac3e9b Unescaped box-shadows to take advantage of new box-shadow mixin 2012-08-27 19:14:00 -04:00
Luis Aleman 67eae2a503 Do not need to write box-shadow in full 2012-08-27 19:13:37 -04:00
Luis Aleman 96a1797af1 No longer need to write box-shadows in full when using lighten or other functions 2012-08-27 19:13:11 -04:00
Luis Aleman 1b7a3ca416 Changed box-shadow mixin to accept infinite, comma separated, shadows 2012-08-27 19:10:20 -04:00
Mark Otto 303a33f15c fixes #4664: spelling mistake in alerts docs 2012-08-27 15:48:54 -07:00
Mark Otto 3b67ece2d1 fixes #4666: overrides for input types with .btn-block 2012-08-27 15:39:55 -07:00
Mark Otto 4674945fa8 fixes #4556: add mention of disable state and required js to buttons docs 2012-08-27 15:27:58 -07:00
Mark Otto b444582ccd fixes #4671: mention collapsing parents in docs for affix plugin 2012-08-27 15:20:50 -07:00
Mark Otto 8610fd9b2b remove min-height from .span3 in docs since we no longer need it 2012-08-27 15:12:55 -07:00
Mark Otto 85dcbd0b34 add min-height: 1px; to .span* classes to prevent grid columns from collapsing 2012-08-27 15:12:22 -07:00
Mark Otto cf9334bd7d fixes #4725: width of .uneditable-input should match standard text input width 2012-08-27 12:07:28 -07:00
Mark Otto 22c4f3d058 fixes #4718: add vertical-align: middle; to .btn-group to ensure proper alignment next to standard .btn 2012-08-27 12:05:15 -07:00
Mark Otto 15317419f4 fixes #4577: no margin on .control-row .span* in responsive 2012-08-27 11:46:47 -07:00
Mark Otto 8a5dde556b fixes #4644: ensure new static navbar negative indents on responsive layouts like fixed navbars 2012-08-27 11:05:01 -07:00
Mark Otto 1c9d5c43b0 fixes #4640: pagination span issues resolved by scoping selectors to appropriate children, not all children; clarify docs on use of spans for disabled and active links 2012-08-27 10:56:46 -07:00
Mark Otto a2b9a5e1fe fixes #4680: proper margin on buttons in navbar forms 2012-08-27 10:52:11 -07:00
Mark Otto fcd08fce8f fixes #4578: add clearfix to .navbar-inner to clear floats 2012-08-27 10:32:07 -07:00
Mark Otto 54e3a26dda fixes #4562: correct select and input widths at 220px (changed with 2.1.0 when we changed padding) 2012-08-27 10:08:16 -07:00
Mark Otto 96542f14ab fixes #4540: adjust vertical alignment of .btn-group in .navbar 2012-08-27 10:04:58 -07:00
Mark Otto 12d5c88c20 fixes #4742: add default value to striped gradient 2012-08-27 09:53:23 -07:00
Mark Otto bdc3ff99f3 fixes #4749: correct initialism example 2012-08-27 09:18:32 -07:00
Mark Otto 72f176d1f5 fixes #4748: document jquery dependency better 2012-08-27 09:17:20 -07:00
Mark Otto 1b8f4f5bc5 fixes #4512: improved borders on navbars 2012-08-26 23:23:47 -07:00
Mark Otto f15eb7b499 fixes #4506: clearfix added to .dl-horizontal to account for empty dd elements 2012-08-26 23:06:56 -07:00
Mark Otto cfa039d2e0 Merge branch 'sparanoid-master' into 2.1.1-wip 2012-08-26 22:30:49 -07:00
Mark Otto eb8aad85b8 fixes #4734 manually: doctype in getting started in examples 2012-08-26 22:29:40 -07:00
Mark Otto f744ad57fc fixes #4676 manually: example html updated 2012-08-25 22:31:10 -07:00
Tunghsiao Liu ec6b320003 Add .transition-delay mixin 2012-08-26 13:09:10 +08:00
Mark Otto bb9d1af1ca fixes #4672 manually: placeholder comment 2012-08-25 21:51:07 -07:00
Mark Otto aa07523e69 Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip 2012-08-25 19:41:25 -07:00
Mark Otto d9593e217d avoid top margin on input-append/prepend in .navbar-form 2012-08-24 14:45:02 -07:00
Mark Otto 0682780cd8 fixes #4657: proper border radius property in tables 2012-08-23 15:04:41 -07:00
Mark Otto d9fe9af966 Merge pull request #4643 from rpavlik/codespell
Spelling mistake in tooltip test
2012-08-23 09:51:20 -07:00
Mark Otto 5cbb826961 Merge pull request #4560 from andriijas/2.1.1-wip-table-row-warning
.warning for table tr  and .info for .control-group
2012-08-23 09:47:44 -07:00
Ryan Pavlik 019d9bf0f3 Fix typo found with codespell. 2012-08-23 11:41:55 -05:00
Mark Otto be64955e25 nuke 10px right margin on .navbar .nav 2012-08-23 09:38:56 -07:00
Mark Otto 3424df22ee delete components folder 2012-08-23 08:30:27 -07:00
Mark Otto ac4420237c fixes #4591 properly: remove -1px left margin on .input-append .add-on 2012-08-22 20:32:47 -07:00
Mark Otto 4775bc910c fixes #4604: add span support to .pager component 2012-08-22 20:28:08 -07:00
Mark Otto 5da217b96e fixed #4598, typo, manually 2012-08-22 20:23:58 -07:00
Mark Otto 582b178723 fixes #4542 manually: typo in phantomjs and space between url in markdown 2012-08-22 10:44:41 -07:00
Mark Otto 535dfc2153 fixes #4561: typo 2012-08-22 09:51:41 -07:00
Mark Otto 6160667b19 fixes #4564 manually: typo in getting started jumbotron 2012-08-22 09:48:57 -07:00
Mark Otto 5f97e04aa3 fixes #4567: link in scaffolding page 2012-08-22 09:47:56 -07:00
Mark Otto 115c7b82c4 fixes #4586: typo in docs 2012-08-22 09:45:57 -07:00
Andreas Cederström a9764c34a7 Add info state to form validation 2012-08-22 11:24:02 +02:00
Andreas Cederström 361889def9 Add .warning to table rows 2012-08-22 11:20:31 +02:00
Mark Otto 5d41742f17 fixes #4505: lighten navbar text and link color so hover looks darker 2012-08-21 14:53:34 -07:00
Mark Otto 8d00fe4c03 running make on previous merge 2012-08-21 14:43:13 -07:00
Mark Otto 1973c64342 Merge branch 'PavelDemyanenko-patch-1' into 2.1.1-wip 2012-08-21 14:42:25 -07:00
Mark Otto 46c10c8b58 alternate fix to #4522: increase line-height on btn-mini 2012-08-21 14:38:47 -07:00
Mark Otto 190d3c9c3e fixes #4526: box-shadow on .radio and .checkbox if .control-group has a form field state 2012-08-21 14:22:26 -07:00
Mark Otto e2ecd2df6c Merge branch 'incbee-master' into 2.1.1-wip 2012-08-21 14:16:09 -07:00
Mark Otto 45978b6674 run make 2012-08-21 14:16:01 -07:00
Mark Otto b1c93c2700 fixes #4523: more specific selectors on white icon inversion 2012-08-21 14:15:01 -07:00
philippm 6e7ba4e24a Fix all submenus expanded recursively in dropdown
The problem was that the CSS selector made *all* of a submenu's nested
menus visible. Fixed by applying the selector to the immediate nested
menu only.
2012-08-21 22:10:36 +01:00
Mark Otto 311c00a29b fixes #4532: navbar responsive carets for dropdown-menus now hidden, also fixes borders on navbar form 2012-08-21 14:07:20 -07:00
Mark Otto 13199c0020 fixes #4530: fix docs nesting cols comments 2012-08-21 13:59:13 -07:00
Mark Otto 6dc13573bf add css tests and stuff for #4528 2012-08-21 13:42:00 -07:00
Mark Otto 1c134d9a7f update version numbers to 2.1.1 2012-08-21 13:11:25 -07:00
Mark Otto b52d29095a fixes #4520: manually fix example html for icon 2012-08-21 13:09:01 -07:00
Mark Otto 4f918ce52c fixes #4517 manually in mustache file as well, typo in docs 2012-08-21 13:08:09 -07:00
Mark Otto 94f9f9de73 Merge branch 'UTGuy-master' into 2.1.1-wip 2012-08-21 13:07:11 -07:00
Mark Otto e5060b8d92 clean up spacing and run make 2012-08-21 13:07:06 -07:00
Mark Otto 8a2b9f4a5f remove entity in content property on dropup carets--not necessary at all 2012-08-21 13:02:02 -07:00
Mark Otto 099cec1ca7 fixes #4493: typo in dimiss alerts docs 2012-08-21 13:00:40 -07:00
Mark Otto 06c718b1d3 fixes #4480: typo in scaffolding page 2012-08-21 12:59:26 -07:00
Mark Otto 55facf1f2e fixes #4473: docs example typo for js affix plugin 2012-08-21 12:58:48 -07:00
Mark Otto 6477ad1acf fixes #4472: manually change mustache file as well for typo 2012-08-21 12:57:41 -07:00
UTGuy 5fc5d26917 Update less/variables.less
https://github.com/twitter/bootstrap/issues/4508

should fix this issue
2012-08-21 11:21:28 -03:00
Pavel Demyanenko fe3ed433e4 Fix bug Collapse broken in IE 2012-08-21 14:33:15 +04:00
Jacob Thornton 320b75de63 add affix to zip 2012-08-20 23:13:43 -07:00
Jacob Thornton 9e0d87a4dd fix afffix 2012-08-20 16:43:49 -07:00
Mark Otto 471d913ab6 add bottom margin back to sidenav for narrow tablets 2012-08-20 16:37:46 -07:00
Mark Otto cbc7873bb4 fix jittering of sidenav 2012-08-20 16:33:41 -07:00
Jacob Thornton 2b5e09038a small nits 2012-08-20 16:21:57 -07:00
Jacob Thornton 5d63e8e2a8 fMerge branch '2.1.0-wip'
Conflicts:
	docs/index.html
2012-08-20 16:13:46 -07:00
Mark Otto aa2cec6f2f fixes #4178: translate3d instead of translate 2012-08-20 14:26:38 -07:00
Mark Otto 01572f00bb ie7 button group and button toggle padding changes 2012-08-20 12:27:45 -07:00
Mark Otto 58dd1f20ae fix vertical button-groups in ie7 2012-08-20 12:20:22 -07:00
Mark Otto 6cf3752b9b fix ie7 dropdowns examples in docs 2012-08-20 12:16:15 -07:00
Mark Otto 78cb09b440 run make and add comment 2012-08-20 11:31:24 -07:00
Mark Otto ed13ec50f8 Merge branch 'patch-1' of https://github.com/krnlde/bootstrap into krnlde-patch-1 2012-08-20 11:28:43 -07:00
Mark Otto e59642838f remove relative and top positioning from docs sidenav at narrow layout 2012-08-20 11:28:30 -07:00
Mark Otto 2fda6a45aa bump up height of progress bars, give some extra depth with stacking bars, and then make the stacked bars actually work 2012-08-20 11:22:37 -07:00
Mark Otto 47697c5f35 Merge branch 'progress-multi-2.1.0-wip' of https://github.com/jpommerening/bootstrap into jpommerening-progress-multi-2.1.0-wip 2012-08-20 11:13:07 -07:00
Mark Otto afaee0ca13 reorder jumbotron links 2012-08-20 11:09:16 -07:00
Mark Otto 73cf9c4db8 fixes #4469 manually: reset width on file inputs 2012-08-20 10:28:41 -07:00
Jonas Pommerening a1951ed7c0 stack mutliple progress bars 2012-08-20 10:12:03 +02:00
Mark Otto e510306196 bump versions to 2.1.0 2012-08-19 23:07:18 -07:00
Mark Otto a12c19b3c8 updated package and readme 2012-08-19 23:05:16 -07:00
Mark Otto a667fd93ab pre font-size increase; revert static top navbar, undo contents section for now 2012-08-19 23:01:24 -07:00
Mark Otto 4e979f084d fix static navbar container issues, clean up docs presentation by unfixing the top navbar in favor of static one, start adding table of contents for longer sections of docs 2012-08-19 21:12:52 -07:00
Mark Otto e4d4ef43b0 copy change for previous commit 2012-08-19 20:38:27 -07:00
Mark Otto e71e2b4be2 fixes #4460 and #4461: copy change for opera animations support 2012-08-19 20:38:16 -07:00
Mark Otto 94ba211c40 fixes #4462: mixins instead of vanilla css 2012-08-19 20:32:29 -07:00
Mark Otto b745b7768a fixes #4458: improve support for .btn + .btn in .btn-groups and .btn-toolbars 2012-08-19 17:07:41 -07:00
Mark Otto 887f11d47f fixes #4455: improve small styles and add to docs 2012-08-19 13:12:43 -07:00
Mark Otto 47cf3cc62f copy edits to base css page 2012-08-19 12:07:23 -07:00
Mark Otto bb85bbc657 compy edits to docs 2012-08-19 12:04:41 -07:00
Mark Otto 7ed82c1223 font-size change on examples in getting started 2012-08-19 11:59:28 -07:00
Mark Otto 8e271d664b Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-08-19 11:54:05 -07:00
Mark Otto c531a75ff0 fixes #4451 manually: add .fade to modal example in both mustache and html 2012-08-19 11:53:55 -07:00
Kai Dorschner 1e190d8036 Fix for thumbnails in responsive design 2012-08-19 17:32:40 +03:00
Jacob Thornton c9cef741f6 listen to touchstart for dropdowns on mobile 2012-08-18 20:18:15 -07:00
Jacob Thornton 45dddc59a1 add click option for tooltip, popover - make click default for popover 2012-08-18 19:54:30 -07:00
Jacob Thornton 44e35e9dfa fix component 2012-08-18 19:33:46 -07:00
Jacob Thornton 937cfa6a88 add note about .nav 2012-08-18 19:32:50 -07:00
Jacob Thornton 1166b39630 removed some old stuff from application.js 2012-08-18 19:24:29 -07:00
Mark Otto e79eb75e09 fixes #4044: make z-index of tooltips same as fixed navbar so they overlay it if generated from within 2012-08-18 17:05:37 -07:00
Mark Otto e6e0e2ac9b fixes #4442: allow for .btn within a .btn-toolbar without .btn-group 2012-08-18 16:50:26 -07:00
Mark Otto 4d2f584fdd fixes #4444: clarify docs copy that new icon white style is intentional on active and hover links in .nav and .dropdown-menu 2012-08-18 16:47:04 -07:00
Mark Otto 9ae137aede modifications to new content 2012-08-18 16:42:50 -07:00
Mark Otto 80ced60778 Merge branch '2.1.0-wip' of https://github.com/smerik/bootstrap into smerik-2.1.0-wip 2012-08-18 16:31:13 -07:00
Mark Otto 50638530e6 fixes #4445: .btn-link shouldn't have a pressed button-like state at all, so nuking everything on :active as well 2012-08-18 16:30:47 -07:00
Erik van der Kolk dda951d1e1 Remove inexisting end tag </hr> 2012-08-18 21:52:43 +02:00
Erik van der Kolk ae275dccb8 Fix empty for attribute on labels in Horizontal form 2012-08-18 21:44:57 +02:00
Erik van der Kolk b7233a49dd Move code within code snippet as close to the left for Basic block 2012-08-18 19:51:57 +02:00
Erik van der Kolk 3f12c746e5 Replace Note: by Heads up! 2012-08-18 19:49:27 +02:00
Erik van der Kolk 2327d30ef5 Add code snippet to Icon examples => Form fields section 2012-08-18 19:40:42 +02:00
Erik van der Kolk 8b763286df Add code snippet to Icon examples => Navigation section 2012-08-18 19:31:29 +02:00
Erik van der Kolk d71efb855b Separate Buttons examples in Icon examples section and add code snippets 2012-08-18 19:21:01 +02:00
Erik van der Kolk 97247a157c Improve description for Images section 2012-08-18 18:24:18 +02:00
Erik van der Kolk d8eb75d6e8 Fix Heads up! part for Images section 2012-08-18 18:14:20 +02:00
Erik van der Kolk f1854a3cec Move code within <pre> tags as close to the left for Images section 2012-08-18 16:53:43 +02:00
Erik van der Kolk 2ab0c8de1a Fix typo in One class, multiple tags section 2012-08-18 16:50:08 +02:00
Erik van der Kolk 04a20fb402 Use one line per tag in code snippet for One class, multiple tags 2012-08-18 16:47:15 +02:00
Erik van der Kolk 7b7a02542b Improve doc for block level buttons 2012-08-18 16:41:40 +02:00
Erik van der Kolk 41253fb073 Improve doc for Button sizes 2012-08-18 16:36:40 +02:00
Erik van der Kolk a3c474c404 Move code within <pre> tags as close to the left for Input focus 2012-08-18 16:07:48 +02:00
Erik van der Kolk f4f6783cc0 Add <input> into Help text code snippet as shown in example 2012-08-18 16:03:47 +02:00
Erik van der Kolk 263ed4e239 Add span5 from example into multiple grid inputs code snippet 2012-08-18 15:48:18 +02:00
Erik van der Kolk f37d4b0918 Add missing placeholders and <select> in Grid sizing code snippet 2012-08-18 15:43:00 +02:00
Erik van der Kolk 01dadc05f4 Make Relative sizing code snippet the same as example 2012-08-18 15:31:11 +02:00
Erik van der Kolk 663fd4ff62 Make Extending form ... => Search form code snippet the same as example 2012-08-18 15:29:55 +02:00
Erik van der Kolk a8b18b6f54 Fix typo 2012-08-18 14:54:32 +02:00
Erik van der Kolk 25f8ef3260 Add multiple="multiple" to Forms => Selects as described in explanation 2012-08-18 14:36:30 +02:00
Erik van der Kolk c8b8d914b8 Make Forms => Textarea code snippet the same as example 2012-08-18 14:22:41 +02:00
Erik van der Kolk 7f5aa177f5 Make Forms => Default styles code snippet the same as example 2012-08-18 14:00:33 +02:00
Erik van der Kolk 0c24f51d2a Change .help-block tag for "Forms => Default styles" example into <span> 2012-08-18 13:56:02 +02:00
Erik van der Kolk 05571db109 Add <caption> to Supported table markup example 2012-08-18 13:40:37 +02:00
Mark Otto 1ae194597c nuke subnav styles from responsive navbar 2012-08-17 16:32:34 -07:00
Mark Otto 256a25f25c fixes #4260 and #4322: set vertical-align to top on input-prepend components to solve modal rounding issues 2012-08-17 16:28:45 -07:00
Mark Otto 5b947b8a2f fix up padding on small buttons, add button examples 2012-08-17 16:11:52 -07:00
Mark Otto f9deb8017a Merge branch '2.1.0-wip' of https://github.com/tobz/bootstrap into tobz-2.1.0-wip 2012-08-17 16:04:35 -07:00
Mark Otto 2b22c0c56e fixes #4438: button groups in inline forms now render inline 2012-08-17 16:00:36 -07:00
Mark Otto 9e6322dbab fixes #4428: specifity on .search-query increased 2012-08-17 12:59:32 -07:00
Mark Otto 077577c7f3 fixes #4421: add static top navbar class 2012-08-17 11:46:23 -07:00
Mark Otto b86e1fb62a additional navbar contrast: add inset shadow since we nuked the border 2012-08-17 11:31:21 -07:00
Mark Otto b8715ddfd0 fixes #4417: proper height on thumbnail placeholder image 2012-08-17 11:27:11 -07:00
Mark Otto 79e05d0c0e change css version # 2012-08-17 11:24:48 -07:00
Mark Otto 51b43acf20 run make on previous commit's merge 2012-08-17 11:23:39 -07:00
Mark Otto 39f779b5d3 Merge pull request #4419 from natansh/2.1.0-wip
Fix typo to make dropdown active link show icon-white
2012-08-17 11:23:22 -07:00
Mark Otto ded21ebc91 fixes #4416 in a different way: scope active state of navbar links to just the immediate navbar link, not dropdown elements 2012-08-17 11:22:45 -07:00
Natansh Verma bb61175eba Fixes typo for issue #4413. 2012-08-16 17:09:55 +05:30
Mark Otto 54c645e33d tweak transition 2012-08-15 14:49:55 -07:00
Mark Otto fd509cb370 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-08-15 14:45:41 -07:00
Mark Otto ada5589184 add transition to thumbnails 2012-08-15 14:45:35 -07:00
Mark Otto 74bda55d4c Merge pull request #4406 from mikaelkael/fix/add-affix-to-compilation
Add affix.js to javascript compilation
2012-08-15 09:36:35 -07:00
tobz 48f5626499 Fixed spelling error in forms documentation. 2012-08-15 11:07:43 -03:00
tobz 27e9214e05 Removed pixel designation from a zeroed-out property. 2012-08-15 10:38:59 -03:00
tobz ddefdbf31f Added default top margin of 1px for icons. 2012-08-15 10:38:21 -03:00
tobz 6bfa58ea4d Updated margin adjustments of button-based icon overrides. 2012-08-15 10:37:49 -03:00
Mickael Perraud 6a1521327b Add affix.js to javascript compilation 2012-08-15 10:56:52 +02:00
Mark Otto b0437bef76 Merge pull request #4274 from Marmelatze/three-color-gradient
Force percentage value on .vertical-three-colors() gradient mixin.
2012-08-14 22:07:17 -07:00
Jacob Thornton ff38c14948 stray ; 2012-08-14 21:23:29 -07:00
Jacob Thornton ae9a2bd93a Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 2012-08-14 21:06:39 -07:00
Jacob Thornton dee57462e2 get affix actually working and update docs 2012-08-14 21:06:08 -07:00
Mark Otto e1659b2c4e add affix plugin to downloads page 2012-08-14 18:57:27 -07:00
Mark Otto 2ee035403d running make on prev merge 2012-08-14 16:28:17 -07:00
Mark Otto 61a8ef2feb Merge branch 'fix/center-text-navbar' of https://github.com/mikaelkael/bootstrap into mikaelkael-fix/center-text-navbar 2012-08-14 16:27:01 -07:00
Mark Otto f6271da47b navbar and dropdown fixes, for alignments and for ie7/8 dropdown hidden bugs from #3946 2012-08-14 16:24:58 -07:00
Mark Otto 9c72246d49 navbar and dropdown fixes, for alignments and for ie7/8 dropdown hidden bugs from #3946 2012-08-14 16:24:58 -07:00
Mark Otto f3479a3953 compensate for ie7 button padding with no borders, fix indentation 2012-08-14 15:44:25 -07:00
Mark Otto f933a41c7b remove bottom margin on radios and checkboxes 2012-08-14 15:34:10 -07:00
Mark Otto 780636d955 fixes #3674: checkbox vertical alignment in IE9 2012-08-14 15:29:47 -07:00
Mark Otto b14d946afb add animation to docs download btn for firefox 2012-08-14 15:12:22 -07:00
Mickael Perraud 41093a328e Center text in navbar with change to @baseLineHeight (18 -> 20px) 2012-08-15 00:11:57 +02:00
Mark Otto a80dafbb18 fix width of star github btn in docs 2012-08-14 15:00:22 -07:00
Mark Otto 5144c77b27 fixes #4358: make select elements 30px tall to match inputs 2012-08-14 14:57:49 -07:00
Mark Otto 50df524ba1 remove borders entirely from fixed navbars 2012-08-14 14:53:45 -07:00
Mark Otto dbcd87331d fixes #4371: scope hovers on table rows to tbody 2012-08-14 14:51:33 -07:00
Mark Otto 662fface3b Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-08-14 14:32:10 -07:00
Mark Otto 0b0d7f104c fixes #4396: pull right dropdown menus no longer overlaid by submenus 2012-08-14 14:32:03 -07:00
Mark Otto 2a6deb92b1 fixes #4395: scope dropdown menu caret in navbar to first level dropdown only 2012-08-14 14:29:31 -07:00
Mark Otto 75e5279e01 Merge pull request #4393 from Nivl/2.1.0-wip
Fix .thumbnail line-height
2012-08-14 14:25:31 -07:00
Melvin f6ac297903 Fix .thumbnail line-height 2012-08-14 21:06:35 +03:00
Mark Otto e9b04acb92 Merge pull request #4384 from andriijas/2.1.0-wip-js-typo-fix
now with 13 custom jquery plugins
2012-08-14 09:54:04 -07:00
Mark Otto 57ea6fea76 Merge pull request #4376 from kylase/2.1.0-wip
Changed placeholders values
2012-08-14 09:30:27 -07:00
Andreas Cederström 2df0a0fdeb now with 13 custom jquery plugins 2012-08-14 13:58:12 +02:00
Mark Otto 4bf93a2d76 fixes #4265: restore chromium select fix 2012-08-13 23:03:35 -07:00
Mark Otto 97a23ef2e6 fixes #4342: navbar vars not in use, render navbar dividers 2012-08-13 22:57:40 -07:00
kylase d684607976 Amend placeholders values 2012-08-14 13:51:50 +08:00
Mark Otto 0040a78058 merge 2012-08-13 21:35:31 -07:00
Mark Otto 41f4c60a91 fixes #4373: broken examples link on homepage 2012-08-13 21:34:40 -07:00
Mark Otto cf33664b0c Merge pull request #4372 from hho/patch-2
Fixed a typo in inverse navbar code sample
2012-08-13 21:32:24 -07:00
kylase d96047f45f Changed placeholders value of @baseFontSize and @baseLineHeight to the values specified in variables.less 2012-08-14 11:57:13 +08:00
Henning Hoefer a74457a203 Fixed a typo in inverse navbar code sample 2012-08-14 02:10:07 +02:00
Mark Otto cf4fd1abbe Merge pull request #4367 from benjaminoakes/2.1.0-wip
Fix wording of "Button dropdowns" docs
2012-08-13 16:13:01 -07:00
Ben Oakes e31f06b857 Fix wording (presumed typo) 2012-08-13 13:22:08 -05:00
Mark Otto 9f8ce77751 running make on previous changes 2012-08-13 10:05:19 -07:00
Mark Otto 5df1e2c00a hotfix: github buttons urls 2012-08-09 14:00:24 -07:00
Mark Otto e06c257e6b fix gh buttons 2012-08-09 11:25:34 -07:00
Mark Otto f6c7ac51f2 add some simple styles for showing white icons on hover where appropriate 2012-08-08 11:26:22 -07:00
Mark Otto 08e4475f00 reorg vars fields on customize page to ensure they are all in three columns for time being 2012-08-07 23:11:23 -07:00
Mark Otto 3c89f7bb5f fix chevron on js docs and run make after table changes 2012-08-07 23:07:53 -07:00
Mark Otto 85f1f2257b make twitter bird white in illustration on homepage to abide by brand guidelines 2012-08-07 23:05:39 -07:00
Mark Otto 03eee23952 speed up animation and brightness on docs download 2012-08-07 23:02:01 -07:00
Mark Otto 4eee78e051 fixes #4304: more specific selectors on table border classes to override .table-striped 2012-08-07 22:50:49 -07:00
Mark Otto a525a6fe33 Merge pull request #4300 from rilian/2.1.0-wip
optimizing images on 2.1.0-wip branch; saving couple of KBs from package
2012-08-07 22:45:53 -07:00
Mark Otto 8ed77c41f0 fixes #4295: add vars for pagination 2012-08-07 22:37:38 -07:00
Mark Otto 0cb3ba6b23 run make after merging #4289 2012-08-07 22:34:39 -07:00
Mark Otto aeed751a7f Merge pull request #4289 from coliff/patch-4
Update docs/templates/pages/javascript.mustache
2012-08-07 22:34:09 -07:00
rilian 80a645b52a optimizing images on 2.1.0-wip branch; saving couple of KBs from package 2012-08-06 13:23:12 +03:00
Mark Otto 3823d29c04 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-08-05 00:15:21 -07:00
Mark Otto f61dd7239b fixes #4277: typo 2012-08-05 00:15:09 -07:00
Christian 25c6175311 Update docs/templates/pages/javascript.mustache
Amended all mentions of 'Javascript' and 'javascript' in the body text to the correct 'JavaScript'.
2012-08-05 12:39:17 +09:00
Florian Pfitzer fa38ab573b Fixes vertical-three-colors in Firefox 2012-08-03 16:56:59 +02:00
Jacob Thornton 88deb08ff2 Merge branch '2.1.0-wip' of http://github.com/twitter/bootstrap into 2.1.0-wip 2012-08-02 16:58:51 -07:00
Jacob Thornton 2b2b3303e1 fix indexof on array for ie8 2012-08-02 16:58:25 -07:00
Mark Otto 33c6ab9b20 decrease docs nav padding 2012-08-01 23:21:06 -07:00
Mark Otto d27dcf3b07 cut down on selectors on .formFieldState() mixin to origin input catchall 2012-08-01 23:16:49 -07:00
Mark Otto 1482030679 fixes #4207: redeclare box-shadow on .formFieldState() mixin so transitions work in WebKit 2012-08-01 23:15:51 -07:00
Mark Otto 1e2edaef48 add test for #4236: button group, one button with text and one with icon, now line up properly 2012-08-01 22:52:53 -07:00
Mark Otto fc7ecd78c8 add select element responsive CSS test 2012-08-01 20:58:33 -07:00
Mark Otto 4a84145c43 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-08-01 20:34:29 -07:00
Mark Otto 86a577d76b decrease box-shadow 2012-08-01 20:34:19 -07:00
Jacob Thornton 48546c2735 aria-labelledby="myModalLabel" aria-hidden="true" 2012-08-01 20:26:44 -07:00
♒∆✝ 7ec1778103 Merge pull request #4257 from ginader/modal-accessibility
close #3531 added focus handling and removed the badly announced "times"...
2012-08-01 20:23:50 -07:00
Dirk Ginader 6977d35eed close #3531 added focus handling and removed the badly announced "times" close button from screenreaders 2012-08-01 20:11:16 -07:00
Mark Otto 225d0e0af3 label new css test 2012-08-01 19:36:28 -07:00
Mark Otto 1bb7c0e669 fixes #4254: make .span12 expand full width of a parent when responsive 2012-08-01 19:33:37 -07:00
Mark Otto 3c742fc08b add test for textarea at .span12, really fix docs footer 2012-08-01 19:25:50 -07:00
Mark Otto 72323051c3 increase padding on navbar responsive nav links, fix footer margins 2012-08-01 19:18:42 -07:00
Mark Otto c2e899f2a0 remove the canvas slider doodad 2012-08-01 19:00:25 -07:00
Mark Otto fe93b926b4 add popover and tooltip components 2012-08-01 18:08:31 -07:00
Mark Otto fbc053692d add components section to docs for isolated examples 2012-08-01 18:06:02 -07:00
Mark Otto b979cd9e67 darken default button borders 2012-08-01 17:01:29 -07:00
Mark Otto 7aaf141371 add compability note to image styles 2012-08-01 16:57:27 -07:00
Mark Otto e8fd7e6c96 fix jank button on docs homepage 2012-08-01 16:15:21 -07:00
Mark Otto 735001cb26 increase horizontal padding on inputs given new font-size 2012-08-01 11:53:00 -07:00
Mark Otto 5637c6fb70 pulsing download button on homepage 2012-08-01 11:52:48 -07:00
Mark Otto fab1a80dcb increase margin on checkboxes and radios to center properly 2012-08-01 11:35:31 -07:00
Mark Otto 060e216712 fixes #4253: hover on responsive navbar 2012-08-01 09:18:00 -07:00
♒∆✝ 6905dbe98d Merge pull request #4241 from shama/issue-guidelines
Use ref instead of label when checking branches in issue-guidelines
2012-08-01 00:52:52 -07:00
Kyle Robinson Young 1f70dd71c8 Use ref instead of label when checking branches in issue-guidelines 2012-07-31 15:16:40 -07:00
Mark Otto 31b30ab88e copy edits to docs 2012-07-31 00:06:37 -07:00
Mark Otto e191964ff8 reorder docs css 2012-07-31 00:01:04 -07:00
Mark Otto 9795e9bbe6 place chevrons first in sidenav in docs, fix ie7 bugs for said sidenav 2012-07-30 23:48:26 -07:00
Mark Otto 196fb1d86a fixes #3615: remove last-child hack for IE7 since IE7 doesn't support :last-child 2012-07-30 22:26:54 -07:00
Mark Otto 59eba9afbc remove position from labels/badges in mini btns 2012-07-30 15:54:03 -07:00
Mark Otto 0e62011da0 fix download page links 2012-07-30 15:52:38 -07:00
Mark Otto 364dbb7931 fixes #3665: ensure inputs in a fluid row maintain grid sizing 2012-07-30 15:38:36 -07:00
Mark Otto be8d5243f4 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-07-30 13:25:49 -07:00
Mark Otto a9bf1e6e35 fixes #3900: nudge badges in buttons up 1px 2012-07-30 13:25:27 -07:00
Mark Otto 1f30faac73 Merge pull request #4229 from conzett/master
Add 'dist' directory to .gitignore
2012-07-30 13:08:29 -07:00
Mark Otto b2ebd5c46c update button styles to use updated 14px base font size, align carets to others with no opacity changes 2012-07-30 12:52:44 -07:00
Mark Otto 2b31caae2d fix navbar form alignment, and update examples to show these cases 2012-07-30 12:15:08 -07:00
Mark Otto 7fa99fb1fe fix navbar form alignment, and update examples to show these cases 2012-07-30 12:15:08 -07:00
Graham Conzett 178397ae5e Add 'dist' directory to .gitignore
Allows you to keep a 'dist' directory in the repository as a target build location.
This can be useful if you have bootstrap as a submodule in a project and want to build it,
but still keep it self-contained. Similar to how jQuery does their default builds:
https://github.com/jquery/jquery/#how-to-build-your-own-jquery
2012-07-30 14:10:01 -04:00
Mark Otto 6bf661aceb new fav and touch icons to match new masthead 2012-07-30 10:33:48 -07:00
Mark Otto 04164e4367 fixes #3858: add var for responsive navbar. also add additional examples to navbar docs 2012-07-30 10:25:04 -07:00
Mark Otto 47d66e0a3f fix examples collapse classes, rename navbar-redux to navbar and delete the old one 2012-07-30 10:08:27 -07:00
Mark Otto b63543181a fix examples collapse classes, rename navbar-redux to navbar and delete the old one 2012-07-30 10:08:27 -07:00
Mark Otto cfac4bb59d fixes #4221: correct border-collapse property for IE7 hack 2012-07-29 23:51:40 -07:00
Mark Otto 84a9c74efd fix footer in responsive 2012-07-29 23:51:18 -07:00
Mark Otto 22a9a83656 fixes #3694: provide override classes for .hide and .pull-right for grid columns 2012-07-29 16:51:24 -07:00
Mark Otto d63ebe3f3c more breadcrumb tweaks for contrast 2012-07-29 16:37:37 -07:00
Mark Otto 87ce3489d3 remove gradient, border, and box-shadow from .breadcrumb to differentiate from nav and buttons 2012-07-29 16:25:20 -07:00
Mark Otto 761429d88a Merge branch '2.1.0-wip-navbar' into 2.1.0-wip 2012-07-29 16:24:05 -07:00
Mark Otto 134d11b528 use shorthand on form field transitions for box-shadow mixin 2012-07-29 12:10:29 -07:00
Mark Otto b3b04ec3ff fixes #4210: indenting on hero example 2012-07-29 12:07:18 -07:00
Mark Otto e56a700849 fixes #4210: indenting on hero example 2012-07-29 12:07:18 -07:00
Mark Otto 5184da39f4 clear out docs assets, update and png crush features image 2012-07-29 00:44:55 -07:00
Mark Otto a30045daef reverse navbar styles to save code 2012-07-29 00:30:15 -07:00
Mark Otto fe6a4b0b54 add .btn-block for a full-width button option 2012-07-27 15:42:58 -07:00
Mark Otto 16b4ac0d8f add docs for sub menu support on dropdowns, add caret via :after to submenu toggles 2012-07-27 10:35:15 -07:00
Mark Otto 9d5c431223 add basic support for sub menus in dropdown menus 2012-07-27 10:06:54 -07:00
Mark Otto 1e9b450619 add image styles, for now to scaffolding (soon to own file) 2012-07-27 00:06:43 -07:00
Mark Otto 6474190746 increase height of homepage jumbotron, update vars and styles of popovers 2012-07-26 23:42:36 -07:00
Mark Otto 79067721b1 fix js docs formatting 2012-07-26 23:21:06 -07:00
Mark Otto 4bb2a13776 rerun make 2012-07-26 21:45:30 -07:00
Mark Otto f75277e62d indenting and such 2012-07-26 21:45:19 -07:00
Mark Otto 880bdbc4dd simplify styles for bs docs nav 2012-07-24 16:07:25 -07:00
Jacob Thornton c10a357bb3 don't bite so hard 2012-07-24 12:57:00 -07:00
Mark Otto fa6a131eb6 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-07-24 01:53:45 -07:00
Mark Otto b7b4fd5c82 wrap footer in bs docs canvas for scrolling doodad 2012-07-24 01:53:32 -07:00
Mark Otto 7590e65f6f fix search form, mostly in navbar 2012-07-24 01:44:12 -07:00
Jacob Thornton e2fc202df2 Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 2012-07-24 00:49:19 -07:00
Jacob Thornton c98b75c979 added fade out on scroll - we can pull this if you prefer it 2012-07-24 00:48:45 -07:00
Mark Otto 394922a1bf Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-07-24 00:44:20 -07:00
Mark Otto 87aa61001e fixes #4118: responsive modal gets width auto and improved positioning for narrower widths 2012-07-24 00:44:11 -07:00
Mark Otto c37aa99e28 modal heading line-height 2012-07-24 00:37:19 -07:00
Mark Otto 4912dd441d fix h3 in modal and make modal unhidden by removing important from earlier issue 2012-07-24 00:35:54 -07:00
Jacob Thornton e38fa4b1f4 fix scroll thinggg 2012-07-24 00:30:58 -07:00
Jacob Thornton 5b2f2ed821 Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
Conflicts:
	docs/assets/css/docs.css
	docs/javascript.html
	docs/templates/pages/javascript.mustache
2012-07-24 00:24:25 -07:00
Jacob Thornton 4ea7c47235 slightly fix side bar 2012-07-24 00:21:40 -07:00
Mark Otto 7ce048bccd Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-07-23 23:57:13 -07:00
Mark Otto cd441e082f fixes #4156: don't override border radius if stacked nav has one child 2012-07-23 23:56:13 -07:00
Mark Otto 6245886b26 tweak docs shadows 2012-07-23 23:54:26 -07:00
♒∆✝ 802ced9ca5 Merge pull request #4166 from jonathansampson/2.1.0-wip
IE10 uses 'transition' and 'transitionend'
2012-07-23 23:15:46 -07:00
Mark Otto f085dbadd1 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
Conflicts:
	docs/assets/css/docs.css
	docs/base-css.html
	docs/components.html
	docs/customize.html
	docs/getting-started.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/customize.mustache
	docs/templates/pages/getting-started.mustache
	docs/templates/pages/javascript.mustache
	docs/templates/pages/scaffolding.mustache
2012-07-23 23:01:38 -07:00
Jonathan Sampson 2a0cf0f131 IE10 uses 'transition' and 'transitionend'
msTransition, while supported in IE, should be ignored in favor of the
unprefixed property. Additionally, MSTransitionEnd should also be
ignored in favor of the unprefixed event transitionend.

Current unit test requires no attention in light of this change.

MSDN:
http://msdn.microsoft.com/en-us/library/ie/hh673535(v=vs.85).aspx#transitions_dom_events
2012-07-24 01:50:38 -04:00
Mark Otto 0dda2c4659 make docs scroll over jumbotrons, but only for 980px up 2012-07-23 22:36:08 -07:00
Jacob Thornton 614d52bd7f delete this test for now - as affix is still heavily underdevelopment 2012-07-23 18:17:43 -07:00
Jacob Thornton 5247b15411 following #4148 2012-07-23 18:12:23 -07:00
♒∆✝ 685785d2c2 Merge pull request #4159 from ixti/opera11-transitions-fix
Fix transition end name for opera 11+12
2012-07-23 17:58:38 -07:00
Mark Otto 5b8838aeac more alignment fixes for customize page 2012-07-23 12:51:48 -07:00
Mark Otto b05fc00d59 fixes #4148, readme typo 2012-07-23 12:51:36 -07:00
Aleksey V Zapparov 76cfe17002 Fix transition end name for opera 11+12
Fix transition end name for Opera 11 and Opera 12.
Should fix issues: #3896, #3897, #4157, #4158
2012-07-23 20:56:18 +02:00
Jacob Thornton e25bcb93fc Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 2012-07-22 18:29:01 -07:00
Jacob Thornton dcf75697ec some progress on affix plugin 2012-07-22 18:28:39 -07:00
♒∆✝ cf70fb629f Merge pull request #3842 from alienlebarge/2.1.0-wip
<img /> tag with `height` attr are not responsive
2012-07-22 14:59:08 -07:00
Jacob Thornton fa1e1e34df Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 2012-07-22 14:52:13 -07:00
Jacob Thornton fae6c36874 adds minLength #3960 2012-07-22 14:50:52 -07:00
♒∆✝ 48fc0ad569 Merge pull request #4104 from lookfirst/2.1.0-wip-fix-destroy
namespace the events for popover/tooltip
2012-07-22 14:40:09 -07:00
Jon Stevens d76c899142 remove the ns option 2012-07-22 14:36:23 -07:00
Mark Otto e9f374f041 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-07-22 14:31:58 -07:00
Mark Otto 5b8ff7061b fixes #4136: use @dropdownBorder var, but keep IE7-8 fallback 2012-07-22 14:31:39 -07:00
Jon Stevens 393f4a7b42 simplify things to one line. pull #4104 2012-07-22 14:19:11 -07:00
Jacob Thornton 8281a9023a *face palm* 2012-07-22 13:21:44 -07:00
Jacob Thornton 77dea2c5eb change haunt to write 2012-07-22 13:00:17 -07:00
Jacob Thornton 6c2fa9430c add haunt w/ issue guideline spec 2012-07-22 12:57:39 -07:00
Mark Otto b9105b98f9 move from downloads.html to customize.html to better match purpose of page, fix up customize page layout to match other docs, link style refinement to jumbotrons 2012-07-20 22:06:47 -07:00
Mark Otto ee750bbce1 tweak docs masthead links hover 2012-07-20 21:38:28 -07:00
Jon Stevens 117f65d431 on destroy, also hide. issue #3880, pull #4104 2012-07-20 09:47:12 -07:00
Mark Otto 1d4660beea nuke commented out code from last fix 2012-07-19 21:25:42 -07:00
Mark Otto 3c1a0fbda4 fixes #4103: simpler fix for tfoot in .table-border 2012-07-19 21:25:24 -07:00
Mark Otto 89d7ec5290 fixes #4102: properly round top left corners of .table-border with caption/colgroup; also fix css tests page layout and footer 2012-07-19 21:06:42 -07:00
Mark Otto 6c23fff4d6 misc docs content changes 2012-07-18 01:06:52 -07:00
Mark Otto c8fa2600f2 copy change 2012-07-17 23:38:29 -07:00
Mark Otto aac3736eea fixes #3845: add .btn-link for transparent buttons styled as links 2012-07-17 23:32:52 -07:00
Mark Otto cb1a59caa0 Merge branch '2.1.0-wip' of https://github.com/gcoop/bootstrap into gcoop-2.1.0-wip
Conflicts:
	docs/base-css.html
	docs/templates/pages/base-css.mustache
2012-07-17 23:14:58 -07:00
Mark Otto ba90d0fc5e Merge pull request #4110 from purwandi/develop
Moved JS to bottom on extends page
2012-07-17 22:44:26 -07:00
Mark Otto 326b665065 de-scope nav-header from .nav 2012-07-17 22:40:38 -07:00
Purwandi a8316c780d Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into develop 2012-07-18 12:33:16 +07:00
Mark Otto 39f8996d6a fix dropdown vars and make hover state be link color again, add gradient to dropdown link hovers, fix caret positions and active states on nav tabs, tweak nav link padding 2012-07-17 22:26:53 -07:00
Purwandi 51c9fa1697 Moved JS to bottom on extends page 2012-07-18 12:19:02 +07:00
Mark Otto 6a663081a7 remove separate examples page, add to getting started page 2012-07-17 21:45:57 -07:00
Mark Otto a1ad6d124a Merge branch '2.1.0-wip' of https://github.com/benjaminoakes/bootstrap into benjaminoakes-2.1.0-wip
Conflicts:
	docs/extend.html
	docs/templates/pages/extend.mustache
2012-07-17 20:57:20 -07:00
Mark Otto 62f6368344 center masthead bg pattern 2012-07-17 20:22:55 -07:00
Mark Otto 25bc298aff pngcrush masthead pattern to save 10k 2012-07-17 19:55:02 -07:00
Mark Otto 4008d666a5 new pattern for masthead 2012-07-17 19:54:29 -07:00
Mark Otto 16fa610ea4 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-07-17 19:11:51 -07:00
Mark Otto 478396fd4e remove list-type declarations from ul and ol elements since those should just use browser defaults 2012-07-17 19:11:41 -07:00
Jon Stevens 2ee9b2717b namespace the events for popover/tooltip so that they can be cleanly removed. issue #3880 2012-07-16 16:01:11 -07:00
Ben Oakes 426e7d9fbd Compiled; ignoring bootstrap.css change to avoid conflicts 2012-07-16 09:31:18 -04:00
Ben Oakes 9581cbfe32 Two of the three apps are for Linux/Windows; adjust accordingly 2012-07-16 09:29:49 -04:00
Mark Otto 40ab928315 Merge pull request #4083 from martinbean/2.1.0-wip
Moved JS to bottom as per best practices
2012-07-15 16:26:42 -07:00
Mark Otto e20d2dfe9d docs cleanup and blockquote cleanup for .pull-right option 2012-07-15 16:13:25 -07:00
Mark Otto 750badabf7 copy edits and tweaks to utility classes to ensure they always are specific enough 2012-07-13 14:43:51 -07:00
Martin Bean 74b167b86d Moved JS to bottom as per best practices 2012-07-13 22:25:47 +01:00
Mark Otto 463de252a9 update static assets section of extend page, copy changes elsewhere 2012-07-13 14:20:25 -07:00
Mark Otto 6e622ee763 more content edits to Extend 2012-07-13 11:18:35 -07:00
Mark Otto 93b1519017 content edits to Extend page 2012-07-13 11:17:22 -07:00
Mark Otto 5cb116beb8 cleanup subnav example 2012-07-13 10:58:20 -07:00
Mark Otto 2d4f5eb5a4 fix indenting on getting started page 2012-07-13 00:56:18 -07:00
Mark Otto fae691c3d9 some analytics tracking on getting started 2012-07-12 21:41:51 -07:00
Mark Otto f22b06097a add download links to getting started 2012-07-12 21:41:07 -07:00
Mark Otto f36060dab5 remove getting started link from home, add to navbar, overhaul getting started docs 2012-07-12 21:40:25 -07:00
Mark Otto 9343e1e933 remove getting started link from home, add to navbar, overhaul getting started docs 2012-07-12 21:38:18 -07:00
Mark Otto a12f0e551f overhaul docs on sub pages, clean up css and copy 2012-07-12 18:11:49 -07:00
Mark Otto 549d61fc28 updated footer 2012-07-12 17:02:55 -07:00
Mark Otto 7d324ee35b Merge branch 'respclasses' of https://github.com/digitaldisseny/bootstrap into digitaldisseny-respclasses 2012-07-12 16:24:37 -07:00
Mark Otto 3c775f2432 add chevrons to other docs navs 2012-07-12 16:23:21 -07:00
Mark Otto 280dfda6ed docs css cleanup for spacing and stuff 2012-07-12 16:16:06 -07:00
Mark Otto c884d6eaa6 clean up docs for subnav 2012-07-12 13:50:27 -07:00
Mark Otto 338c7ef2b6 tweak code snippet on pager and clean up type and font-sizes on docs Home 2012-07-12 13:45:07 -07:00
Mark Otto 5b5352c92d fix grid alignment on scaffolding 2012-07-11 11:15:04 -07:00
Roberto - phproberto f0ed383e51 Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into respclasses 2012-07-11 01:31:44 +02:00
Mark Otto 713105774f fixes #3706: add textColor and textShadow as options to .buttonBackground mixin 2012-07-10 00:45:44 -07:00
Mark Otto a750551fee add vars for tooltip customization via background and color 2012-07-10 00:36:21 -07:00
Mark Otto 5d8e78e0fa fixes #3605: add support for input-prepend/-append to .form-search 2012-07-10 00:32:30 -07:00
Roberto - phproberto 83846ba0d6 Fixes #4002 responsive utilities classes 2012-07-10 08:12:16 +02:00
Mark Otto 75d952ffd8 fix indenting and remove hidden subnav on Components 2012-07-09 22:40:58 -07:00
Mark Otto 0ca210395c fix indenting and remove hidden subnav on Scaffolding 2012-07-09 22:36:12 -07:00
Mark Otto 3ea309568f fix indenting and remove hidden subnav on Base CSS docs 2012-07-09 22:34:33 -07:00
Mark Otto c74dddd02e fix indenting on extend and js docs pages, remove hidden subnavs 2012-07-09 22:29:53 -07:00
Mark Otto 6f8226a393 update Extend docs page to include side nav and spec out next section for extending with static assets 2012-07-09 22:25:00 -07:00
Mark Otto 64e87a85f5 remove popoverarrows mixin, relegate code to tooltips and popvers since we only used them once each; this fixes the problem of broken tooltips in 2.1 2012-07-09 22:14:30 -07:00
Mark Otto f4877c2369 fix up docs popover examples and copy 2012-07-09 21:13:33 -07:00
Mark Otto 148e5a3d89 fixes #3291: remove float on responsive .thumbnails for 767px and down to ensure thumbnail images don't pop out of container in FF 2012-07-09 21:07:49 -07:00
Mark Otto f495a8d0cc fixes #3210: add .btn to .navbar-form to remove bottom margin, improve vertical align of contents of .navbar-form 2012-07-09 21:01:29 -07:00
Mark Otto 413c05a09d fixes #3381: update docs to show correct media query range on responsive utilities 2012-07-09 20:55:11 -07:00
Mark Otto 93be608bf0 fixes #3384: add support for multiple inputs per line when using grid sizing 2012-07-09 20:49:17 -07:00
Mark Otto dbea3e2784 update comments after merging gradient change 2012-07-09 00:53:56 -07:00
Mark Otto 646c87c151 Merge pull request #3937 from codler/patch-4
Update linear-gradient standard
2012-07-09 00:53:18 -07:00
Mark Otto 7800fee7e0 fixes #3973: same border on disabled inputs as default inputs: 2012-07-09 00:51:38 -07:00
Mark Otto 07f80e6fd8 fixes #4027: same margins on .pager and .pagination 2012-07-09 00:42:38 -07:00
Mark Otto 50a945e084 Merge branch '2.1.0-wip' of https://github.com/nextgenthemes/bootstrap into nextgenthemes-2.1.0-wip
Conflicts:
	less/buttons.less
2012-07-09 00:39:56 -07:00
Mark Otto 25d0b341a9 wasn't feeling the new buttons, downsizing again until we get a better balance 2012-07-09 00:31:54 -07:00
Mark Otto 9887d3cf4a updating docs examples to remove 13/18 resets, fix up buttons alignments and carets 2012-07-09 00:26:32 -07:00
Mark Otto 410decafad indenting 2012-07-09 00:17:52 -07:00
Mark Otto 16cf6b30cd docs changes for icons 2012-07-09 00:17:36 -07:00
Mark Otto 8b696ad0b5 fix text in docs about default font-size and line-height 2012-07-09 00:14:35 -07:00
Mark Otto db9925510b fix up carousel alignment and line-height 2012-07-08 21:47:16 -07:00
Mark Otto 20676ddd4d adding getting started page based on Bootstrap University from awhile back, testing out side nav on docs instead of subnav bar 2012-07-08 01:47:36 -07:00
Mark Otto 5f861ef517 fix up docs to use default container, fix responsive home changes 2012-07-07 23:16:07 -07:00
nextgenthemes 7d1c8c2a0c Wrapped btn:hover, btn.disabled inside .btn 2012-07-07 23:20:50 +03:00
Mark Otto 3f2f96b0d7 reoder forms a bit 2012-07-07 12:52:05 -07:00
Mark Otto e2b777d9a3 docs pre font-size and nowrap on prepend/append 2012-07-07 12:34:47 -07:00
Mark Otto 7cc916d137 Merge branch '21jumpst' into 2.1.0-wip 2012-07-07 00:48:15 -07:00
Mark Otto c7f6499235 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-07-07 00:30:55 -07:00
Mark Otto e2336ef02a remove specific values for the fluid grid system and instead use LESS's percentage() function 2012-07-07 00:30:43 -07:00
Mark Otto 6d447079a4 update buttons in docs to include type 2012-07-06 15:18:56 -07:00
Mark Otto 7ff1b074ea Merge pull request #3986 from desandro/full-height-progress-bar
Full height progress bar
2012-07-06 13:44:09 -07:00
Mark Otto dc6eaafb00 vertically align inline form content 2012-07-06 10:59:46 -07:00
Mark Otto 19ea4668e5 prevent small tags from increasing height of headings 2012-07-06 10:35:08 -07:00
Mark Otto 3d770ab7bd Merge branch 'philfreo-patch-1' into 2.1.0-wip 2012-07-06 10:22:53 -07:00
Mark Otto 095e052606 adding homepage social buttons 2012-07-06 10:10:56 -07:00
Mark Otto cd6915cdb4 tests cleanup on type, homepage content tweaks 2012-07-05 19:45:32 -07:00
Mark Otto 68146db004 buttons and pre updates for font-size 2012-07-05 15:15:57 -07:00
Mark Otto 3c07eaa251 updates to type scale 2012-07-05 15:11:54 -07:00
Mark Otto c6ee96c025 fix up subnav styles, add subnav search form styles, add some basic docs for subnav 2012-07-05 10:37:23 -07:00
Mark Otto a645664e50 update thumbnails to fix display issues and refine aesthetics 2012-07-05 10:12:15 -07:00
Mark Otto 62c386259b rewrite docs homepage, new graphics 2012-07-04 23:31:30 -07:00
Gavin Cooper (work) b4125748b0 added ability to give rows in tables status classes .success .error and .info. 2012-07-04 12:22:34 +01:00
Phil Freo 4d6434a2c7 Adding 'connect' npm requirement as it is required to run make test (in order for it to run node js/tests/server.js) 2012-07-03 23:34:11 -07:00
Dave DeSandro 26dad5f56d .progress .bar { height: 100% } 2012-07-02 17:21:26 -04:00
Mark Otto 3ad52ca632 fast responsive tweaks 2012-07-01 22:49:01 -07:00
Mark Otto 70e81e6f55 new jumbotron 2012-07-01 08:42:09 -07:00
Mark Otto fb29075926 Merge pull request #3976 from benvinegar/master
Fix Opera .clearfix bug when using contenteditable
2012-06-30 22:05:03 -07:00
Mark Otto cd2d82150c standardize top level file comments 2012-06-28 21:46:45 -07:00
Mark Otto 98ebd54800 address issues with fixed subnav like borders, corners, etc 2012-06-28 21:20:40 -07:00
Mark Otto 6f4360c47b cleanup docs css more 2012-06-28 21:06:54 -07:00
Mark Otto c31a4e5131 remove responsive subnav from docs and place in navbar-responsive.less 2012-06-28 20:59:16 -07:00
Mark Otto c09e8473e2 use variablef or wells background-color, update docs for glyphicons license mention, update popovers to remove that thick border and make them look mo betta 2012-06-28 10:03:46 -07:00
Mark Otto a683497dbc renamed less.html to extend.html, removing all the vars and mixins 2012-06-27 23:56:00 -07:00
Han Lin Yap 2e3306d5dd Update linear-gradient standard 2012-06-26 12:30:43 +03:00
Mark Otto b77ed4a3a3 fix dropdowns in button groups after font-size hack 2012-06-25 20:57:04 -07:00
Mark Otto 244a9ab79d reverse the gradient on striped progress bars so it matches the active state when animated 2012-06-25 20:20:32 -07:00
Ben Vinegar 3761d50c5a Fix Opera .clearfix bug when using contenteditable 2012-06-25 17:35:42 -07:00
Mark Otto a85499749a Merge pull request #3856 from Calvein/patch-1
Remove useless ms prefixes
2012-06-25 17:10:02 -07:00
Mark Otto e7e183e55d Merge branch 'tekezo-patch-1' into 2.1.0-wip 2012-06-25 16:49:13 -07:00
Mark Otto d65e815a48 use @textColor to change help-block/help-inline font color 2012-06-25 16:47:29 -07:00
Mark Otto 94a3d4eb14 reorder media queries 2012-06-25 16:25:50 -07:00
Mark Otto 8c2db7d7d6 prevent button group buttons from wrapping in tight spaces by removing floats and replacing with font-size: 0; inline-block hack 2012-06-25 15:47:07 -07:00
Mark Otto 78849cf52e remove jank fix for dt bold text 2012-06-25 15:09:39 -07:00
Mark Otto cd466f1d0b add tests for table grid sizing, solve bugs in fluid table grid sizing 2012-06-25 14:37:35 -07:00
Mark Otto 27845e4492 #3223: make table row hover optional class 2012-06-25 14:11:37 -07:00
Mark Otto 508a93d9e3 make fixing of subnav work again 2012-06-24 21:07:20 -07:00
Mark Otto 6662f62236 remove subnav file, instead add an optional class for .navbar 2012-06-24 21:03:39 -07:00
Mark Otto 87af5d3bbe more subnav optimizations 2012-06-24 20:42:31 -07:00
Mark Otto 71669dda63 tons of docs cleanup in css, adding subnav to official components 2012-06-24 20:26:48 -07:00
Takayama Fumihiko e80f37b600 ".linenums .tag" should be ".prettyprint .tag". 2012-06-24 15:26:39 +09:00
Mark Otto 160fe7ca59 create vars for responsive grid values, fixed and fluid, and document them in the customizer 2012-06-20 23:46:51 -07:00
Mark Otto 59153205b3 run make on js files 2012-06-20 23:46:29 -07:00
Mark Otto 3875a9f31b Merge branch 'marcusds-2.1.0-wip' into 2.1.0-wip 2012-06-20 20:26:59 -07:00
Mark Otto b353565d4e add docs for fluid offsetting 2012-06-20 20:26:50 -07:00
Mark Otto f2dadecbf3 Merge branch '2.1.0-wip' of https://github.com/marcusds/bootstrap into marcusds-2.1.0-wip 2012-06-20 20:22:22 -07:00
Mark Otto 7301931a6d Merge branch '2.1.0-wip' of https://github.com/marcusds/bootstrap into 2.1.0-wip 2012-06-20 20:20:22 -07:00
Mark Otto f5a2d82a3a Merge branch 'EngineerGio-patch-1' into 2.1.0-wip 2012-06-20 19:36:16 -07:00
Mark Otto 83e46b8df9 reorder for t-r-b-l 2012-06-20 19:36:06 -07:00
EngineerGio 5bd9217f9b Added border-radius mixins to set single corner radius and single side border radius 2012-06-21 01:50:28 +03:00
Jacob Thornton 1e717991e8 Merge pull request #3880 from lookfirst/popover-destroy
Add popover / tooltip destroy method
2012-06-20 12:02:05 -07:00
Jacob Thornton eb62c977cd Merge pull request #3770 from Barryvdh/2.1.0-wip
Scope carousel .active to .item
2012-06-20 10:58:20 -07:00
Jon Stevens 3a5b4cc7df simplify code into a single line 2012-06-20 10:42:25 -07:00
Jacob Thornton b2b000b750 change transition end name for opera 2012-06-20 10:40:56 -07:00
Mark Otto 089f42a07f fix html typos 2012-06-20 00:06:05 -07:00
Mark Otto d704d6f0ed #3861: add span to pagination selectors for full support of non-link pagination items 2012-06-19 23:37:47 -07:00
Mark Otto ce140662a0 remove unused container reset 2012-06-19 20:01:03 -07:00
Mark Otto 9df832b4bb add separate vars for dropdown link hover and active states 2012-06-19 19:17:42 -07:00
Mark Otto 40298ddbf1 add note to components about nav list nesting 2012-06-19 15:25:35 -07:00
Mark Otto ff92344f0d remove icons example of nav list--doesn't really add anything useful 2012-06-19 14:46:14 -07:00
Mark Otto b54264cde0 add basic vertical button group support 2012-06-19 14:42:46 -07:00
Mark Otto 64ba423b6d #2764: add disabled styles to navs and dropdowns 2012-06-19 13:52:07 -07:00
Mark Otto d14f06fc4e round select list corners 2012-06-19 13:25:35 -07:00
Mark Otto 143b6ae2de fix less docs typos 2012-06-19 13:23:30 -07:00
Mark Otto 9aa5a6db12 updated tests and homepage marketing copy 2012-06-19 13:21:35 -07:00
Jon Stevens af88f54e5d small typo fix to docs 2012-06-18 19:56:52 -07:00
Jon Stevens 47e0647086 add unit tests for destroy behavior of popover and tooltip 2012-06-18 19:51:49 -07:00
Jon Stevens 6a974f9ff7 enable the ability to destroy tooltips and popovers from elements. related to issue #3453 2012-06-18 19:25:54 -07:00
Mark Otto bae3cfd183 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-06-17 12:40:43 -07:00
Mark Otto 3add79c071 #3864: use @baseLineHeight in alerts.less 2012-06-17 12:40:36 -07:00
Mark Otto 36e78bd7ac Merge pull request #3863 from rosslaird/spelling
Corrected spelling error
2012-06-17 12:34:29 -07:00
Ross Laird 626b45d691 Corrected spelling error 2012-06-15 13:07:44 -07:00
François Robichet fb31cdba9c Remove useless ms prefixes 2012-06-15 15:23:40 +03:00
Mark Otto b1cb556503 improve inline-block of append/prepend inputs with font-size: 0; 2012-06-14 11:56:46 -07:00
alienlebarge 7b726f974f fix responsive height of image 2012-06-14 14:53:04 +02:00
Mark Otto cda48d41ba fix #gradientBar to .gradientBar in LESS docs 2012-06-13 22:04:02 -07:00
Mark Otto 3ead14a1e0 clarify support of select items (which is none) for input-prepend/append 2012-06-13 22:00:10 -07:00
Mark Otto 2cbff258b9 fix examples page 2012-06-11 22:33:16 -07:00
Mark Otto 1db72f8d77 Merge pull request #3810 from purwandi/develop
Add space between attrs in docs on navbar button
2012-06-11 22:31:58 -07:00
Mark Otto 2e6d4e9439 more rearrangement and removal of about sections in js docs 2012-06-11 22:28:10 -07:00
Mark Otto bf875d9e36 cleanup options display in all sections, rearrange typeahead section 2012-06-11 22:19:25 -07:00
Purwandi c7ffe6edc8 Add space on navbar button 2012-06-12 12:17:10 +07:00
Mark Otto f453909f39 add a dropdowns section to Components (still needs work) and reformat much of the js docs 2012-06-11 21:48:41 -07:00
Mark Otto 5dd47f1196 keep tables at 13px in docs for now, clean up some modals js docs stuff 2012-06-11 20:33:00 -07:00
Mark Otto 7ed02b461b fix blockquote alignment 2012-06-11 20:20:51 -07:00
Marcus Schwab 97cbefa72f Merge remote-tracking branch 'upstream/2.1.0-wip' into 2.1.0-wip 2012-06-11 02:04:14 -07:00
Marcus Schwab bd19b42c15 Proper spacing between offsets
row-fluids don't have the same negative margin-left as rows. This was
throwing everything off.
So added a different rule for first-child and subsequent "spans".
2012-06-11 01:51:19 -07:00
Mark Otto 681b601561 Merge branch '2.1.0-wip' of https://github.com/marcusds/bootstrap into marcusds-2.1.0-wip 2012-06-10 23:02:30 -07:00
Mark Otto a0cd886c56 rewrite the rest of the nav section 2012-06-10 21:24:13 -07:00
Mark Otto c90c66e61f rewrite the split button dropdowns section 2012-06-10 21:00:20 -07:00
Mark Otto 081a07c168 updated button groups section 2012-06-10 20:50:49 -07:00
Mark Otto 017b7cb804 rewrite the navbar section 2012-06-10 20:39:00 -07:00
Mark Otto 0c817bf5e2 redo pagination and breadcrumbs 2012-06-10 16:46:46 -07:00
Mark Otto 3985379cca rearrange hero unit section 2012-06-10 15:14:21 -07:00
Mark Otto f2e39233f5 rewrite alerts and progress bars sections 2012-06-10 15:12:02 -07:00
Mark Otto 4a907709ba redo icons section 2012-06-09 23:26:46 -07:00
Mark Otto 5ef2b6561a realign icons to five cols, fix buttons 2012-06-09 22:47:45 -07:00
Mark Otto fc2481b8e5 fix form display issue in docs 2012-06-09 19:26:06 -07:00
Mark Otto c65006601e overhaul forms docs to simplify presentation of everything, reduce text, and increase visibility of examples 2012-06-09 19:15:46 -07:00
Mark Otto ca63ea2f26 overhaul tables docs for more streamlined content 2012-06-09 13:15:28 -07:00
Mark Otto aff3694f28 remove mention of prettify from docs, fix docs subnav width when fixed 2012-06-09 12:58:55 -07:00
Mark Otto 550e375af0 restore scrollspy to body 2012-06-08 16:35:04 -07:00
Barryvdh c028e33358 Scope finding the .active to .item 2012-06-08 16:19:08 +03:00
Mark Otto 269ce715f1 overhaul js docs top sections, update subhead 2012-06-07 22:24:47 -07:00
Mark Otto 97c7a83a8f remove individual js file download buttons 2012-06-07 22:12:15 -07:00
Mark Otto bba0b34c36 restore top navs entirely 2012-06-07 22:10:36 -07:00
Mark Otto c1c7528dd9 drop the side nav, restore topbar 2012-06-07 21:48:03 -07:00
Mark Otto df869f1eb0 fix grids 2012-06-07 21:45:37 -07:00
Marcus Schwab c3f5d7c62d ajgon's fluid offsets working with first-child 2012-06-07 17:23:22 -07:00
Igor Rzegocki f8d68002dc Added offsets for .row-fluid 2012-06-07 17:23:22 -07:00
Mark Otto ff6dd0cf56 nav and content tweaks 2012-06-07 14:01:03 -07:00
Mark Otto 860a96939a fix grid tooltips, tweaks 2012-06-07 10:58:15 -07:00
Mark Otto f109be4e8a update readme to match master 2012-06-07 10:31:52 -07:00
Mark Otto 857b8fb8be Update master 2012-06-07 10:31:26 -07:00
Mark Otto a1aa2b188a more content changes to docs 2012-06-07 10:20:52 -07:00
Mark Otto 2ecbd36cbf add back left rail nav, tweak colors 2012-06-06 00:48:31 -07:00
Mark Otto 10d68406fe examples-wrap tables 2012-06-05 23:59:50 -07:00
Mark Otto 2c5ac562d2 updated type section of base css 2012-06-05 20:47:40 -07:00
Mark Otto 5a614fb86d remove sidenav 2012-06-05 19:53:54 -07:00
Mark Otto 09ec0b843e updated less page to single col 2012-06-05 18:29:26 -07:00
Mark Otto 8ee0679522 updated javascripts for first pass at single column 2012-06-05 18:25:46 -07:00
Mark Otto 53cec198c0 update layout for side nav 2012-06-05 17:17:20 -07:00
Mark Otto 22918f8f92 more tweaks to layouts and some docs styles 2012-06-05 17:16:17 -07:00
Mark Otto dd127611e1 two col scaffolding rev 2012-06-05 00:46:16 -07:00
Mark Otto 094e65eb9d adding 20px grid, setting that on docs 2012-06-04 23:58:51 -07:00
Mark Otto de53f62a04 more changes to js and components, playing with new docs subnav 2012-06-04 23:57:48 -07:00
Mark Otto 47e2c43401 navs tabs pills to single column 2012-06-04 23:37:18 -07:00
Mark Otto b8d8704f90 button groups and dropdowns to single column 2012-06-04 23:34:02 -07:00
Mark Otto 446f9199c6 updated index page and footer 2012-06-04 23:31:26 -07:00
Mark Otto f0ff20ec40 updating scaffolding page to single column 2012-06-04 23:10:30 -07:00
Mark Otto 257890f839 finish off rest of base-css page 2012-06-04 23:03:21 -07:00
Mark Otto 060100cf3a update table section to single column 2012-06-04 21:13:35 -07:00
Mark Otto 094e12f68d convert code section to new layout 2012-06-04 21:10:08 -07:00
Mark Otto c44bd1edf4 revamp docs to have new width, start realigning the base css page to match 2012-06-04 21:08:31 -07:00
Mark Otto 632c6d22a2 add bs-docs-examples styles from other branch 2012-06-04 20:57:58 -07:00
Mark Otto eef87c96af #3684: reset width to auto for input type='image' 2012-06-04 20:27:42 -07:00
Mark Otto 348668ec13 add misc helper classes to components css docs 2012-06-04 20:25:57 -07:00
Mark Otto 589242604f document large and small well classes 2012-06-04 18:56:50 -07:00
Mark Otto b79c100967 add placeholder to input-prepend to confirm FF placeholder looks good 2012-06-04 18:44:50 -07:00
Mark Otto c56eb0962a fix double @@ on less pages 2012-06-04 18:39:02 -07:00
Mark Otto 8df906e641 Merge branch 'wachunga-2.0.4-wip' into 2.1.0-wip 2012-06-04 08:47:48 -07:00
Mark Otto 9cceb0bba7 Merge branch '2.0.4-wip' of https://github.com/wachunga/bootstrap into wachunga-2.0.4-wip 2012-06-04 08:47:41 -07:00
Mark Otto 5563b8448e fix #3693: rounded corners on search form 2012-06-04 08:45:51 -07:00
Mark Otto 8eb1488861 wrap download page in form 2012-06-04 08:44:50 -07:00
Mark Otto 37ba0eba02 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-06-04 08:33:48 -07:00
Mark Otto eb3a4b8f75 fix placeholder for FF by attaching input and textarea when we call the mixin 2012-06-04 08:33:42 -07:00
Jacob Thornton 82ea5847a7 adds remote source to modal. Remote source can be specified in href or by providing a remote option #936 2012-06-03 21:26:54 -07:00
Jacob Thornton 041b8bdfd3 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-06-03 11:24:51 -07:00
Jacob Thornton 31e8a358c3 check length so that pause, actually pauses 2012-06-03 11:24:19 -07:00
Mark Otto ad9bfeef7a fix cut off icons 2012-06-02 22:34:20 -07:00
Mark Otto 9a4ee790e1 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
2012-06-02 22:14:12 -07:00
Mark Otto 9a3a297a47 update version # on homepage, crush assets 2012-06-02 22:12:45 -07:00
Jacob Thornton 2d3a0babd2 make active selector more specific #2043 and rebuild 2012-06-02 22:10:35 -07:00
Jacob Thornton 4a276b1620 Merge pull request #3682 from mlmorg/2.1.0-wip
Alter typeahead to accept synchronous/asynchronous data source
2012-06-02 21:57:18 -07:00
Matt Morgan af14f6db5d Merge branch 'async' into 2.1.0-wip 2012-06-03 00:33:06 -04:00
Jacob Thornton 91a7274a43 only set height explicitly for collapse when animation is supported #2131 2012-06-02 21:26:34 -07:00
Jacob Thornton a38bc90b48 change note to point out that boostrap.js bundles all plugins #3174 2012-06-02 21:19:56 -07:00
Jacob Thornton ebc1fe907d only trigger $.support.transition.end when it exists 2012-06-02 21:09:13 -07:00
Jacob Thornton 3a751a63d4 fix multi carousel bug #3194 2012-06-02 21:01:45 -07:00
Jacob Thornton 555a3b0478 fix carousel when hiding a reshowing - make sure it always triggers transition end #3248 2012-06-02 20:28:08 -07:00
Jacob Thornton 0b827965d3 fix regression in typeahead #3313 2012-06-02 19:31:30 -07:00
Jacob Thornton 354f99f0bd add length to parent dropdown check #3316 2012-06-02 19:02:30 -07:00
Jacob Thornton b8a8927b0c add link to phantomjs in docs #3347 2012-06-02 18:36:45 -07:00
Jacob Thornton 4ca1cba3f8 upgrade jquery to 1.7.2 #3379 2012-06-02 18:25:07 -07:00
Jacob Thornton b07b869b26 rebuild assets 2012-06-02 18:15:23 -07:00
Jacob Thornton 806a82ef83 add relatedTarget to carousel slide event 2012-06-02 18:06:00 -07:00
Jacob Thornton 037107480d remove isHTML support 2012-06-02 17:57:36 -07:00
Jacob Thornton f836473129 add html option back to tooltip and popover to explicitly prevent XSS #3421 2012-06-02 17:55:10 -07:00
Jacob Thornton fc96bc8bba rebuild doi 2012-06-02 17:30:00 -07:00
Jacob Thornton 5b401a8c16 add collapsed class to collapse invoker when it's target is collapsed #3525 2012-06-02 17:28:38 -07:00
Jacob Thornton 5e5965ca6f Merge branch 'accessibility' into 2.1.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
	docs/javascript.html
	docs/templates/pages/javascript.mustache
2012-06-02 16:11:35 -07:00
Jacob Thornton ebc6935663 2.0.3 -> 2.0.4 2012-06-01 11:04:27 -07:00
Jacob Thornton 5657ab46c5 Merge branch '2.0.4-wip' 2012-06-01 10:53:47 -07:00
Jacob Thornton 4eaeea81fd rebuild and fix test 2012-05-31 10:24:23 -07:00
Jacob Thornton bcd5097c02 Merge pull request #3655 from jorgenfb/8dda83906d72ade81ecf9b21d55b5a2922589d30
Updated unit test for tooltips. Now using is() instead of hasClass()
2012-05-31 09:03:53 -07:00
Mark Otto 7875e4833c fix broken css tests, add fluid input-prepend/-append to tests, fix input-prepend/append for responsive for both fluid and fixed sizing 2012-05-28 17:32:24 -07:00
Mark Otto f53a038088 remake after merging IE7/8 bugfix for animations 2012-05-28 17:17:55 -07:00
Mark Otto 6fc5674466 Merge branch 'raymccoy-no-filters' into 2.0.4-wip 2012-05-28 17:17:36 -07:00
Mark Otto 9699e1d707 scope float right dropdown menus to immediate children 2012-05-28 01:13:24 -07:00
Mark Otto 241cbd478d Merge pull request #3619 from coreyti/2.0.4-wip-fix-placeholder
2.0.4 wip fix placeholder
2012-05-28 01:00:23 -07:00
Jacob Thornton a85c8fe74e add note about contributing 2012-05-27 20:07:58 -07:00
Corey Innis 8a06339501 fixes .placeholder to work as a "grouped selector"
adding the `&` combinator to `.placeholder` makes it work for the global case (in forms.less) as well as within `.navbar-search .search-query`

the result can be seen in the generated bootstrap.css, which include the -ms vendor extension.
2012-05-27 18:12:08 -07:00
Mark Otto 287086758b add tracking but for production only 2012-05-26 23:17:23 -07:00
Mark Otto cc8b260ed8 adding google analytics tracking to docs 2012-05-26 16:35:28 -07:00
Mark Otto a7529e158b remove color from labels 2012-05-25 09:19:10 -07:00
Mark Otto 7dbcd0be9a fix navbar button for mobile tapping (turn to button instead of adding href=#), streamline less docs page 2012-05-24 21:30:43 -07:00
Mark Otto aaf1825b49 fix example code for carousel 2012-05-24 20:26:08 -07:00
Mark Otto fe30bd6055 make bootstrap like google maps a bit more 2012-05-24 20:18:52 -07:00
Mark Otto 76ee212343 make nested cols code match given example 2012-05-24 20:16:25 -07:00
Mark Otto c1c679b644 #3592: clarify grid sizing in grid docs 2012-05-24 20:13:59 -07:00
Mark Otto 7fa9f605d6 recompile after adding ms-placeholder 2012-05-24 19:18:06 -07:00
Mark Otto 72e3b3beb3 Merge branch 'ademaro-patch-1' into 2.0.4-wip 2012-05-24 19:17:49 -07:00
Ademaro 34e5bc5f1d ie support placeholder color (http://msdn.microsoft.com/en-us/library/ie/hh772745(v=vs.85).aspx) 2012-05-24 13:57:02 +04:00
Mark Otto 19489496c1 remove redeclared font styles from <p> and rebuild 2012-05-23 00:05:30 -07:00
Mark Otto 5d27fbb32d Merge branch 'pvorb-patch-1' into 2.0.4-wip 2012-05-23 00:05:13 -07:00
Mark Otto 3b6b6eb242 fix field state mixin 2012-05-23 00:04:54 -07:00
Tomás Arribas 642f75141d Do not use filters in fade animations 2012-05-21 02:56:57 +02:00
Jørgen Borgesen 8dda83906d Swapped out .hasClass() with .is() when checking for multiple classes 2012-05-20 20:10:21 +02:00
Jørgen Borgesen e388a5e475 Added unit test to check that tooltips is not showed when leave event is triggered before show delay has expired AND the hide delay is set to 0 2012-05-20 19:59:53 +02:00
Paul Vorbach faf2866f96 Remove re-declaration of font-fam, font-size, and line-height in p 2012-05-20 11:54:21 +03:00
Mark Otto 78790da03c fix resizing issues from incorrectly changing <767px grid classes to inline-block, fix height issue on textareas 2012-05-17 22:00:49 -07:00
Mark Otto e5187e12c4 fix modal example per #3510 2012-05-17 21:48:13 -07:00
Mark Otto 1dbf4c92ce manually resolve #3516: type in less docs 2012-05-17 21:45:45 -07:00
Jacob Thornton b1d7c34086 remove log 2012-05-17 00:45:28 -07:00
Jacob Thornton 9889948f58 abandon activedescendant because it was awful 2012-05-17 00:39:14 -07:00
Jacob Thornton a7b49a7d92 nearly everything working with activedescendant... then decide it's wrong. 2012-05-17 00:23:11 -07:00
Jacob Thornton 10c6db4b14 add proper role to dialog markup and cleanup modal logging 2012-05-16 19:43:22 -07:00
Jacob Thornton 4b53778150 Merge branch 'master' into 2.0.4-wip 2012-05-16 19:10:49 -07:00
Jacob Thornton a404ac33bb modal accessibility tab control 2012-05-16 19:09:57 -07:00
Mark Otto 5ecab6112c version bump on docs home 2012-05-15 10:59:06 -07:00
Mark Otto 1e2fdd0b7c move navbar and update paths so it sits in tests 2012-05-15 09:45:53 -07:00
Mark Otto e009ed23fc move navbar and update paths so it sits in tests 2012-05-15 09:45:53 -07:00
Mark Otto 67f81a2ed5 clarify button type on dismiss icons 2012-05-15 09:41:06 -07:00
Mark Otto 0679f24606 example incorrect for modal dismiss button 2012-05-15 09:37:28 -07:00
Mark Otto 3a27b4e6f6 remake again after pull 2012-05-15 09:07:55 -07:00
Mark Otto 6be09df1bf Merge branch '2.0.4-wip-forms' of github.com:twitter/bootstrap into 2.0.4-wip-forms 2012-05-15 09:07:31 -07:00
Mark Otto a9d4b667ff finish fixing uneditable-input and remake 2012-05-15 09:07:19 -07:00
Mark Otto 532569fe59 updated forms to rearrange focus state, reinstate uneditable-input, and a few other cleanup tidbits 2012-05-15 09:04:44 -07:00
Mark Otto ecf84bdac5 correct regressions against 2.0.3 2012-05-15 00:17:02 -07:00
Mark Otto 87f6e426b3 three columns 2012-05-14 23:50:34 -07:00
Mark Otto d8ff335cfd move forms test to less/tests 2012-05-14 23:45:25 -07:00
Mark Otto c8cafa5d5a move forms test to less/tests 2012-05-14 23:45:25 -07:00
Mark Otto e28efd7da0 consolidate and relabel new form selectors 2012-05-14 23:42:32 -07:00
Mark Otto a25e78f9c9 add forms test page for all html5 input types and refactor selectors 2012-05-14 23:40:06 -07:00
Mark Otto a0809ceebe add forms test page for all html5 input types and refactor selectors 2012-05-14 23:40:06 -07:00
Mark Otto 33061a8e0b document .lead per #3213 2012-05-14 22:02:51 -07:00
Mark Otto d03abac628 adding navbar example, for fixed and static navbars 2012-05-14 08:57:24 -07:00
Mark Otto 1b537c6f9c adding navbar example, for fixed and static navbars 2012-05-14 08:57:24 -07:00
Jørgen Borgesen e9a7d26d06 Cancel running timer for tooltips with delayed show, but instant hide. This prevents delayed tooltips from appearing if the mouse leaves the elements before tooltip is showed and the hiding delay is 0. 2012-05-14 14:03:36 +02:00
Mark Otto 826a8714e2 #3257: share .navbar-fixed-top styles with .navbar-fixed-bottom 2012-05-13 22:11:35 -07:00
Mark Otto ea15660973 #3420: properly scope dropdown open state to immediate children only 2012-05-13 21:52:18 -07:00
Mark Otto 332d2a7384 #3438: fix typo on i18n tag 2012-05-13 17:43:56 -07:00
Mark Otto a2fb9ed42f #3449: make legend and form-actions the same border color 2012-05-13 17:43:04 -07:00
Mark Otto c02c3c60c9 Merge branch 'aziz-patch-7' into 2.0.4-wip 2012-05-13 14:42:12 -07:00
Mark Otto 8f44245850 document .hyphens() mixin 2012-05-13 14:31:31 -07:00
Mark Otto 23401e811f Merge branch 'Synchro-hyphenation' into 2.0.4-wip 2012-05-13 14:29:08 -07:00
Mark Otto 1a8561d084 Merge branch 'hyphenation' of https://github.com/Synchro/bootstrap into Synchro-hyphenation 2012-05-13 14:28:32 -07:00
Mark Otto 7de65e0a62 #3465 part 2: add mention to docs of type button issue 2012-05-13 14:03:32 -07:00
Mark Otto d09db29039 #3465 part 1: add type="button" to all dismiss buttons in docs 2012-05-13 14:01:57 -07:00
Mark Otto 6f61c96f02 Merge branch '2.0.4-wip' of github.com:twitter/bootstrap into 2.0.4-wip 2012-05-13 13:59:26 -07:00
Mark Otto 6a89659727 #3468: 140 icons, not 120 2012-05-13 13:59:20 -07:00
Mark Otto 3a21891824 #3469: add variables for dropdown menu dividers 2012-05-13 13:58:42 -07:00
Mark Otto 526d77af61 remove wrapping <label> from all js docs 2012-05-13 11:10:08 -07:00
Mark Otto 839ec86ac7 Merge pull request #3428 from Gavrisimo/patch-1
Update .placeholder() mixin call
2012-05-12 11:37:53 -07:00
Milos Gavrilovic 20eae67147 Update .placeholder() mixin call
In less/mixins.less this mixin is being created with @placeholderText
color as default, which is actually set as @placeholderText: @grayLight
in less/variables.less so it's redundant to make call like this:

.placeholder(@grayLight);
2012-05-10 12:25:22 +03:00
David Hirtle 452d8c1df0 Gradient mixins blow up in IE7/8 if you happen to use rgba() colors as params 2012-05-04 13:50:16 -07:00
Synchro ca369c4b2a Add Opera prefix 2012-05-01 17:54:53 +02:00
Synchro dcc89e7400 Coding style 2012-05-01 17:06:19 +02:00
Synchro 5ffb6d6706 Add .hyphens mixin 2012-05-01 17:01:26 +02:00
Mark Otto ef368f0076 #3263: typo in forms docs 2012-04-30 15:43:47 -07:00
Mark Otto b6b354ceaa #3255: typo in components for tabbable tabs 2012-04-30 15:42:55 -07:00
Mark Otto 51153766f5 Merge branch 'anirvan-master' into 2.0.4-wip 2012-04-30 15:41:47 -07:00
Mark Otto 59ec4c7154 make responsive input fields not wrap for fluid input prepend/append by setting block back to inline-block (oversight of 2.0.3) 2012-04-30 15:40:49 -07:00
Mark Otto c204bc66d6 #3237: change to CSS comments in responsive docs 2012-04-30 15:33:35 -07:00
Mark Otto 6e9756ebb6 #3228: update docs to list dependencies from 2.0.3 for compiling via make 2012-04-30 15:30:56 -07:00
Mark Otto ad46b0980c expand input css tests to fixed width grid 2012-04-30 15:06:26 -07:00
Anirvan Chatterjee ec56940c51 several spelling corrections 2012-04-27 10:48:59 -07:00
Matt Morgan bf9d8fcc07 Alter typeahead to accept synchronous/asynchronous data source via function/callback 2012-04-26 14:09:20 -04:00
Allen Bargi ab178060be let's reuse color variables, instead of hardcoding colors. 2012-04-26 17:38:47 +03:00
Jacob Thornton b261f9781b Merge pull request #3226 from aziz/patch-6
No need to specify units when a value is 0, thanks to RECESS
2012-04-25 22:19:49 -07:00
Jacob Thornton ffb4d9025b rebuild with typeahead change 2012-04-25 22:15:39 -07:00
Jacob Thornton fc509e14b2 revert position -> offset for typeahead position 2012-04-25 22:14:39 -07:00
Jacob Thornton a29e5a9dd6 fix #3234 2012-04-25 21:52:05 -07:00
Allen Bargi 99c3b7810b No need to specify units when a value is 0, thanks to RECESS 2012-04-25 18:16:59 +03:00
Jacob Thornton aaabe2a46c fix regression in resetting collapse to auto on collapse open. (+ add spec and rebuild) 2012-04-24 18:06:41 -07:00
Giuliano Velli 3aa89ded21 Merge branch 'media-component' of github.com:wpbrains/bootstrap into media-component
Conflicts:
	docs/components.html

Signed-off-by: Giuliano Velli <wpbrains@giusi.org>
2012-04-24 17:23:14 +02:00
Giuliano Velli 4fbb400754 Added Medias code and documentation
Fix for Issue #1711

Added media.less and edited bootstrap.less and responsive.less to
manage media components.

Added a section to the documentation (Media, in components.html) outlining how Medias work. Edited bootstrap.css and bootstrap-responsive.css to add the code for the demos

Signed-off-by: Giuliano Velli <wpbrains@giusi.org>
2012-04-24 17:19:17 +02:00
Mark Otto 66ac6e14db heading 2012-04-24 06:53:48 -07:00
Mark Otto 7b282798a3 officially drop support for offset on thumbnails since it breaks BC 2012-04-24 06:52:57 -07:00
Mark Otto 5be84ad0b7 restore margins on thumbnails, add comments about it's changes and how responsive affects it 2012-04-24 06:45:21 -07:00
Mark Otto f9744ff522 make component animations work cross browsers with opacity mixin, restore float on thumbnails > li 2012-04-24 06:39:14 -07:00
Jacob Thornton e659dc7e1b Merge branch '2.0.3-wip'
Conflicts:
	Makefile
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
2012-04-24 02:21:45 -07:00
Jacob Thornton 839ef3a030 2.0.2 -> 2.0.3 2012-04-24 02:19:02 -07:00
Mark Otto 79d7092a39 Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 2012-04-24 02:12:09 -07:00
Mark Otto d8aaf50798 implement ie7 fluid tests and semantic.gs IE7 hack for rounding in ie7; not perfect, but mostly solid 2012-04-24 02:11:59 -07:00
Jacob Thornton fc871a4821 Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 2012-04-24 02:02:28 -07:00
Jacob Thornton 73453c7f79 changes for build in preperation for 2.0.3 release 2012-04-24 02:02:06 -07:00
Mark Otto 1c2db11d58 fix ie7 button group toggles and button borders 2012-04-24 01:46:20 -07:00
Mark Otto 805ca03457 fix #3179: cut off radios and checkboxes 2012-04-24 01:33:00 -07:00
Mark Otto 7f6f3ff462 fix #3202: add cursor to .accordion-toggle 2012-04-24 01:23:24 -07:00
Mark Otto f805a6080c Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 2012-04-23 10:06:45 -07:00
Mark Otto 419e50e339 fix up buttons after recess property order 2012-04-23 10:06:35 -07:00
Jacob Thornton b8b1ffde05 hr to var in makefil 2012-04-23 04:16:27 -07:00
Jacob Thornton c408d8961b rewrite server.js, fix travis 2012-04-23 03:44:32 -07:00
Jacob Thornton c896a182e1 increase length of waitfor timeout for phantom 2012-04-23 03:18:13 -07:00
Mark Otto 091a97c01c white bg on docs again 2012-04-23 03:06:30 -07:00
Mark Otto 176e0b1169 Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 2012-04-23 03:05:22 -07:00
Mark Otto 99a916d5eb remove background color from radios and checkboxes for IEs 2012-04-23 03:05:10 -07:00
Mark Otto 192cb575da fix typo 2012-04-22 23:56:36 -07:00
Giuliano Velli f5fd5e7523 Added Medias code and documentation
Added media.less and edited bootstrap.less and responsive.less to manage media components.

Added a section to the documentation (Media, in components.html) outlining how Medias work. Edited bootstrap.css and bootstrap-responsive.css to add the code for the demos

Signed-off-by: Giuliano Velli <wpbrains@giusi.org>
2012-04-20 17:55:22 +02:00
Jacob Thornton f84882122e style changes to phantom integration 2012-04-19 17:40:58 -07:00
Jacob Thornton 03f78f7a60 run qunit tests in phantomjs for travis-ci 2012-04-19 17:34:07 -07:00
Jacob Thornton 1160935446 make a few changes to package.json (add make test to makefile) 2012-04-19 16:38:43 -07:00
Jacob Thornton de9271bfd1 Merge pull request #3157 from caniszczyk/2.0.3-wip
Add TravisCI support and update README
2012-04-19 16:35:27 -07:00
Chris Aniszczyk c99dcd2e93 Add Travis CI Support
Continous integration is nice, fixes #3155

Signed-off-by: Chris Aniszczyk <zx@twitter.com>
2012-04-19 16:09:59 -07:00
Mark Otto fd009597b6 mention responsive css in navbar responsive section 2012-04-19 09:28:40 -07:00
Jacob Thornton f89394b8ef make build prettier - hopefully this works, maybe some makefile bro's can improve 2012-04-18 22:49:31 -07:00
Jacob Thornton edb52a82d8 make bootstrap compile with Recess instead of Less 2012-04-18 16:16:42 -07:00
Jacob Thornton bc07e2adae allow for pushstate in scrollspy 2012-04-18 13:35:14 -07:00
Jacob Thornton b627898919 Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip 2012-04-18 13:15:58 -07:00
Jacob Thornton 8f98c4fbf6 offset -> position #3088 2012-04-18 13:15:13 -07:00
Mark Otto 47b6e6bd80 fix #3111, badge and label alignment with surrounding text 2012-04-18 09:47:30 -07:00
Mark Otto 62a0f5fdcb Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 2012-04-18 09:37:12 -07:00
Mark Otto 178a9f3b51 fix some text around media queries in the docs 2012-04-18 09:37:07 -07:00
Mark Otto 48e6d88889 Merge pull request #3128 from codler/patch-2
Add -ms-user-select
2012-04-18 09:22:38 -07:00
Han Lin Yap c09602d172 add -ms-user-select 2012-04-18 11:38:14 +03:00
Jacob Thornton f3cf4cbaae rebuild 2012-04-16 17:36:03 -07:00
Jacob Thornton ba202d77ba Merge pull request #3104 from iamnirav/2.0.3-wip
Allow updater function in bootstrap-typeahead.js (updates the value of the input field) to be overridden
2012-04-16 17:35:32 -07:00
Nirav Sanghani 031fa47f68 Update new typeahead method docs to be a bit clearer. 2012-04-16 17:27:34 -07:00
Nirav Sanghani d5a95315eb Update typeahead docs to reflect new option. 2012-04-16 17:24:51 -07:00
Nirav Sanghani 8e8b1ad03d Allow updater function (updates the value of the input field) to be overridden. 2012-04-16 17:05:35 -07:00
Jacob Thornton 2881269e16 lots of property ordering 2012-04-16 16:34:08 -07:00
Jacob Thornton a3ec868ac2 few more property orders 2012-04-16 15:37:17 -07:00
Jacob Thornton 457859feba Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip 2012-04-16 15:09:26 -07:00
Jacob Thornton 498b7d984a a few property reordering things 2012-04-16 15:09:05 -07:00
Mark Otto 5fa0fcc888 fix modal per #3086 2012-04-16 14:38:22 -07:00
Mark Otto 41b695b8cd Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 2012-04-15 17:25:38 -07:00
Mark Otto a184806538 nuke line 2012-04-15 17:25:32 -07:00
Jacob Thornton 6cf9906a60 build bootstrap.js and bootstrap.min.js into docs 2012-04-15 17:03:33 -07:00
Mark Otto 5c5310dc87 remove @gridRowWidth var since we don't use it anywhere 2012-04-15 16:57:11 -07:00
Mark Otto b67a2d8a59 Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 2012-04-15 16:48:26 -07:00
Mark Otto d374fe92e5 simplify the left margin for offset grid columns 2012-04-15 16:48:17 -07:00
Jacob Thornton 6506ede632 add bootstrap + bootstrap.min.js to gh-pages for @remy 2012-04-15 16:45:13 -07:00
Jacob Thornton 0b8042656f fixes #2941 + whitespace in collapse 2012-04-15 16:15:32 -07:00
Mark Otto 13e4d1d5ac fix #2990: text wrapping in .uneditable-input 2012-04-15 00:35:30 -07:00
Jacob Thornton cad8f2b43a Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-04-15 00:20:50 -07:00
Jacob Thornton e985681758 add zip to git ignore, and fix gh-pages make 2012-04-15 00:19:25 -07:00
Jacob Thornton 2a6894d834 simplify make - move zipping to gh-pages only 2012-04-15 00:16:09 -07:00
Mark Otto 6c221d65e3 Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-04-15 00:06:35 -07:00
Mark Otto a4c2332eb1 move js tooltip link 2012-04-15 00:06:11 -07:00
Jacob Thornton c262ead6ed change comments to preserve for yui 2012-04-14 23:51:08 -07:00
Jacob Thornton be0efcfcfc whitespace 2012-04-14 23:38:11 -07:00
Jacob Thornton 1ca1ef94ee fix opera bug \o/ !!!! #1776 2012-04-14 23:24:19 -07:00
Mark Otto 9e9be2dc0d fix #2989: clear .checkbox/.radio floats 2012-04-14 23:19:42 -07:00
Jacob Thornton cf4924764c rebuild with tooltip formatting change 2012-04-14 23:11:19 -07:00
Jacob Thornton 19469aa52c Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip 2012-04-14 23:10:41 -07:00
Jacob Thornton b14455b03a add tests for mouseout delay in tooltip 2012-04-14 23:10:03 -07:00
Mark Otto 2dbce887df Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-04-14 23:07:51 -07:00
Mark Otto a6f27ebed4 ditch the .navbar in the selectors since it's the same specificity level, and thus superfluous 2012-04-14 23:06:00 -07:00
Jacob Thornton c7dc4cc573 change position of var in dropdown + cleanup makefile vars 2012-04-14 22:43:36 -07:00
Mark Otto 8dc1a0eade Merge branch '2.0.3-wip-nav-collapse' of https://github.com/tierra/bootstrap into tierra-2.0.3-wip-nav-collapse
Conflicts:
	docs/assets/bootstrap.zip
2012-04-14 22:43:26 -07:00
Jacob Thornton ce94442104 Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip 2012-04-14 21:45:23 -07:00
Jacob Thornton d65f7f204a don't open dropdown if target is disabled 2012-04-14 21:44:57 -07:00
Mark Otto 490eb1bd16 fix #3068: compile after changing comment 2012-04-14 20:56:50 -07:00
Mark Otto 3bc7553f66 Merge branch 'au-phiware-patch-1' into 2.0.3-wip 2012-04-14 20:56:13 -07:00
au-phiware 16855b920e Silence comment (just like the others) 2012-04-15 12:31:07 +10:00
Mark Otto fc7ae48c95 fix #1823: styles of tabs within other tabs resolved 2012-04-14 18:47:27 -07:00
Mark Otto def7ae7798 bump version on docs homepage to 2.0.3 2012-04-14 18:30:43 -07:00
Mark Otto 4bcb89946b merge in #2684, offset on the .makeColumn mixin 2012-04-14 18:18:11 -07:00
Mark Otto d8acc062c1 Merge branch 'gruvii-patch-2' into 2.0.3-wip 2012-04-14 18:11:40 -07:00
Mark Otto 2486033754 Merge branch 'patch-2' of https://github.com/gruvii/bootstrap into gruvii-patch-2 2012-04-14 18:11:31 -07:00
Jacob Thornton 82267d48ff calling pause on a slide should actually pause it - even when hovering 2012-04-14 17:49:51 -07:00
Jacob Thornton 34132f0e89 rebuild 2012-04-14 17:19:00 -07:00
Mark Otto ce30d19c15 Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-04-14 17:16:37 -07:00
Mark Otto dbde2dc9e4 adding icon classes to finish off glyphicons 1.6 update 2012-04-14 17:15:16 -07:00
Jacob Thornton 3408064d00 hack for subnav 2012-04-14 17:15:03 -07:00
Mark Otto d5063e5dc8 fix #3032: update glyphicons sprite to 1.6 release 2012-04-14 16:59:49 -07:00
Jacob Thornton 81a296d06a whitespace 2012-04-14 16:38:44 -07:00
Jacob Thornton c291e4d786 fix typeahead test 2012-04-14 16:32:20 -07:00
Jacob Thornton 575f18aaf4 add jshint support + a few minor stylistic changes 2012-04-14 16:29:53 -07:00
Mark Otto 8575a45294 alt fix to #3029: change to single border-radii properties 2012-04-14 13:31:48 -07:00
Mark Otto a7d8145a32 fix #3036: add bg color to inputs 2012-04-14 13:18:37 -07:00
Mark Otto c710f03995 Merge pull request #3042 from ctalkington/typo-fix-1
Doc Typo Fix
2012-04-13 17:14:11 -07:00
ctalkington 0e6f12af86 add 's' to 'classe' in components docs. thanks mishmosh. 2012-04-12 15:14:54 -05:00
Bryan Petty 5b85ed181a Fixed extra margin on Navbar buttons. 2012-04-10 15:22:17 -06:00
Mark Otto 48063afb3a Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-04-07 23:41:27 -07:00
Mark Otto 0b2d23d443 add larger .input-* to block reset for responsive <767 2012-04-07 23:41:09 -07:00
Mark Otto 28c4ed824e Merge branch 'alecrust-patch-3' into 2.0.3-wip 2012-04-07 23:38:16 -07:00
Mark Otto 5bc601d9a8 fix typo on js docs selector 2012-04-07 23:37:58 -07:00
Jacob Thornton 08fee005a8 https://github.com/twitter/bootstrap/issues/2954 2012-04-07 21:26:46 -07:00
Chris Aniszczyk 11064c4d34 Update the LICENSE to the actual APLv2 2012-04-07 17:17:39 -07:00
Mark Otto a20cd66ba4 clean up new input append examples 2012-04-07 16:49:06 -07:00
Mark Otto 3ecf109835 fix conflicts, add docs example for two buttons on an append 2012-04-07 16:44:03 -07:00
Mark Otto 1d30225e2c Merge branch 'jasny-patch-2' into 2.0.3-wip
Conflicts:
	less/forms.less
2012-04-07 16:43:48 -07:00
Mark Otto 0a71f171bc readd bootstrap.zip, add @inputBorderRadius var to close #2946 2012-04-07 16:17:15 -07:00
Mark Otto f563b1db43 update kippt screenshot 2012-04-07 15:59:14 -07:00
Mark Otto 5591a9b966 use yui-compress by default instead of regular compress 2012-04-07 14:56:37 -07:00
Mark Otto 798363eda7 fix left margin on .thumbnails for responsive <767 2012-04-07 14:31:55 -07:00
Mark Otto 10ff5f16a6 fix #2968 manually: add consolas to monospace font stack 2012-04-07 14:25:58 -07:00
Bryan Petty 4b81c0dff3 Changed .nav-collapse to clear both instead of left, and added compiled files. 2012-04-05 14:13:16 -06:00
Arnold Daniels fedce0cec7 Allow multiple buttons in .input-prepend and .input-append.
This has a look similar to button groups.
2012-04-05 23:08:32 +03:00
Jacob Thornton 4953629ccd Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-04-04 15:13:27 -07:00
Jacob Thornton 83febb3452 remake and add isHTML check to popover as well 2012-04-04 15:02:30 -07:00
Jacob Thornton 4bd611884a detect if title in tooltip is text or html. if text - use text method to prevent xss.
all add a few notes to js readme about updated event
2012-04-04 14:58:04 -07:00
Alec Rust ff57f59562 Corrected spacing 2012-04-03 12:15:36 +02:00
Mark Otto 2ea437f353 fix #2908: unfloat inputs using .span* in fluid row 2012-04-02 22:49:19 -07:00
Mark Otto 4462f24753 fix #2911: correct /lib/ path to /less/ 2012-04-02 22:40:06 -07:00
Mark Otto 2988de6377 fix #2913: get more specific with button group selectors 2012-04-02 22:38:12 -07:00
Bryan Petty d23a146d77 Restrict collapsed items in Navbar to only those in .nav-collapse, and buttons in Navbar. 2012-04-02 02:52:06 -06:00
Bryan Petty 030265eaec Restrict collapsed items in Navbar to only those in .nav-collapse, and buttons in Navbar. 2012-04-02 02:52:06 -06:00
Mark Otto 7bf4c8e76e Merge branch 'alecrust-patch-1' into 2.0.3-wip 2012-04-01 11:10:20 -07:00
Alec Rust 574592cba5 Corrected "resises" to "resides" 2012-04-01 17:25:43 +02:00
Mark Otto 647f1c98ed fix #2296: allow fluid thumbnails 2012-04-01 01:05:00 -07:00
Mark Otto fe05f9aeb2 fix #2572: streamline thumbnails css to allow for offsets 2012-04-01 00:59:34 -07:00
Mark Otto 33fa705c7f fix #2811: left and right aligned tabbable tabs fixes so that .tab-content grows to match parent's width 2012-04-01 00:15:04 -07:00
Mark Otto d652af1097 fix #2860: truncate .dl-horizontal terms and reset to stacked for <767px layouts 2012-03-31 23:53:54 -07:00
Mark Otto 452ddc0f0d update less docs page to reflect changes in mixins (no more default values) and variable name fix 2012-03-31 21:36:45 -07:00
Mark Otto f37d9aeaef fix #2856: make inputs using .span* classes responsive at <767px layout 2012-03-31 21:31:01 -07:00
Mark Otto 2355fd224d remove @shadow instances and replace with escaped values, update mixins to not use a default value at all 2012-03-31 21:06:16 -07:00
Mark Otto 56ecc6ba96 clarify use of dropdowns, href, and data-target for js docs; add tests to css tests page for it's display and execution in html 2012-03-31 12:31:56 -07:00
Mark Otto 37745cd899 fix fluid grid selectors to remove > in selectors 2012-03-31 00:53:38 -07:00
Mark Otto 2f4810e72f Merge branch 'grantzau-patch-1' into 2.0.3-wip 2012-03-30 23:38:16 -07:00
Jacob Thornton 2dc979a202 MSTransitionEnd + move paren (thanks rick waldron) 2012-03-29 14:14:17 -07:00
Jacob Thornton 0665c3ebf7 move over paren just because. 2012-03-29 13:55:56 -07:00
Jacob Thornton 422d04cb2b simplify transition plugin a little 2012-03-29 13:51:23 -07:00
Jacob Thornton 30b3f47e31 remove "technique" 2012-03-29 12:48:37 -07:00
Jacob Thornton 8ea8c312ea replace UA sniffing 2012-03-29 12:35:06 -07:00
Julius Graakjær Grantzau 6564afbe73 Renaming @gridColumnGutter to @gridGutterWidth 2012-03-29 14:56:53 +03:00
Mark Otto 2bbc9a1cb2 fix js links in css tests 2012-03-28 20:03:57 -07:00
Mark Otto a9f9949b3e rearrange other parts of forms docs 2012-03-28 19:41:23 -07:00
Mark Otto 04baa07547 document .backface-visibility and update comments and initial value 2012-03-28 18:25:27 -07:00
Mark Otto feccc6e705 Merge branch 'backface-visibility' of https://github.com/dannykeane/bootstrap into dannykeane-backface-visibility 2012-03-28 18:21:04 -07:00
Mark Otto 3308d1968f fix #2846: Firefox required two clicks on selects to get to options dropdown 2012-03-28 18:18:41 -07:00
Mark Otto d6680a50b9 start rearranging form docs and clear up messaging about required classes and default styles 2012-03-28 18:00:05 -07:00
Mark Otto 369ca13c75 fix homepage link in css-tests and remove second help text from example form 2012-03-28 17:52:03 -07:00
Mark Otto 66743676ce moving css tests to less directory 2012-03-28 17:41:40 -07:00
Mark Otto 93d42ca80e fix #2832: clarify docs on use of .tabbable and add mention of .fade 2012-03-28 17:35:06 -07:00
Mark Otto e41584afb5 fix #2829: redeclare .pull-right for navs since they get more specific floats 2012-03-28 17:02:13 -07:00
Danny Keane 2165ab2620 Added the back-face visibility css property to mixins.less, this property prevents the browser flickered experienced especially in Chrome when using 3D transformations. 2012-03-28 15:05:49 +01:00
Mark Otto 0fe68de1a4 fix second booboo 2012-03-27 09:22:15 -07:00
Mark Otto 5b3268317c Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-03-27 09:21:35 -07:00
Mark Otto d27fc24aa0 fix spelling booboo 2012-03-27 09:21:13 -07:00
Mark Otto 155a7c1067 Merge pull request #2817 from andriijas/2.0.3-wip
Finish of a.close to button.close
2012-03-27 09:14:39 -07:00
Andreas Cederström 5d2062a3cc Finish of close conversion from a to button 2012-03-27 08:36:34 +02:00
Mark Otto 917f11e679 update LESS docs to note @baseFontSize and @baseLineHeight must be pixels 2012-03-26 09:30:42 -07:00
Mark Otto d4914f47c3 fix #2799, mention of text in the navbar 2012-03-26 09:25:31 -07:00
Mark Otto cffadd8c71 add position relative to .dropup 2012-03-25 22:28:43 -07:00
Mark Otto 4449c4e9e0 update docs messaging around alerts and buttons 2012-03-25 20:44:01 -07:00
Mark Otto 473e5714f7 change all anchor alert closes to buttons 2012-03-25 20:41:59 -07:00
Mark Otto ea437351ed add heads up note for required href on alert dismiss actions 2012-03-25 19:47:13 -07:00
Mark Otto 4893928310 add back href for alerts in components docs to make close work on iphone 2012-03-25 18:03:30 -07:00
Mark Otto 825227474b add refresh method documentation to js docs to close #2028 and #2795 2012-03-25 17:37:38 -07:00
Mark Otto 3e2e111b17 add css tests for fluid rows and inputs 2012-03-25 17:11:50 -07:00
Mark Otto 519384fae8 Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 2012-03-25 16:41:57 -07:00
Mark Otto 95c2877ffc remove > in fluid grid selectors, fix double padding issue on fluid layout and example 2012-03-25 16:41:46 -07:00
Mark Otto 998c8a6e3d fix double padding issue on fluid layout and example 2012-03-25 16:40:51 -07:00
Mark Otto 8d52e6d458 change arrows in one pagination example because opera janks it up, per #2697 2012-03-25 14:51:54 -07:00
Mark Otto 4c3e7690ba jankify the IE7 horizontal forms a bit more to account for no labels before .controls, per #2728 2012-03-25 14:46:47 -07:00
Mark Otto cbd77d0aeb give IE7 inline-block behavior for input-prepend/append 2012-03-25 14:37:19 -07:00
Mark Otto d0526e31fa remove padding on .search-query for IE7-8 since it doesn't pick up large border-radius 2012-03-25 14:31:04 -07:00
Mark Otto c0f28d81b0 Remove black border on buttons in IE7:
1. Removed borders on .btn and increased line-height 2px to compensate
2. Set buttons to use the endColor of the gradient as the background-color by default for extra contrast between button and background
3. Set a 5% darker background-color on hover of buttons just for IE7
2012-03-25 14:28:24 -07:00
Jacob Thornton a62810918f fix responsive navbar 2012-03-25 13:33:36 -07:00
Mark Otto a5552a1d70 revert bart's mixin fix 2012-03-25 12:42:47 -07:00
Mark Otto b81a082cd1 add navbarheight support to .brand and .nav links in navbar 2012-03-25 12:32:29 -07:00
Mark Otto 13ae2b0fe6 introduce .navbar-link to resolve issue with buttons in .navbar-text 2012-03-25 01:21:47 -07:00
Mark Otto 6c5c29ada2 introduce .navbar-link to resolve issue with buttons in .navbar-text 2012-03-25 01:21:47 -07:00
Mark Otto a7b8e52f8e Overhaul the responsive utility classes:
1. Rename file from responsive-utility-classes.less to responsive-utilities.less
2. Add additional help text around the documentation for the classes in Scaffolding
3. Remove unnecessary display values on initial classes
4. Drop block values for inherit for better support on inline and table elements
5. Make use of \!important on every class to avoid classes with more specific selectors (e.g., .span* classes for the grid)
2012-03-25 01:12:51 -07:00
Mark Otto 582f4789ea adding 144x144 ipad touch icon 2012-03-25 00:46:03 -07:00
Mark Otto d1864b3608 adding 144x144 ipad touch icon 2012-03-25 00:46:03 -07:00
Mark Otto 1837b8ef2c remove height: auto on images since it interferes with inline dimensions 2012-03-25 00:20:30 -07:00
Mark Otto 223c8358ce Merge branch 'andreasbovens-master' into 2.0.3-wip 2012-03-25 00:07:09 -07:00
Jacob Thornton 3e7920820a add missing closing brace 2012-03-24 20:01:51 -07:00
Jacob Thornton 0dfff052cb add MSTransitionEnd event to js plugin 2012-03-24 19:02:55 -07:00
Jacob Thornton f02d017ffa return matcher value directly + cleanup first lines of files 2012-03-24 18:59:04 -07:00
Jacob Thornton 6dc59a9c3e add explict note that tooltip delay isn't applied to manual trigger type in popover/tooltip 2012-03-24 18:45:12 -07:00
Jacob Thornton bccc2cb719 add preventDefault support for all inital event types (show, close, hide, etc.) + fix small bug with scrollspy.last 2012-03-24 18:20:09 -07:00
Jacob Thornton ef5ac02b69 allow prevent default for show and hide event in modal 2012-03-24 17:50:21 -07:00
Andreas Bovens de0aaff433 Added -o- and -ms- prefixes to animations CSS
Added -o- and -ms- prefixes to make the animated progress bars to work
in the latest/upcoming versions of IE and Opera.
2012-03-24 18:53:27 +01:00
Mark Otto f9f03d8976 Merge branch 'bartt-master' into 2.0.3-wip
Conflicts:
	docs/assets/bootstrap.zip
	docs/assets/css/bootstrap.css
	less/button-groups.less
2012-03-23 20:56:48 -07:00
Mark Otto c7afe382a2 fix other instances of mixins, swap use of box-shadow everywhere, include border-radius and transition 2012-03-23 20:56:04 -07:00
Mark Otto f87e4c60e9 Merge branch '2.1.0-wip' into 2.0.3-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-03-23 18:29:21 -07:00
Bart Teeuwisse 035b85eeba The native box-shadow, background-clip and background-size instructions all take 1 or more arguments. In 1.3.0 LESS became arity aware, see https://gist.github.com/1933613. As a result the signatures of these mixins had to change a little. 2012-03-23 12:37:40 -07:00
Mark Otto a57554222f Merge branch '2.0.3-wip' of https://github.com/andriijas/bootstrap into andriijas-2.0.3-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-03-23 09:53:04 -07:00
Mark Otto 0b41984920 Fix #2758: Uneditable inputs in input-prepend/append
1. Added a missing comma to the input-append's form control stack () to fix border-radius
2. Add  to the .uneditable-input in forms to remove the float as we do with all other form controls
2012-03-23 09:47:57 -07:00
Andreas Cederström eb4f708b91 badge-error => badge-important 2012-03-23 13:35:46 +01:00
Mark Otto 5179df1928 css tests cleanup 2012-03-23 01:31:22 -07:00
Mark Otto de7aee2465 fix broken tables with double borders and such, add css tests page to start with table edge cases 2012-03-23 01:28:04 -07:00
Mark Otto 622b8fa3f0 adding blog link to docs homepage 2012-03-23 01:13:20 -07:00
Mark Otto e84161076b add mention of transitions plugin requirement on collapse 2012-03-23 00:58:41 -07:00
Mark Otto f330de0b5c add comment for append/prepend z-indexing 2012-03-23 00:51:31 -07:00
Mark Otto 281e058ef2 fix #2613: labels hang too low 2012-03-23 00:40:10 -07:00
Mark Otto ee3fc11add fix #2617: add negative margin to fixed-bottom navbar 2012-03-23 00:38:13 -07:00
Mark Otto 2729d15742 fix #2625 manually: account for dropup caret on large button 2012-03-23 00:37:15 -07:00
Mark Otto b8d8ab1aad run make on merge of progress bars change 2012-03-23 00:28:58 -07:00
Mark Otto 81f31d95c8 Merge branch 'patch-1' of https://github.com/sirlantis/bootstrap into sirlantis-patch-1 2012-03-23 00:28:25 -07:00
Mark Otto a28fa20018 remove redundant max-width img from docs css 2012-03-22 23:49:39 -07:00
Mark Otto c4fb703269 fix left and right tab-content alignment with width: auto; 2012-03-22 23:38:50 -07:00
TJ Rana 7ea34ae0ef Add "the" on lines 28 and 29 2012-03-22 23:31:52 -07:00
TJ Rana 7376eef378 Add s to bumps on line 30 2012-03-22 23:31:52 -07:00
TJ Rana 303ba1326b Make guidelines for release numbering more specific 2012-03-22 23:31:52 -07:00
Mark Otto ac64d9405b Dropdowns overhaul:
1. Removed broken and unused dropup examples from the navs/pills docs
2. New defaults for dropdown menus: all corners are rounded and always 1px offset from top unless otherwise specified
3. Refined active and open states for button dropdowns by adding a darker background color for each button variation when opened; also changed the opened dropdown-toggle's inset shadow to match that of an :active button
4. Generalized .dropdown.open to just .open, thus removing a few lines from button-groups.less.
5. Annnnnnnnnd I think that's it.
2012-03-22 23:09:31 -07:00
Mark Otto 50b2245be5 restore max-width 100% for images 2012-03-22 22:06:23 -07:00
Mark Otto 20da2c8ea0 add the broken out responsive files 2012-03-22 21:54:54 -07:00
Mark Otto ab068f6fda bump version numbers in css files to 2.0.3, break out responsive CSS into separate files for further customization 2012-03-22 21:33:06 -07:00
Mark Otto bdf8a6966b remove labels and badges from customizer and replace with single file 2012-03-22 21:17:55 -07:00
Mark Otto dbadac183d add new @formActionsBackground to customize page 2012-03-22 21:09:27 -07:00
Mark Otto 1852d077bf add shell of tests page, lighten form actions background and give it a variable 2012-03-22 21:08:41 -07:00
Mark Otto b011daf67f finish adding remaining component variables to less docs page 2012-03-22 19:36:55 -07:00
Mark Otto 254bb40f00 remove mentions of unused button variable per #2537 2012-03-22 17:49:13 -07:00
Mark Otto edca6f28f0 fix #2718, misaligned uneditable inputs in prepends/appends 2012-03-22 17:41:20 -07:00
Mark Otto b7b84c7a0d remove bug in docs for example icon in an input-prepend by removing margin on any input/select/etc in an input-prepend/append 2012-03-22 17:36:32 -07:00
Mark Otto ceab161324 fix unescaped reset filter per #2575 2012-03-22 17:31:09 -07:00
Mark Otto 1a6a1828bf remove mention of siteWidth, no longer used 2012-03-22 17:23:20 -07:00
Mark Otto 42f636032c fix #2716, incorrect required markup for navbar search form 2012-03-22 17:22:19 -07:00
Mark Otto e0c85fb69c use new font-stack mixins in base and alt font family mixins 2012-03-22 17:18:07 -07:00
Mark Otto 78e37e7d21 Merge branch 'font-variables' of https://github.com/ctalkington/bootstrap into ctalkington-font-variables 2012-03-22 17:13:58 -07:00
Mark Otto 89ea238c32 move navbarBrandColor closer to link color 2012-03-22 17:13:20 -07:00
Mark Otto b59cb505f8 Merge branch 'brand-link' of https://github.com/ctalkington/bootstrap into ctalkington-brand-link
Conflicts:
	docs/assets/bootstrap.zip
2012-03-22 17:12:22 -07:00
Mark Otto fa1b3bdda4 Merge branch 'Synchro-master' into 2.0.3-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-03-22 17:10:16 -07:00
Mark Otto 0e73a0e94b change spacing and fix code blocks 2012-03-22 17:09:54 -07:00
Mark Otto d839bf961b Merge branch 'master' of https://github.com/Synchro/bootstrap into Synchro-master 2012-03-22 16:04:32 -07:00
Mark Otto d7af2714c6 remove separate badges and labels, add single file instead, remove hover from non-link badges/labels 2012-03-22 16:02:00 -07:00
Marcus Bointon 239c178b68 Clarify docs on how tabs are activated from JS, see #1000 2012-03-22 21:24:57 +01:00
Marcus Bointon cfce34e300 Add more examples for activating tabs
Make naming of tab id consistent
2012-03-22 20:36:49 +01:00
Mark Otto 0f57bdab75 Merge branch 'doc-typos' of https://github.com/ZeroGravX/bootstrap into ZeroGravX-doc-typos 2012-03-22 09:06:59 -07:00
Mark Otto d335adf644 Updated readme to include blog mention 2012-03-22 00:33:18 -07:00
Jacob Thornton b3bf223617 filter out non matches in map 2012-03-21 23:59:27 -07:00
Jacob Thornton 20e085723b cache $(href) lookup 2012-03-21 23:51:32 -07:00
Jacob Thornton 706ee46b73 sort scrollspy to prevent flicker for unordered nav 2012-03-21 23:45:58 -07:00
Jacob Thornton 94b24aaa47 clear timeout to reset delays for tooltip/popover 2012-03-21 21:57:06 -07:00
Jacob Thornton 22963d7346 Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-03-21 21:37:17 -07:00
Jacob Thornton d5fb653914 top stripping leading and trailing whitespace + always use .html method 2012-03-21 21:35:02 -07:00
Marcus Bointon 2f06366399 Make changes in page templates, rebuild 2012-03-21 12:09:00 +01:00
Marcus Bointon 02a67ea59e Add note about styling tabs
Fix typo in popover docs
2012-03-21 11:28:23 +01:00
Marcus Bointon a0203bc8e0 Fix and improve docs on tab config 2012-03-21 11:20:56 +01:00
Jacob Thornton cb8dcfcebf if transitioning collapse, don't start new transition 2012-03-20 22:43:27 -07:00
Jacob Thornton 663e41d74f prevent dropdowns from closing when clicking inside form element inside dropdown 2012-03-19 23:13:55 -07:00
Jacob Thornton 63bd7cb478 fix slide logic for ie+ in carousel 2012-03-19 21:39:39 -07:00
Jacob Thornton bce33bbb09 if parent in collapse, only grab children 2012-03-19 21:10:55 -07:00
Jacob Thornton 630ff4ff7d fix collapse bug in ie7+ for initial collapse in 2012-03-19 20:51:20 -07:00
Jacob Thornton 07d23b927e add activate to scrollspy docs 2012-03-19 20:29:22 -07:00
Jacob Thornton 384a082e8d active - onActivate 2012-03-19 20:24:46 -07:00
Jacob Thornton 05e0d5f3d9 fire active event on active 2012-03-19 16:09:08 -07:00
Jacob Thornton 67f199678c if interval is false, do not autocycle the carousel 2012-03-19 15:48:57 -07:00
Jacob Thornton 83a7a69893 typeahead should escape regexp special chars 2012-03-19 15:33:28 -07:00
Jacob Thornton bf59220b87 ;) 2012-03-19 15:19:01 -07:00
Jacob Thornton 5a2c7eb50a select last item in scrollspy if you've reached the bottom of the document or element 2012-03-19 15:18:00 -07:00
Mark Figueredo d115d169b7 Added offset parameter to .makeColumn. 2012-03-19 14:58:55 -03:00
Mark cdd158c571 Could have sworn I added that 's'! 2012-03-18 12:49:18 -06:00
Mark 4c0905c5f2 Added URL fix from #2643 - Thanks ctalkington 2012-03-18 12:44:31 -06:00
Jacob Thornton 527fb87dad add /head 2012-03-17 21:29:56 -07:00
ctalkington 2c4230e2d3 update docs to match variable addition. 2012-03-15 14:46:27 -05:00
ctalkington 99e96f64f7 update docs to match variable addition. 2012-03-15 14:39:28 -05:00
ctalkington bf09c979ca make brand links follow navbarLinkColor but also be customizable in advanced cases. 2012-03-15 14:21:27 -05:00
ctalkington 51f37cbb81 make font family mixins customizable with variables. 2012-03-15 13:34:50 -05:00
Marcel Jackwerth 1a1cab2d06 Invert progress-bar-stripes direction 2012-03-15 18:11:17 +01:00
Mark d3873b0fc7 Typo Fixes for .mustache files
Added the doc typo fixes to the .mustache files as well.
2012-03-14 20:28:24 -06:00
Jacob Thornton 8e0afbeaa4 update hide text to h5bp technique #2586 2012-03-14 12:00:27 -07:00
Mark 6a61e81b7a Another Typo
Fixed another typo pointed out by panahi.
2012-03-13 13:36:58 -06:00
Mark ffa0d2f180 Some Doc Typos
Fixed doc typos in Components and Scaffolding.
2012-03-13 10:35:08 -06:00
Jacob Thornton 59503e71ff 2.0.2 derp 2012-03-12 14:09:38 -07:00
Jacob Thornton 8182b1ef69 make docs again for 2.0.2 2012-03-12 14:03:24 -07:00
Jacob Thornton 1f7a64aa3d 2.0.2 2012-03-12 14:00:19 -07:00
Jacob Thornton 664a838cd6 remove test file 2012-03-12 13:56:50 -07:00
Jacob Thornton 6d4867e799 remove commented out width 2012-03-12 13:45:36 -07:00
Jacob Thornton 56fe54df43 remove collapse class on open so that dropdowns are viewable 2012-03-12 13:37:44 -07:00
Jacob Thornton cd89c34d99 can't have overflo: visible for "in" which is present during entirity of transition. 2012-03-12 13:31:38 -07:00
Mark Otto 7f3a2b3813 button group sizes for ie7 fixes 2012-03-12 12:44:47 -07:00
Mark Otto e12c66aabe adding border variable for dropdowns, making dropdown carets use dropdown vars 2012-03-12 09:57:10 -07:00
Mark Otto 40fddffeec improve button docs 2012-03-12 09:38:12 -07:00
Mark Otto a3bc40c4cd fix apple touch icons in examples 2012-03-12 00:21:52 -07:00
Mark Otto 5dff63d767 fix apple touch icons in examples 2012-03-12 00:21:52 -07:00
Mark Otto 685039d608 add a super jank fix for horizontal-forms and .input-prepend/append in IE7 2012-03-12 00:16:01 -07:00
Mark Otto c35b04cccd enable buttons in input-append and input-prepend 2012-03-11 23:43:19 -07:00
Mark Otto debc4b752f more homepage links cleanup, ditching the middots 2012-03-11 23:34:22 -07:00
Mark Otto f4b51b373b more homepage links cleanup 2012-03-11 23:33:52 -07:00
Mark Otto d36f3d0a59 clean up links on docs homepage and add link to direct download with docs 2012-03-11 23:33:08 -07:00
Mark Otto 7c2ed0c095 resolve #1972, allowing add-ons at beginning and end of input-prepend/append 2012-03-11 23:21:38 -07:00
Mark Otto 5eed370856 fix more spacing issues with input append/prepend 2012-03-11 23:14:36 -07:00
Mark Otto 58cb7c631d simplify code for input-prepend/append in inline and search forms 2012-03-11 23:12:45 -07:00
Mark Otto 91eef351e4 remove need for floats and IE hacks for input-prepend and input-append--boom 2012-03-11 22:58:14 -07:00
Mark Otto 0630cd62b3 rewrite the fluid grid mixin to be simpler, per #2370 2012-03-11 22:45:10 -07:00
Mark Otto 0090fa1a6e fix overflow on .collapse.in to enable dropdowns within an open collapse 2012-03-11 22:43:35 -07:00
Mark Otto ac7f571e53 enable button groups in modal-footer by removing 5px added margin between .btn 2012-03-11 22:28:37 -07:00
Mark Otto e5a284d442 merge #2476 to allow for custom popover arrow colors 2012-03-11 22:26:07 -07:00
Mark Otto 1a11c526b9 Merge branch 'luk3thomas-popover_arrow_colors' into 2.0.2-wip 2012-03-11 22:25:34 -07:00
Mark Otto 5a28bd1e78 fix vertical align issue with labels in IE9 2012-03-11 21:44:00 -07:00
Mark Otto ee5d2ec91a add block level input mixin for border-box box-sizing 2012-03-11 21:21:51 -07:00
Mark Otto c8f4325c19 remove text indent on carets (not needed) and add inline replacement mixin 2012-03-11 21:12:59 -07:00
Mark Otto 67714d8347 remove the unused text-indent on dropdown carets 2012-03-11 20:38:17 -07:00
Mark Otto 0f23883283 fix broken dropdowns in ie7 per #2333 2012-03-11 20:16:39 -07:00
Mark Otto 2e52946fd3 fix lingering tables bug 2012-03-11 20:03:55 -07:00
Mark Otto 4109c62cf7 fix table border bug with double borders on theads and use of colgroup 2012-03-11 18:18:18 -07:00
Mark Otto 7154e378b2 use variable for navbar text line-height 2012-03-11 17:53:17 -07:00
Mark Otto 95cb6f07a8 Merge branch 'zerkms-master' into 2.0.2-wip
Conflicts:
	Makefile
2012-03-11 17:38:23 -07:00
Mark Otto 8fd126ba1b updated apple touch icons and moved input responsive fix from <480 to <767 2012-03-11 17:28:28 -07:00
Mark Otto ce292a8bb8 fix overflowing thumbnails in responsive <767px layouts 2012-03-11 15:15:55 -07:00
Mark Otto a97b9c1122 in responsive layouts <767px, ensure inputs are not larger than 100% with box-sizing and a max-width 2012-03-11 14:41:52 -07:00
Ivan Kurnosov 354252b4b5 Grammar fix in js/README.md 2012-03-12 10:24:18 +13:00
Mark Otto bf6cdff88a vertical align middle on images, run make to rebuild 2012-03-11 13:48:47 -07:00
Mark Otto ffbed0980c Merge branch 'Gavrisimo-patch-1' into 2.0.2-wip 2012-03-11 13:48:30 -07:00
Mark Otto ad1e9697ae update grid system mixins in less docs for new grid 2012-03-11 13:48:04 -07:00
Mark Otto e8ef7d5e7b tweak button sizes on homepage 2012-03-11 00:06:48 -08:00
Mark Otto 349bdc12a7 ensure right align dropdown example doesn't go all the way off page 2012-03-10 18:15:28 -08:00
Mark Otto 635ee36e11 fix gradient mixins by escaping them, add notes on progress bars 2012-03-10 18:03:59 -08:00
Mark Otto 6e72760de5 fix js typo per #2471 2012-03-10 17:38:09 -08:00
Mark Otto 6a2c519152 Merge pull request #2503 from maxbublik/patch-1
ignore Apple Double files
2012-03-10 16:23:52 -08:00
Mark Otto 5de8b277c6 add vars for navbar search 2012-03-10 16:21:34 -08:00
Mark Otto a3e9fc547c clean up search form in navbar, add new variable for placeholder text color 2012-03-10 16:15:54 -08:00
Mark Otto f4ac080f9e fix #2510, docs typo 2012-03-10 16:06:56 -08:00
Mark Otto 1dbb942d5b massive update to customize page to include all the new variables (and ensure they're being used in the .less files) 2012-03-10 16:01:06 -08:00
Mark Otto 95a3cd8732 simplify notes around using button dropdowns 2012-03-10 15:41:41 -08:00
Mark Otto cecfe72060 remove unused images, update examples to include soundready 2012-03-10 15:37:28 -08:00
Mark Otto 145a36323c add new example site thumbnail 2012-03-10 15:15:13 -08:00
Mark Otto 9c1d8e032b change title attr to re-include twitter 2012-03-10 15:14:54 -08:00
Mark Otto 700457c62a remove unused example diagrams 2012-03-10 15:09:35 -08:00
Mark Otto 67aa00d0bb make pre font-size a percentage of @baseFontSize 2012-03-10 14:36:58 -08:00
Mark Otto aef230d40a fix typo per #2494 2012-03-10 14:20:46 -08:00
Mark Otto f7d4fb61ce Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-03-10 14:12:29 -08:00
Mark Otto dd5cffc308 add button sizes to docs for button dropdowns, clean up styles for them 2012-03-10 13:40:58 -08:00
Mark Otto c7eb1ab49a make nav padding and negative margins the same 2012-03-10 13:24:46 -08:00
Jacob Thornton a07851d6af stop doing oldschool escape substitution 2012-03-10 13:01:17 -08:00
Jacob Thornton 04851652db rebuild with latest grid changes - need 1.3 to build! 2012-03-10 12:45:09 -08:00
Jacob Thornton 1fd5e55881 Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
2012-03-10 12:42:39 -08:00
Jacob Thornton 1a8d7576e0 Merge branch 'new_grid' into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	less/mixins.less
2012-03-10 12:41:41 -08:00
Maxim Pshenichnikov 922b5fba53 ignore Apple Double files 2012-03-11 00:11:03 +04:00
Mark Otto 9ebc6b4c97 simplify buttons docs section by changing a buttons to button elements 2012-03-10 11:37:34 -08:00
Mark Otto 5d961eaeb3 rebold headings 2012-03-10 11:29:57 -08:00
Mark Otto f4e879a936 fix the font-family var by using inherit instead of empty string, fix font-weight in docs for jumbotron 2012-03-10 11:27:07 -08:00
Mark Otto c414e57dcc Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-03-10 11:23:47 -08:00
Mark Otto 305374ab1a clear up nav variables 2012-03-10 11:23:05 -08:00
Jacob Thornton b410eeb6dd Merge pull request #2480 from jonathanmaron/master
fat
2012-03-09 11:12:45 -08:00
Milos Gavrilovic 3ff78d138a Add vertical-align: middle; to img elements
More info: h5bp.com/i/440
2012-03-09 14:52:50 +01:00
Jonathan Maron aa8e6b081c Fixed double copy action in Makefile. 2012-03-09 07:38:14 +01:00
Luke Thomas 1cc1852a9a added ability to set custom colors for popover arrow mixin 2012-03-08 19:02:29 -06:00
Jacob Thornton 1562381114 remove non existent dist dir from phony makefil 2012-03-08 11:42:12 -08:00
Jacob Thornton af1dbf6581 rebuild 2012-03-08 11:39:50 -08:00
Jacob Thornton d3721c504e Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 2012-03-08 11:39:33 -08:00
Jacob Thornton bcef12dfcc add version to min js 2012-03-08 11:39:00 -08:00
Jacob Thornton 26e683f1d0 Merge pull request #2177 from phopkins/typeahead_friendly
[2.0.2-wip] Typeahead friendly
2012-03-08 11:14:56 -08:00
Jacob Thornton 426feeef6a give pages custom titles based on names 2012-03-08 11:09:33 -08:00
Mark Otto 203d75770c Merge pull request #2449 from burningTyger/master
Examples typo
2012-03-07 11:02:15 -08:00
burningTyger d0120c94a0 fix for typo 2012-03-07 15:38:12 +01:00
Mark Otto 933136d382 Merge pull request #2443 from tarsis/master
uglify-js install information in compiling section at less.html. Improve issue #1756 in 2.0.2 wip
2012-03-06 21:44:34 -08:00
Mark Otto a613a8ebd0 Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 2012-03-06 21:16:57 -08:00
Mark Otto 27c3d5a90b Merge pull request #2436 from gruvii/2.0.2-wip
Add new headings vars to type.less
2012-03-06 21:16:40 -08:00
Mark Otto 69e4522a4e set font-family for inputs and such via basefontfamily 2012-03-06 21:13:29 -08:00
Mark Otto 6b9f70797d adding well sizes 2012-03-06 21:12:43 -08:00
Mark Figueredo 03bdf82ca2 Added use of new headings variables. 2012-03-06 16:45:43 -05:00
Mark Otto 738fac18de move padding from container to body for max-width: 767; responsive layout 2012-03-05 23:50:03 -08:00
Mark Otto 492ccedcab Merge branch 'davewasmer-master' into 2.0.2-wip 2012-03-05 23:07:54 -08:00
Mark Otto 79090ac121 fix input grid sizing, fix background color on form actions and append add-ons 2012-03-05 23:06:27 -08:00
Mark Otto bcd9294cc4 clearing up progress bar docs and resetting the striped one to match default bar (blue instead of green) 2012-03-05 23:00:37 -08:00
Mark Otto d98a2e9234 adding table variables 2012-03-05 22:47:39 -08:00
Mark Otto ac6eff280d Merge branch 'charettes-small-button-dropdowns-caret' into 2.0.2-wip
Conflicts:
	less/dropdowns.less
2012-03-05 20:49:39 -08:00
Mark Otto 9c2b2c589d fix comment on bottom-up, should be dropup 2012-03-05 20:20:42 -08:00
Mark Otto 20b10b5d66 change dropdown hover/active color back to link color 2012-03-05 20:15:35 -08:00
Mark Otto eaf464a2c5 increase specifity of .pills li.active for dropdowns 2012-03-05 20:14:54 -08:00
Mark Otto cb9234ba46 fix warning button issue per #2392 and add warning buttons to components 2012-03-05 00:47:13 -08:00
Mark Otto 7a8d6b1976 clean up horizontal dl option and docs 2012-03-05 00:42:37 -08:00
Mark Otto fb1d4a0f04 Merge pull request #2267 from dominicbarnes/dl_horizontal
Horizontal mode for description lists
2012-03-05 00:38:26 -08:00
Mark Otto 1fa42e2f71 fix ie7 breadcrumbs per #2224 2012-03-05 00:36:57 -08:00
Mark Otto 235811cd8a Merge branch 'alexpeattie-master' into 2.0.2-wip 2012-03-05 00:34:54 -08:00
Mark Otto a95c15a530 utilize new dropdown variables 2012-03-05 00:32:02 -08:00
Mark Otto d3e922f0c8 add a ton new variables for type, buttons, inputs 2012-03-05 00:29:16 -08:00
Tarsis Azevedo 3cbc40b129 add uglify-js install information in compiling section. improve issue #1756 2012-03-05 01:38:20 -03:00
Jacob Thornton 29c63fdb6a true > child + varargs 2012-03-04 14:27:13 -08:00
Jacob Thornton 3524aa909c make sure to pass child var through 2012-03-04 14:21:54 -08:00
Jacob Thornton 2f598e35a0 when > 0 rather than when not 0 2012-03-04 14:11:51 -08:00
Jacob Thornton 1aeca545c8 new approach to grid with recursive mixins :D 2012-03-04 14:06:30 -08:00
Simon Charette efd5e29ff4 Fixed small button caret and moved less code to dropdowns 2012-03-04 15:49:55 -05:00
Alex Peattie 0112b56c9c Fix typo in .mustache file 2012-03-03 22:16:20 -08:00
Alex Peattie 6a839fb2c3 docs/scaffolding typo: Large display is 1200px and up, not 1210px 2012-03-01 15:29:32 -08:00
Dave Wasmer ff8b997a1f Added disabled styles to pager 2012-02-28 18:39:35 -05:00
Mark Otto 7bf3419647 Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 2012-02-28 08:53:06 -08:00
Mark Otto bd55824827 .progress-warning mention in docs 2012-02-28 08:52:59 -08:00
Mark Otto 2087339035 Merge pull request #2305 from MeilleursAgents/features/warning_progress_bar
Progress bars: Added warning (orange) bar
2012-02-28 08:52:16 -08:00
Jonathan Camile a397130669 Merge branch '2.0.2-wip' of https://github.com/twitter/bootstrap into features/warning_progress_bar 2012-02-28 11:06:05 +01:00
Jonathan Camile 15759d9e7c Components: Added mention to warning progress-bar in docs 2012-02-28 10:58:23 +01:00
Mark Otto fbebb046f7 fix navbar container for default 940px grid per #2194 2012-02-27 22:34:25 -08:00
Mark Otto 6c9547f411 Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 2012-02-27 22:08:44 -08:00
Mark Otto 9ee77f2c11 set line-height for labels to prevent change in height when floated per #2222 2012-02-27 21:50:54 -08:00
Mark Otto a7b96b3e59 set list-style to none for breadcrumbs to resolve cross browser issues per #2224 2012-02-27 21:32:48 -08:00
Mark Otto 5cc4fcf6a2 Merge branch 'meleyal-fix-carousel-docs' into 2.0.2-wip
Conflicts:
	docs/javascript.html
	docs/templates/pages/javascript.mustache
2012-02-27 21:22:20 -08:00
Dominic Barnes 0b78033f0b removing a few of the size classes, changing up the documentation 2012-02-27 23:21:25 -06:00
Dominic Barnes d12737719f undoing what I suspect are the 'dirty' parts of this commit 2012-02-27 22:55:35 -06:00
Mark Otto 2c98e18724 Merge pull request #2227 from andriijas/2.0.2-wip-pillexamplefix
Fixing nav-pills code example
2012-02-27 19:51:44 -08:00
Mark Otto d4a48c9618 Merge branch 'meleyal-patch-1' into 2.0.2-wip 2012-02-27 19:50:44 -08:00
Mark Otto 4e17b1975e Merge branch 'meleyal-patch-1' into 2.0.2-wip 2012-02-27 19:50:44 -08:00
Mark Otto ca9588c896 manually resolve #2266, typo in example HTML for breadcrumbs 2012-02-27 19:47:21 -08:00
Mark Otto 7525aac830 make .input-prepend/append .add-on text color the same as labels, #333, to close out #2276 2012-02-27 19:44:16 -08:00
Mark Otto d57598827f fix typo in js docs carousel section per #2299 2012-02-27 19:40:07 -08:00
Mark Otto af8261af93 simplify selector for .modal-form per #2218 2012-02-27 19:09:44 -08:00
Mark Otto 1fbe0bb290 really add protocol to examples 2012-02-27 18:48:28 -08:00
Mark Otto 7bdd9551ed really add protocol to examples 2012-02-27 18:48:28 -08:00
Jacob Thornton 8615987243 add guard for child spans 2012-02-27 18:21:21 -08:00
Jacob Thornton ae3382d797 working through new grid implementation... 2012-02-27 18:15:59 -08:00
Mark Otto 163f58ff81 add heads up label to new docs mention 2012-02-26 23:31:12 -08:00
Mark Otto dd94f8d509 remove warning from icons section about :after labels, add section to explain spacing 2012-02-26 23:30:15 -08:00
Mark Otto 1a781a707e Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-02-26 23:16:11 -08:00
Mark Otto ccf7697185 Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-02-26 23:15:36 -08:00
Dominic Barnes 0a8efd5320 Adding a 'horizontal' option to description lists, similar to .form-horizontal 2012-02-25 21:21:05 -06:00
Jacob Thornton 43760eb202 fix for @pamelafox and #1861 2012-02-24 22:17:36 -08:00
Jacob Thornton fb74018ae2 and pause on hover option to carousel 2012-02-24 21:51:39 -08:00
Mark Otto 6abb2059eb fix docs example in js page per #2225 2012-02-24 21:06:17 -08:00
Mark Otto 4309153051 add version to docs homepage, fix docs example for forms 2012-02-24 21:02:24 -08:00
meleyal be9ae70060 Fix typos and clarify wording in carousel docs 2012-02-25 01:25:31 +01:00
meleyal f17658b02d Fix broken links to fav and touch icons in examples, fixes #2244 2012-02-24 23:06:02 +01:00
meleyal 591908eccf Fix broken links to fav and touch icons in examples, fixes #2244 2012-02-24 23:06:02 +01:00
Jonathan Camile 1562a8a010 Progress bars: Added warning (orange) bar 2012-02-24 11:37:26 +01:00
Andreas Cederström 34268672be Fixing nav-pills code example - closes #2225 2012-02-24 07:34:23 +01:00
Jacob Thornton 74a3c763b4 add note about backdrop static 2012-02-23 16:24:33 -08:00
Mark Otto 0e8427e7b1 update modal footers to use text-align instead of float on buttons for alignment 2012-02-22 22:38:54 -08:00
Pete Hopkins 3a6f58598c Allows escape to bubble when menu isn't shown 2012-02-22 14:19:55 -05:00
Pete Hopkins 70fecd1115 Fires change event when element is selected from menu 2012-02-22 14:19:55 -05:00
Pete Hopkins 80d03e143c Allow events to propagate / default if not used.
- All key events when the menu is not shown now propagate.
 - Blur is also allowed to propagate.
2012-02-22 14:19:55 -05:00
Mark Otto 8609a77bd2 add clearfix to .form-actions for .pull-right and .pull-left supported buttons, per #1978 and #2173 2012-02-22 11:16:32 -08:00
Mark Otto 0ed6d3b28e Merge branch 'couchbaselabs-clearfix-ing-form-actions' into 2.0.2-wip 2012-02-22 11:15:53 -08:00
Mark Otto 6f3b4b857f Merge branch 'clearfix-ing-form-actions' of https://github.com/couchbaselabs/bootstrap into couchbaselabs-clearfix-ing-form-actions 2012-02-22 11:15:44 -08:00
Mark Otto a0ec422444 fix #1954: icons in tabs add jank border 2012-02-22 08:36:07 -08:00
Mark Otto b86969f762 restore fixed navbar container reset to grid mixin, add override for inputs within grid mixins to fix #2080 2012-02-22 08:21:29 -08:00
Mark Otto 4410ede8ed Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-02-22 08:12:51 -08:00
Mark Otto 92a54a7b72 tighten padding on labels and badges given default line-height 2012-02-22 08:12:25 -08:00
Jacob Thornton f3b6cf1d6d Merge branch '2.0.2-wip' of https://github.com/twitter/bootstrap into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
	less/mixins.less
2012-02-21 23:18:18 -08:00
Jacob Thornton 5ad5dde1e2 rewrite the grid system. Clean shit up tons - only generate 12 columns by default - custom builder will do differently if you request it. 2012-02-21 23:16:06 -08:00
Mark Otto a139167489 set width to auto for default navbar container, then override it later for fixed navbars (done all via the #gridSystem mixins) 2012-02-21 23:15:43 -08:00
Mark Otto 9b524a16e9 clear up table styles and docs to fix rowspan and colspan issues for bordered tables, per #1918 2012-02-21 23:00:02 -08:00
Mark Otto 917df6703c clarify responsive docs on media queries 2012-02-21 22:40:21 -08:00
Mark Otto 8bd67bb124 clean up and simplify support for bottom navbar by automagically turning dropdowns into dropups 2012-02-21 22:09:51 -08:00
Mark Otto 20221a67c2 Merge branch '2.0/fork/components/dropup' of https://github.com/buraktuyan/bootstrap into buraktuyan-2.0/fork/components/dropup
Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/navbar.less
2012-02-21 22:01:39 -08:00
Mark Otto b4cc6c74f5 add support and docs for .navbar-fixed-bottom 2012-02-21 21:12:16 -08:00
Mark Otto e3ae517555 move container up in default grid mixin 2012-02-21 15:21:18 -08:00
Mark Otto 8665fa8c50 move table columns mixin to mixins.less 2012-02-21 15:18:05 -08:00
Mark Otto 575072b74b Merge pull request #2143 from inmarelibero/2.0.2-wip
Add columns 13-24 for grid systems to enable customization up to 24 cols
2012-02-21 15:15:56 -08:00
Mark Otto bb16b9bef2 fix second part of #1962 2012-02-21 13:52:02 -08:00
Mark Otto 664a5c4438 update forms help-block 2012-02-21 13:43:13 -08:00
Emanuele Gaspari 1cfb3fd03a substituted hard-coded number of columns (12) with @gridColumns 2012-02-21 19:19:15 +01:00
Emanuele Gaspari 45cec4a6fa added .span[13-24] and .offset[12-23] to support up to 24-columns layout 2012-02-21 19:07:55 +01:00
Mark Otto d908731566 Merge branch '2.0.2-wip-nowrapfix' of https://github.com/andriijas/bootstrap into andriijas-2.0.2-wip-nowrapfix
Conflicts:
	docs/assets/bootstrap.zip
2012-02-21 09:05:04 -08:00
Mark Otto 187b3bd4bd Merge pull request #2129 from andriijas/2.0.2-wip-navtabs
Width fix on .tab-content
2012-02-21 09:00:10 -08:00
Mark Otto a78faee589 Merge pull request #2138 from laczoka/2.0.2-wip
Fix for #2137, adding select to input append/prepend
2012-02-21 08:29:08 -08:00
Mark Otto 80abc50d3e Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-02-21 08:25:19 -08:00
Mark Otto f3ad4c7183 adding responsive utility classes and matching docs section with super neato table and test 2012-02-21 08:24:18 -08:00
Laszlo Toeroek e423fc2629 .input-append should work for select element, fixes #2137 2012-02-21 16:32:57 +01:00
Andreas Cederström f50b2c9b92 100% width on .tab-content 2012-02-21 09:20:46 +01:00
Andreas Cederström dfd0326186 Bring back nowrap to labels and badges 2012-02-21 08:17:16 +01:00
Jacob Thornton d149a131c1 remake 2012-02-20 22:02:04 -08:00
Jacob Thornton f046c12bd2 fix cycling in carousel 2012-02-20 22:01:38 -08:00
Mark Otto 06d4756114 adding basic badges support 2012-02-20 21:20:06 -08:00
Mark Otto d2630ff84e introduce new mixin to do navbar vertical centering 2012-02-20 19:14:26 -08:00
Mark Otto 143b3db2c9 update inline forms to resolve checkbox label with space in it and overlapping content, per #1969 2012-02-20 18:56:05 -08:00
Mark Otto 331c85724a remove max-width on img from reset and put in docs only, per #1552 2012-02-20 16:18:13 -08:00
Mark Otto 9c74f21966 fix overflow issue on tabbed content per #2079 2012-02-20 16:06:42 -08:00
Mark Otto 91fe8bc0f4 remake after merging buttons update 2012-02-20 13:37:24 -08:00
Mark Otto 2b8fc018ba Merge branch 'billyvg-main' into 2.0.2-wip 2012-02-20 13:36:56 -08:00
Billy Vong e18a35784a Update old button selectors 'small' and 'large' to be 'btn-small' and 'btn-large' 2012-02-20 13:16:49 -08:00
Mark Otto 7ef7547a14 add horizontal divider support to nav list, including documentation for it, per #2106 2012-02-20 12:38:49 -08:00
Mark Otto 6df925bc75 enable use of span in place of a for .disabled in pagination, per #1406 2012-02-19 23:51:59 -08:00
Mark Otto 9f608411cb no more uppercase in readme 2012-02-19 22:53:34 -08:00
Mark Otto f81e5fbe9f readme cleanup 2012-02-19 22:52:32 -08:00
Mark Otto 9b09d1de86 move overflow and max-height on modal to modal-body instead 2012-02-19 21:55:09 -08:00
Mark Otto 1c7d346767 quick edit to new global styles section 2012-02-19 16:40:41 -08:00
Mark Otto 8247cb3362 add new global styles docs section for mentioning doctype requirements, base body changes, and type/links; also tightened up code styles 2012-02-19 16:28:46 -08:00
Mark Otto f4f34ab12f Merge branch 'andriijas-2.0.1-wip' into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-02-19 16:00:54 -08:00
Mark Otto 59d570fc16 Merge branch 'abbr' of https://github.com/jacobrask/bootstrap into jacobrask-abbr
Conflicts:
	docs/assets/bootstrap.zip
2012-02-19 15:38:34 -08:00
Mark Otto 3470c0dc49 Merge branch 'alert-headers' of https://github.com/jacobrask/bootstrap into jacobrask-alert-headers
Conflicts:
	docs/assets/bootstrap.zip
2012-02-19 15:04:52 -08:00
Mark Otto 89ccbdf8d1 Merge branch 'gridcontainer' of https://github.com/jacobrask/bootstrap into jacobrask-gridcontainer
Conflicts:
	docs/assets/bootstrap.zip
2012-02-19 15:01:25 -08:00
Mark Otto 5f2d2893d2 Merge branch 'opera-radial' of https://github.com/jacobrask/bootstrap into jacobrask-opera-radial
Conflicts:
	docs/assets/bootstrap.zip
2012-02-19 14:59:42 -08:00
Mark Otto 8482cc4cb3 commit leftover from make 2012-02-19 14:55:07 -08:00
Mark Otto adbbf17ee4 Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-02-19 14:54:53 -08:00
Mark Otto 16d12396d0 simplify text color in navbar by placing the color on global .navbar component 2012-02-19 14:53:07 -08:00
Mark Otto 532242e626 Merge pull request #2089 from jacobrask/ie6hack
Remove IE6 hacks
2012-02-19 14:52:06 -08:00
Jacob Rask f28140897e Update documentation for abbreviations 2012-02-19 22:14:18 +01:00
Jacob Rask e145619f6d Remove underscore hack for IE6
IE6 does not seem to be supported by Bootstrap, and reducing the number
of unused and invalid properties is always nice.
2012-02-19 21:54:38 +01:00
Jacob Rask 82457603b6 Separate span12 and container classes
If you have less than 12 columns, container is too wide. Instead
generate container width using the @gridColumns variable.

Also remove duplicate container width property.
2012-02-19 21:49:17 +01:00
Jacob Rask ad546c9631 Add Opera-prefixed radial gradient
Tested and works in Opera 11.61
2012-02-19 21:42:12 +01:00
Jacob Rask 51ec513b5c Use inherit on alert-heading color
Heading then inherits from the parent alert.
Avoids a lot of extra unneccessary CSS.
2012-02-19 21:29:32 +01:00
Jacob Rask c1775da187 Add class for upper case abbreviations, aka initialisms
Read more:
 * http://en.wikipedia.org/wiki/Abbreviation
 * http://en.wikipedia.org/wiki/Initialism
2012-02-19 21:24:06 +01:00
Jacob Rask f08b407667 Only show help cursor/border for abbr with title 2012-02-19 21:23:17 +01:00
Jacob Rask df757fb040 All abbreviations are not upper case initialisms
Read more:
 * http://developers.whatwg.org/text-level-semantics.html#the-abbr-element
 * http://en.wikipedia.org/wiki/Abbreviation
 * http://en.wikipedia.org/wiki/Initialism
2012-02-19 21:21:44 +01:00
Jacob Thornton ac6e667ad9 Merge branch 'master' into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-02-18 23:31:37 -08:00
Jacob Thornton 3d58b46226 fix bootstrap-button toggle regression + tests 2012-02-18 23:29:58 -08:00
Mark Otto 1948e985a3 merge in and remake for responsive navbar dropdown fix 2012-02-18 20:09:34 -08:00
Mark Otto ba97f56912 Merge branch 'tagliala-collapse-dropdown-fix' into 2.0.2-wip 2012-02-18 20:08:11 -08:00
Mark Otto bbb2fb3395 fix right aligned dropdowns 2012-02-18 20:06:38 -08:00
Mark Otto fed3b59e46 Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 2012-02-18 15:31:44 -08:00
Mark Otto dc4a864aaa Merge pull request #2063 from DominikTo/master
fixed syntax error in sprites.less and typo in comments
2012-02-18 15:31:16 -08:00
Mark Otto 29e6ef7c70 clarify forms in navbar per #2072 2012-02-18 15:23:38 -08:00
Mark Otto db940b3d8f Merge pull request #2066 from artstorm/2.0.2-wip
Fixed compile problem with LESS 1.2.1.
2012-02-18 15:17:41 -08:00
Mark Otto 1a1816b5bd clarify misc components subhead 2012-02-18 15:17:25 -08:00
Johan Steen c900d72857 Fixed compile problem with LESS 1.2.1.
The sprite path variables introduced in v2.0.1 prevents bootstrap.less to
compile wiht LESS v1.2.1. Updated the variables to use the @{name}
construct when inserted in sprites.less, as outlined in the LESS
documentation. This change makes the CSS compile with LESS v1.2.1.
2012-02-18 14:28:44 +01:00
Geremia Taglialatela 2068b74ea8 Fixed a wrong behaviour when using collapse and dropdown in responsive layout 2012-02-18 13:08:49 +01:00
Dominik Tobschall 7609fd4dc6 fixed syntax error 2012-02-18 09:40:28 +01:00
Dominik Tobschall f5bd4b3c8f fixed typo (whitespace) 2012-02-18 09:40:18 +01:00
Mark Otto b776cae902 add mention of js compilation to single file in customize page per #2003 2012-02-17 21:18:08 -08:00
Mark Otto ec05ebc5ed add small section to navbar docs on text in the component, per #2035 2012-02-17 20:53:12 -08:00
Mark Otto 1455bc9f8f removing duplicate reset filter since we changed the main button to use buttonBackground mixin, per #2024 2012-02-17 20:47:02 -08:00
Mark Otto b559f2b8d0 fix duplicate input prepend/append css selectors per #2026 2012-02-17 20:40:56 -08:00
Mark Otto e7d45184f1 swap last .btn-dark reference 2012-02-17 20:25:49 -08:00
Mark Otto 5d02b8c3c6 fix grid typo in subnav 2012-02-17 14:41:41 -08:00
Mark Otto 7fa1578c49 fix page header example and docs per #2048 2012-02-17 14:39:30 -08:00
Andreas Cederström 1e6d386b8d Keep origin in track 2012-02-17 13:31:36 +01:00
Jacob Thornton 7ec09d0db9 2.0.1 2012-02-16 22:42:38 -08:00
Jacob Thornton 03e6dc66c2 Merge branch '2.0.1-wip' 2012-02-16 22:41:02 -08:00
Mark Otto 091622644a bring back checkbox borders to iOS by conditionalizing the border: 0; on it to IE7-9; fix word break on pre in IE 2012-02-16 22:34:30 -08:00
Mark Otto 6f6adfb52f change clearfix mixin to drop parens that prevent it from being a class, too 2012-02-16 22:04:11 -08:00
Mark Otto 268e7d67ab add mini buttons per #1971 2012-02-16 21:28:16 -08:00
Mark Otto 61e2201c64 fix buttons focus state and swap a buttons for button buttons 2012-02-16 21:25:40 -08:00
Mark Otto 489276f5be fix responsive media queries to use 979 and 980 where appropro 2012-02-16 21:08:52 -08:00
Mark Otto 0369c1fcfc add mention of navbar vertical divider in docs 2012-02-16 21:04:16 -08:00
Jacob Thornton c3d3cf7262 add note about popover placement 2012-02-16 20:46:35 -08:00
Jacob Thornton 9d12b2d601 don't try next if not next 2012-02-16 20:43:57 -08:00
Jacob Thornton b3e4e5ae22 add idea to modal markup exmaple 2012-02-16 20:33:15 -08:00
Jacob Thornton 1520ec446c rebuild bro 2012-02-16 20:30:18 -08:00
Jacob Thornton 6da16a6def fix dropdown links 2012-02-16 20:30:00 -08:00
Jacob Thornton e730f8adb5 null out interval so that pause doesn't resume on next or prev 2012-02-16 20:22:01 -08:00
Jacob Thornton f9b578260f rebuild alerts 2012-02-16 20:05:09 -08:00
Jacob Thornton 792059b7ad fix alerts 2012-02-16 20:04:26 -08:00
BigBlueHat - Web Manufacturer 18760393d7 Adding .clearfix() to .form-actions to allow for .pull-right button containers 2012-02-14 15:16:55 -05:00
Jacob Thornton a8c478e051 Merge branch '2.0.1-wip' of https://github.com/twitter/bootstrap into 2.0.1-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-02-13 18:42:57 -08:00
Jacob Thornton 6e77c9d123 add semicolons to the end of js files 2012-02-13 18:41:02 -08:00
Jacob Thornton 9143d8e449 update irc spacing in readme 2012-02-13 18:11:41 -08:00
Jacob Thornton 28cfa8be03 add irc note 2012-02-13 18:10:36 -08:00
Mark Otto 64ea59234f change up fonts on form elements to remove unnecessary font-family on label element, per #1950 2012-02-13 08:18:19 -08:00
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 16f2e0e19e add link to docs compiling section in readme 2012-02-12 16:05:25 -08:00
Mark Otto 87ed82207a update readme to clarify dependencies of make command, per #1756 2012-02-12 16:04:02 -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 b8493ed8b7 Merge branch '2.0.1-wip' of https://github.com/simonfranz/bootstrap into simonfranz-2.0.1-wip 2012-02-12 15:14:27 -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 343012a9af Merge branch 'patch-1' of https://github.com/cvrebert/bootstrap into cvrebert-patch-1 2012-02-11 17:28:07 -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 c16ccf64f1 update tooltips message in upgrade docs 2012-02-11 17:25:30 -08:00
Mark Otto 85d8fe884c Merge branch '2.0.1-docs-update' of https://github.com/smaboshe/bootstrap into smaboshe-2.0.1-docs-update 2012-02-11 17:18:17 -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 855dcd3f56 Merge branch '2.0.1-wip' of https://github.com/jmar777/bootstrap into jmar777-2.0.1-wip 2012-02-11 00:10:58 -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
Mark Otto 9126014e93 Merge branch 'ol-unstyled' of https://github.com/barsoom/bootstrap into barsoom-ol-unstyled 2012-02-09 23:19:31 -08:00
Simon d9eff8efc1 Added the carret of the button 2012-02-10 00:31:40 +01:00
Simon 451a642ae8 Added a black/dark button 2012-02-09 23:08:14 +01: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
Jeremy Martin 920d995843 webkit legend margin fix for non-horizontal forms 2012-02-09 15:27:42 -05:00
Silumesii Maboshe 2e5a81601c Typo. 2012-02-08 17:11:51 +02:00
Jacob Thornton b0bd3efc4a Merge pull request #1781 from pamelafox/patch-7
Javascript update docs for tooltips, based on @fat's feedback.
2012-02-07 22:35:47 -08:00
Jacob Thornton b36a744fa7 remove small class 2012-02-07 22:32:32 -08:00
Jacob Thornton d743b4b881 Merge branch 'master' of https://github.com/twitter/bootstrap into 2.0.1-wip 2012-02-07 22:05:17 -08:00
Jacob Thornton 687c8bf761 Merge branch 'master' of https://github.com/twitter/bootstrap into 2.0.1-wip 2012-02-07 22:05:17 -08:00
Jacob Thornton 04fd01d4b6 fix docs for carousel markup 2012-02-07 22:04:52 -08:00
Jacob Thornton e8f1a10ec9 Merge pull request #1808 from wrightlabs/patch-1
Responive design fix for examples on some devices
2012-02-07 21:58:28 -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
John Wright 93aa5c869e some (android) devices need this viewport meta tag for responsive design to work 2012-02-07 11:06:08 -08:00
John Wright d390a921dc some (android) devices need this viewport meta tag for responsive design to work 2012-02-07 11:06:08 -08:00
John Wright 2f63576538 some (android) devices need this viewport meta tag for responsive design to work. 2012-02-07 11:05:13 -08:00
John Wright 9928e7fd3c some (android) devices need this viewport meta tag for responsive design to work. 2012-02-07 11:05:13 -08:00
John Wright 68a92876bc Some devices need this for responsive design to work 2012-02-07 10:58:01 -08:00
John Wright 91d0997c79 Some devices need this for responsive design to work 2012-02-07 10:58:01 -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 00c13691a9 Merge branch 'pamelafox-patch-8' into 2.0.1-wip 2012-02-07 00:17:04 -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 3fa971378e Merge branch 'master' of https://github.com/bastula/bootstrap into bastula-master 2012-02-07 00:05:25 -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 6840d8f776 Merge branch 'tobaco-master' into 2.0.1-wip 2012-02-06 23:48:16 -08:00
Mark Otto 7ce62ffc98 make after merging in breadcrumbs wrap fix 2012-02-06 23:42:57 -08:00
Mark Otto 63fd119c6e Merge branch 'et-fix_long_breadcrumbs' into 2.0.1-wip 2012-02-06 23:42:45 -08:00
Mark Otto c76b32bdef Merge branch 'fix_long_breadcrumbs' of https://github.com/et/bootstrap into et-fix_long_breadcrumbs 2012-02-06 23:42:40 -08:00
Mark Otto a10c23f1aa Merge branch 'CaryLandholt-master' into 2.0.1-wip 2012-02-06 23:42:02 -08:00
Mark Otto 6325402372 Merge branch 'master' of https://github.com/CaryLandholt/bootstrap into CaryLandholt-master 2012-02-06 23:41:53 -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
raphaelz 3722bb9a88 Grammatical changes have been made as suggested by @cvrebert for issue #1787. 2012-02-07 02:11:25 -05:00
Pamela Fox 7e92b33f12 Adding tooltip example to javascript docs. It's particularly helpful to show the pre-generated HTML for tooltips, as inspecting the source will show post-processed HTML with data-original-title attributes and may confuse folks (where folks=me :). 2012-02-06 14:37:47 -08:00
Pamela Fox 407ca09226 Javascript update docs for tooltips, based on @fat's feedback. 2012-02-06 14:33:12 -08:00
Torsten Baldes 9ba9185afc Removed double declaration of Skew
+ added translate3d to mixins.less
2012-02-06 09:59:23 +01:00
Jacob Thornton c8c4d5b392 fix alert tests + add show option back to modals 2012-02-06 00:17:31 -08:00
Chris Rebert 98cffdbf46 parallel fix to mustache template 2012-02-05 23:02:16 -08:00
Aditya Panchal 8a8daca71e Fixed a typo in base-css.html which allows the user icon to be shown on the example button 2012-02-05 22:04:46 -06: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 f9847b300b Merge branch 'jarijokinen-master' into 2.0.1-wip 2012-02-05 02:33:35 -08:00
Mark Otto f8db6a3b53 Merge branch 'master' of https://github.com/jarijokinen/bootstrap into jarijokinen-master 2012-02-05 02:33:30 -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 73db806660 fix meta tag for viewport in examples and shims 2012-02-04 23:53:24 -08:00
Mark Otto a2848ebb00 fix meta tag for viewport in examples and shims 2012-02-04 23:53:24 -08:00
Chris Rebert 93fea1f1cf The &lt; and &gt; escapes have nothing to do with Unicode. 2012-02-04 23:21:56 -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
Noah Blon f922a0800b Fixes typo on download page
Changed chose to choose spelling error on download template
2012-02-03 10:34:03 -06:00
Jacob Thornton f68f7870ef Merge pull request #1603 from mikaelbr/master
Fixed ID and for-attr in the doc forms
2012-02-02 23:47:22 -08:00
Jacob Thornton 7f0a64106d its core (typo) 2012-02-02 23:31:03 -08:00
Jacob Thornton c04241b615 Merge pull request #1647 from htanata/fix_alerts_code_example
Fix alerts JavaScript code example
2012-02-02 23:16:17 -08:00
Hendy Tanata 906028abdb Fix alerts JavaScript code example. 2012-02-02 20:45:58 -08:00
Eric Thomas ced08f6935 Wrap long breadcrumb trails 2012-02-02 11:02:14 -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 ab4345332d Merge branch 'shama-master' into 2.0.1-wip 2012-02-02 09:38:21 -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 4c237e688b Merge branch 'zhongwei99-master' into 2.0.1-wip 2012-02-02 09:34:37 -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
Mikael Brevik 8c0b47a6a8 Fixed duplicate and wrong IDs and label fors in forms. 2012-02-02 14:09:27 +01:00
zhongwei99 4158701894 Minor typo fix. 2012-02-02 18:01:16 +08:00
Kyle Robinson Young 99f395bcd7 Typo fixes 2012-02-01 23:30:37 -08:00
Mark Otto 77871a4205 Merge branch 'eirikb-master' into 2.0.1-wip 2012-02-01 23:13:16 -08:00
Mark Otto 7da9b16307 Merge branch 'master' of https://github.com/eirikb/bootstrap into eirikb-master 2012-02-01 23:12:55 -08:00
Mark Otto 9c3218c89b Merge branch 'mshafrir-master' into 2.0.1-wip 2012-02-01 23:12:17 -08:00
Mark Otto d86e77a256 Merge branch 'master' of https://github.com/mshafrir/bootstrap into mshafrir-master 2012-02-01 23:12:06 -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 98d1659ef8 Merge pull request #1549 from TannerNMO/patch-1
Fixed simple grammatical errors.
2012-02-01 22:37:42 -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 0c475b8e4c Merge branch 'master' of github.com:twitter/bootstrap 2012-02-01 22:13:26 -08:00
Mark Otto c1f0da7cce Merge branch 'master' of github.com:twitter/bootstrap 2012-02-01 22:13:26 -08:00
Mark Otto cc8a8df125 Merge pull request #1576 from ejain/patch-1
Import the responsive css *after* setting the body padding to fix...
2012-02-01 22:13:07 -08:00
ejain d66eb91437 Import the responsive css *after* setting the body padding to fix the issue described in #1570. 2012-02-01 21:17:04 -08:00
ejain 1b8863f925 Import the responsive css *after* setting the body padding to fix the issue described in #1570. 2012-02-01 21:17:04 -08:00
Cary Landholt c3c13a2474 Fixed typo "tabs" ==> "button" 2012-02-01 22:20:24 -06: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 cc15d0f766 remove twitter widgets js from examples 2012-02-01 18:00:40 -08:00
Mark Otto 2e1649410c remove twitter widgets js from examples 2012-02-01 18:00:40 -08:00
Mark Otto e36496fd84 Merge pull request #1490 from amenonsen/master
Typo fix: Sprited => Striped
2012-02-01 17:59:19 -08:00
Mark Otto d90e519486 fix icon-bar class in exampless 2012-02-01 17:57:39 -08:00
Mark Otto 3ea3950225 fix icon-bar class in exampless 2012-02-01 17:57:39 -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 b6886bd543 fixing jquery links in examples 2012-02-01 17:41:24 -08:00
Mark Otto 73238701bd fixing jquery links in examples 2012-02-01 17:41:24 -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
TannerNMO 11319f6da9 Fixed simple grammatical errors. http://grammar.quickanddirtytips.com/backward-versus-backwards.aspx 2012-02-01 14:14:49 -07:00
eirikb 12ed7a2b33 Removed / from 'Get the javascript' in components.mustache 2012-02-01 19:44:33 +01:00
eirikb 981cbfb4fa Removed extra / from 'Get the javascript'-link in components.html 2012-02-01 19:40:10 +01:00
Michael Shafrir b96e80cf39 Fix broken named anchor link for LESS compiling instructions. 2012-02-01 09:58:08 -08:00
Jari Jokinen a486a6f20b Allow labels to be links 2012-02-01 12:59:38 +02:00
Abhijit Menon-Sen 140d90db63 Typo fix 2012-02-01 13:21:37 +05:30
Mark Otto 7f32d15fbb fix links and rebuild 2012-01-31 19:32:42 -08:00
Jacob Thornton 4bb7653f67 move examples into docs... 2012-01-31 17:35:23 -08:00
Burak Tuyan 19b70dc414 Fixing the Docs for Tabs dropups
New example caused an overflowing issue at the Tabs dropdowns documentation, this is a quick fix to get rid of this issue.
2012-01-30 01:22:10 +02: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
404 arquivos alterados com 42400 adições e 53724 exclusões
+14
Ver Arquivo
@@ -0,0 +1,14 @@
# editorconfig.org
root = true
[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
[*.py]
indent_size = 4
+8
Ver Arquivo
@@ -0,0 +1,8 @@
# Enforce Unix newlines
*.css text eol=lf
*.html text eol=lf
*.js text eol=lf
*.json text eol=lf
*.less text eol=lf
*.md text eol=lf
*.yml text eol=lf
+14 -5
Ver Arquivo
@@ -1,3 +1,8 @@
# Ignore docs files
_gh_pages
_site
.ruby-version
# Numerous always-ignore extensions
*.diff
*.err
@@ -6,12 +11,13 @@
*.rej
*.swo
*.swp
*.zip
*.vi
*~
*.sass-cache
# OS or Editor folders
.DS_Store
._*
Thumbs.db
.cache
.project
@@ -21,13 +27,16 @@ Thumbs.db
nbproject
*.sublime-project
*.sublime-workspace
.idea
# Komodo
*.komodoproject
.komodotools
# grunt-html-validation
validation-status.json
validation-report.json
# Folders to ignore
.hg
.svn
.CVS
.idea
node_modules
bower_components
+28
Ver Arquivo
@@ -0,0 +1,28 @@
language: node_js
node_js:
- "0.10"
before_install:
- time sudo pip install --use-mirrors -r test-infra/requirements.txt
- rvm use 1.9.3 --fuzzy
- if [ "$TWBS_TEST" = validate-html ]; then echo "ruby=$(basename $(rvm gemdir)) jekyll=$JEKYLL_VERSION" > pseudo_Gemfile.lock; fi
install:
- time npm install -g grunt-cli
- time ./test-infra/s3_cache.py download 'npm packages' test-infra/npm-shrinkwrap.canonical.json ./node_modules || time ./test-infra/uncached-npm-install.sh
- if [ "$TWBS_TEST" = validate-html ]; then time ./test-infra/s3_cache.py download rubygems pseudo_Gemfile.lock $(rvm gemdir) || gem install -N jekyll -v $JEKYLL_VERSION; fi
after_script:
- if [ "$TWBS_TEST" = core ]; then time ./test-infra/s3_cache.py upload 'npm packages' test-infra/npm-shrinkwrap.canonical.json ./node_modules; fi
- if [ "$TWBS_TEST" = validate-html ]; then time ./test-infra/s3_cache.py upload rubygems pseudo_Gemfile.lock $(rvm gemdir); fi
env:
global:
- JEKYLL_VERSION: 1.4.1
- SAUCE_USERNAME: bootstrap
- secure: "pJkBwnuae9dKU5tEcCqccfS1QQw7/meEcfz63fM7ba7QJNjoA6BaXj08L5Z3Vb5vBmVPwBawxo5Hp0jC0r/Z/O0hGnAmz/Cz09L+cy7dSAZ9x4hvZePSja/UAusaB5ogMoO8l2b773MzgQeSmrLbExr9BWLeqEfjC2hFgdgHLaQ="
- secure: "gqjqISbxBJK6byFbsmr1AyP1qoWH+rap06A2gI7v72+Tn2PU2nYkIMUkCvhZw6K889jv+LhQ/ybcBxDOXHpNCExCnSgB4dcnmYp+9oeNZb37jSP0rQ+Ib4OTLjzc3/FawE/fUq5kukZTC7porzc/k0qJNLAZRx3YLALmK1GIdUY="
- secure: "Gghh/e3Gsbj1+4RR9Lh2aR/xJl35HWiHqlPIeSUqE9D7uDCVTAwNce/dGL3Ew7uJPfJ6Pgr70wD3zgu3stw0Zmzayax0hiDtGwcQCxVIER08wqGANK9C2Q7PYJkNTNtiTo6ehKWbdV4Z+/U+TEYyQfpQTDbAFYk/vVpsdjp0Lmc="
- secure: "RTbRdx4G/2OTLfrZtP1VbRljxEmd6A1F3GqXboeQTldsnAlwpsES65es5CE3ub/rmixLApOY9ot7OPmNixFgC2Y8xOsV7lNCC62QVpmqQEDyGFFQKb3yO6/dmwQxdsCqGfzf9Np6Wh5V22QFvr50ZLKLd7Uhd9oXMDIk/z1MJ3o="
matrix:
- TWBS_TEST=core
- TWBS_TEST=validate-html
- TWBS_TEST=sauce-js-unit
matrix:
fast_finish: true
+1
Ver Arquivo
@@ -0,0 +1 @@
getbootstrap.com
+196
Ver Arquivo
@@ -0,0 +1,196 @@
# Contributing to Bootstrap
Looking to contribute something to Bootstrap? **Here's how you can help.**
Please take a moment to review this document in order to make the contribution
process easy and effective for everyone involved.
Following these guidelines helps to communicate that you respect the time of
the developers managing and developing this open source project. In return,
they should reciprocate that respect in addressing your issue or assessing
patches and features.
## Using the issue tracker
The [issue tracker](https://github.com/twbs/bootstrap/issues) is
the preferred channel for [bug reports](#bug-reports), [features requests](#feature-requests)
and [submitting pull requests](#pull-requests), but please respect the following
restrictions:
* Please **do not** use the issue tracker for personal support requests. Stack
Overflow ([`twitter-bootstrap-3`](http://stackoverflow.com/questions/tagged/twitter-bootstrap-3) tag) or [IRC](https://github.com/twbs/bootstrap/blob/master/README.md#community) are better places to get help.
* Please **do not** derail or troll issues. Keep the discussion on topic and
respect the opinions of others.
* Please **do not** open issues or pull requests regarding the code in
[`Normalize`](https://github.com/necolas/normalize.css) (open them in
their respective repositories).
## Bug reports
A bug is a _demonstrable problem_ that is caused by the code in the repository.
Good bug reports are extremely helpful, so thanks!
Guidelines for bug reports:
1. **Use the GitHub issue search** &mdash; check if the issue has already been
reported.
2. **Check if the issue has been fixed** &mdash; try to reproduce it using the
latest `master` or development branch in the repository.
3. **Isolate the problem** &mdash; ideally create a [reduced test
case](http://css-tricks.com/6263-reduced-test-cases/) and a live example.
[This JS Bin](http://jsbin.com/EBAwOkOK/1) is a helpful template.
A good bug report shouldn't leave others needing to chase you up for more
information. Please try to be as detailed as possible in your report. What is
your environment? What steps will reproduce the issue? What browser(s) and OS
experience the problem? Do other browsers show the bug differently? What
would you expect to be the outcome? All these details will help people to fix
any potential bugs.
Example:
> Short and descriptive example bug report title
>
> A summary of the issue and the browser/OS environment in which it occurs. If
> suitable, include the steps required to reproduce the bug.
>
> 1. This is the first step
> 2. This is the second step
> 3. Further steps, etc.
>
> `<url>` - a link to the reduced test case
>
> Any other information you want to share that is relevant to the issue being
> reported. This might include the lines of code that you have identified as
> causing the bug, and potential solutions (and your opinions on their
> merits).
## Feature requests
Feature requests are welcome. But take a moment to find out whether your idea
fits with the scope and aims of the project. It's up to *you* to make a strong
case to convince the project's developers of the merits of this feature. Please
provide as much detail and context as possible.
## Pull requests
Good pull requests—patches, improvements, new features—are a fantastic
help. They should remain focused in scope and avoid containing unrelated
commits.
**Please ask first** before embarking on any significant pull request (e.g.
implementing features, refactoring code, porting to a different language),
otherwise you risk spending a lot of time working on something that the
project's developers might not want to merge into the project.
Please adhere to the [coding guidelines](#code-guidelines) used throughout the
project (indentation, accurate comments, etc.) and any other requirements
(such as test coverage).
Adhering to the following process is the best way to get your work
included in the project:
1. [Fork](http://help.github.com/fork-a-repo/) the project, clone your fork,
and configure the remotes:
```bash
# Clone your fork of the repo into the current directory
git clone https://github.com/<your-username>/bootstrap.git
# Navigate to the newly cloned directory
cd bootstrap
# Assign the original repo to a remote called "upstream"
git remote add upstream https://github.com/twbs/bootstrap.git
```
2. If you cloned a while ago, get the latest changes from upstream:
```bash
git checkout master
git pull upstream master
```
3. Create a new topic branch (off the main project development branch) to
contain your feature, change, or fix:
```bash
git checkout -b <topic-branch-name>
```
4. Commit your changes in logical chunks. Please adhere to these [git commit
message guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
or your code is unlikely be merged into the main project. Use Git's
[interactive rebase](https://help.github.com/articles/interactive-rebase)
feature to tidy up your commits before making them public.
5. Locally merge (or rebase) the upstream development branch into your topic branch:
```bash
git pull [--rebase] upstream master
```
6. Push your topic branch up to your fork:
```bash
git push origin <topic-branch-name>
```
7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
with a clear title and description against the `master` branch.
**IMPORTANT**: By submitting a patch, you agree to allow the project owners to
license your work under the terms of the [MIT License](LICENSE.md).
## Code guidelines
### HTML
- Two spaces for indentation, never tabs.
- Double quotes only, never single quotes.
- Always use proper indentation.
- Use tags and elements appropriate for an HTML5 doctype (e.g., self-closing tags).
- Use CDNs and HTTPS for third-party JS when possible. We don't use protocol-relative URLs in this case because they break when viewing the page locally via `file://`.
- Use [WAI-ARIA](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA) attributes in documentation examples to promote accessibility.
### CSS
- CSS changes must be done in `.less` files first, never just in the compiled `.css` files.
- Adhere to the [CSS property order](http://markdotto.com/2011/11/29/css-property-order/).
- Multiple-line approach (one property and value per line).
- Always a space after a property's colon (e.g., `display: block;` and not `display:block;`).
- End all lines with a semi-colon.
- For multiple, comma-separated selectors, place each selector on its own line.
- Attribute selectors, like `input[type="text"]` should always wrap the attribute's value in double quotes, for consistency and safety (see this [blog post on unquoted attribute values](http://mathiasbynens.be/notes/unquoted-attribute-values) that can lead to XSS attacks).
- Attribute selectors should only be used where absolutely necessary (e.g., form controls) and should be avoided on custom components for performance and explicitness.
- Series of classes for a component should include a base class (e.g., `.component`) and use the base class as a prefix for modifier and sub-components (e.g., `.component-lg`).
- Avoid inheritance and over nesting—use single, explicit classes whenever possible.
- When feasible, default color palettes should comply with [WCAG color contrast guidelines](http://www.w3.org/TR/WCAG20/#visual-audio-contrast).
- Except in rare cases, don't remove default `:focus` styles (via e.g. `outline: none;`) without providing alternative styles. See [this A11Y Project post](http://a11yproject.com/posts/never-remove-css-outlines/) for more details.
### JS
- No semicolons (in client-side JS)
- 2 spaces (no tabs)
- strict mode
- "Attractive"
### Checking coding style
Run `grunt test` before committing to ensure your changes follow our coding standards.
## License
By contributing your code, you agree to license your contribution under the [MIT license](https://github.com/twbs/bootstrap/blob/master/LICENSE).
Prior to v3.1.0, Bootstrap was released under the Apache License v2.0.
+421
Ver Arquivo
@@ -0,0 +1,421 @@
/*!
* Bootstrap's Gruntfile
* http://getbootstrap.com
* Copyright 2013-2014 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
module.exports = function (grunt) {
'use strict';
// Force use of Unix newlines
grunt.util.linefeed = '\n';
RegExp.quote = function (string) {
return string.replace(/[-\\^$*+?.()|[\]{}]/g, '\\$&');
};
var fs = require('fs');
var path = require('path');
var generateGlyphiconsData = require('./grunt/bs-glyphicons-data-generator.js');
var BsLessdocParser = require('./grunt/bs-lessdoc-parser.js');
var generateRawFilesJs = require('./grunt/bs-raw-files-generator.js');
var updateShrinkwrap = require('./grunt/shrinkwrap.js');
// Project configuration.
grunt.initConfig({
// Metadata.
pkg: grunt.file.readJSON('package.json'),
banner: '/*!\n' +
' * Bootstrap v<%= pkg.version %> (<%= pkg.homepage %>)\n' +
' * Copyright 2011-<%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
' * Licensed under <%= pkg.license.type %> (<%= pkg.license.url %>)\n' +
' */\n',
jqueryCheck: 'if (typeof jQuery === \'undefined\') { throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery\') }\n\n',
// Task configuration.
clean: {
dist: ['dist', 'docs/dist']
},
jshint: {
options: {
jshintrc: 'js/.jshintrc'
},
grunt: {
options: {
jshintrc: 'grunt/.jshintrc'
},
src: ['Gruntfile.js', 'grunt/*.js']
},
src: {
src: 'js/*.js'
},
test: {
src: 'js/tests/unit/*.js'
},
assets: {
src: ['docs/assets/js/application.js', 'docs/assets/js/customizer.js']
}
},
jscs: {
options: {
config: 'js/.jscs.json',
},
grunt: {
src: ['Gruntfile.js', 'grunt/*.js']
},
src: {
src: 'js/*.js'
},
test: {
src: 'js/tests/unit/*.js'
},
assets: {
src: ['docs/assets/js/application.js', 'docs/assets/js/customizer.js']
}
},
csslint: {
options: {
csslintrc: 'less/.csslintrc'
},
src: [
'dist/css/bootstrap.css',
'dist/css/bootstrap-theme.css',
'docs/assets/css/docs.css',
'docs/examples/**/*.css'
]
},
concat: {
options: {
banner: '<%= banner %>\n<%= jqueryCheck %>',
stripBanners: false
},
bootstrap: {
src: [
'js/transition.js',
'js/alert.js',
'js/button.js',
'js/carousel.js',
'js/collapse.js',
'js/dropdown.js',
'js/modal.js',
'js/tooltip.js',
'js/popover.js',
'js/scrollspy.js',
'js/tab.js',
'js/affix.js'
],
dest: 'dist/js/<%= pkg.name %>.js'
}
},
uglify: {
options: {
report: 'min'
},
bootstrap: {
options: {
banner: '<%= banner %>'
},
src: '<%= concat.bootstrap.dest %>',
dest: 'dist/js/<%= pkg.name %>.min.js'
},
customize: {
options: {
preserveComments: 'some'
},
src: [
'docs/assets/js/vendor/less.min.js',
'docs/assets/js/vendor/jszip.min.js',
'docs/assets/js/vendor/uglify.min.js',
'docs/assets/js/vendor/blob.js',
'docs/assets/js/vendor/filesaver.js',
'docs/assets/js/raw-files.min.js',
'docs/assets/js/customizer.js'
],
dest: 'docs/assets/js/customize.min.js'
},
docsJs: {
options: {
preserveComments: 'some'
},
src: [
'docs/assets/js/vendor/holder.js',
'docs/assets/js/application.js'
],
dest: 'docs/assets/js/docs.min.js'
}
},
less: {
compileCore: {
options: {
strictMath: true,
sourceMap: true,
outputSourceFiles: true,
sourceMapURL: '<%= pkg.name %>.css.map',
sourceMapFilename: 'dist/css/<%= pkg.name %>.css.map'
},
files: {
'dist/css/<%= pkg.name %>.css': 'less/bootstrap.less'
}
},
compileTheme: {
options: {
strictMath: true,
sourceMap: true,
outputSourceFiles: true,
sourceMapURL: '<%= pkg.name %>-theme.css.map',
sourceMapFilename: 'dist/css/<%= pkg.name %>-theme.css.map'
},
files: {
'dist/css/<%= pkg.name %>-theme.css': 'less/theme.less'
}
},
minify: {
options: {
cleancss: true,
report: 'min'
},
files: {
'dist/css/<%= pkg.name %>.min.css': 'dist/css/<%= pkg.name %>.css',
'dist/css/<%= pkg.name %>-theme.min.css': 'dist/css/<%= pkg.name %>-theme.css'
}
}
},
cssmin: {
compress: {
options: {
keepSpecialComments: '*',
noAdvanced: true, // turn advanced optimizations off until the issue is fixed in clean-css
report: 'min',
selectorsMergeMode: 'ie8'
},
src: [
'docs/assets/css/docs.css',
'docs/assets/css/pygments-manni.css'
],
dest: 'docs/assets/css/docs.min.css'
}
},
usebanner: {
dist: {
options: {
position: 'top',
banner: '<%= banner %>'
},
files: {
src: [
'dist/css/<%= pkg.name %>.css',
'dist/css/<%= pkg.name %>.min.css',
'dist/css/<%= pkg.name %>-theme.css',
'dist/css/<%= pkg.name %>-theme.min.css'
]
}
}
},
csscomb: {
options: {
config: 'less/.csscomb.json'
},
dist: {
files: {
'dist/css/<%= pkg.name %>.css': 'dist/css/<%= pkg.name %>.css',
'dist/css/<%= pkg.name %>-theme.css': 'dist/css/<%= pkg.name %>-theme.css'
}
},
examples: {
expand: true,
cwd: 'docs/examples/',
src: ['**/*.css'],
dest: 'docs/examples/'
}
},
copy: {
fonts: {
expand: true,
src: 'fonts/*',
dest: 'dist/'
},
docs: {
expand: true,
cwd: './dist',
src: [
'{css,js}/*.min.*',
'css/*.map',
'fonts/*'
],
dest: 'docs/dist'
}
},
qunit: {
options: {
inject: 'js/tests/unit/phantom.js'
},
files: 'js/tests/index.html'
},
connect: {
server: {
options: {
port: 3000,
base: '.'
}
}
},
jekyll: {
docs: {}
},
jade: {
compile: {
options: {
pretty: true,
data: function () {
var filePath = path.join(__dirname, 'less/variables.less');
var fileContent = fs.readFileSync(filePath, {encoding: 'utf8'});
var parser = new BsLessdocParser(fileContent);
return {sections: parser.parseFile()};
}
},
files: {
'docs/_includes/customizer-variables.html': 'docs/jade/customizer-variables.jade',
'docs/_includes/nav-customize.html': 'docs/jade/customizer-nav.jade'
}
}
},
validation: {
options: {
charset: 'utf-8',
doctype: 'HTML5',
failHard: true,
reset: true,
relaxerror: [
'Bad value X-UA-Compatible for attribute http-equiv on element meta.',
'Element img is missing required attribute src.'
]
},
files: {
src: '_gh_pages/**/*.html'
}
},
watch: {
src: {
files: '<%= jshint.src.src %>',
tasks: ['jshint:src', 'qunit']
},
test: {
files: '<%= jshint.test.src %>',
tasks: ['jshint:test', 'qunit']
},
less: {
files: 'less/*.less',
tasks: 'less'
}
},
sed: {
versionNumber: {
pattern: (function () {
var old = grunt.option('oldver');
return old ? RegExp.quote(old) : old;
})(),
replacement: grunt.option('newver'),
recursive: true
}
},
'saucelabs-qunit': {
all: {
options: {
build: process.env.TRAVIS_JOB_ID,
concurrency: 10,
urls: ['http://127.0.0.1:3000/js/tests/index.html'],
browsers: grunt.file.readYAML('test-infra/sauce_browsers.yml')
}
}
},
exec: {
npmUpdate: {
command: 'npm update'
},
npmShrinkWrap: {
command: 'npm shrinkwrap --dev'
}
}
});
// These plugins provide necessary tasks.
require('load-grunt-tasks')(grunt, {scope: 'devDependencies'});
// Docs HTML validation task
grunt.registerTask('validate-html', ['jekyll', 'validation']);
// Test task.
var testSubtasks = [];
// Skip core tests if running a different subset of the test suite
if (!process.env.TWBS_TEST || process.env.TWBS_TEST === 'core') {
testSubtasks = testSubtasks.concat(['dist-css', 'csslint', 'jshint', 'jscs', 'qunit', 'build-customizer-html']);
}
// Skip HTML validation if running a different subset of the test suite
if (!process.env.TWBS_TEST || process.env.TWBS_TEST === 'validate-html') {
testSubtasks.push('validate-html');
}
// Only run Sauce Labs tests if there's a Sauce access key
if (typeof process.env.SAUCE_ACCESS_KEY !== 'undefined' &&
// Skip Sauce if running a different subset of the test suite
(!process.env.TWBS_TEST || process.env.TWBS_TEST === 'sauce-js-unit')) {
testSubtasks.push('connect');
testSubtasks.push('saucelabs-qunit');
}
grunt.registerTask('test', testSubtasks);
// JS distribution task.
grunt.registerTask('dist-js', ['concat', 'uglify']);
// CSS distribution task.
grunt.registerTask('dist-css', ['less', 'cssmin', 'csscomb', 'usebanner']);
// Docs distribution task.
grunt.registerTask('dist-docs', 'copy:docs');
// Full distribution task.
grunt.registerTask('dist', ['clean', 'dist-css', 'copy:fonts', 'dist-js', 'dist-docs']);
// Default task.
grunt.registerTask('default', ['test', 'dist', 'build-glyphicons-data', 'build-customizer', 'update-shrinkwrap']);
// Version numbering task.
// grunt change-version-number --oldver=A.B.C --newver=X.Y.Z
// This can be overzealous, so its changes should always be manually reviewed!
grunt.registerTask('change-version-number', 'sed');
grunt.registerTask('build-glyphicons-data', generateGlyphiconsData);
// task for building customizer
grunt.registerTask('build-customizer', ['build-customizer-html', 'build-raw-files']);
grunt.registerTask('build-customizer-html', 'jade');
grunt.registerTask('build-raw-files', 'Add scripts/less files to customizer.', function () {
var banner = grunt.template.process('<%= banner %>');
generateRawFilesJs(banner);
});
// Task for updating the npm packages used by the Travis build.
grunt.registerTask('update-shrinkwrap', ['exec:npmUpdate', 'exec:npmShrinkWrap', '_update-shrinkwrap']);
grunt.registerTask('_update-shrinkwrap', function () { updateShrinkwrap.call(this, grunt); });
};
+18 -10
Ver Arquivo
@@ -1,13 +1,21 @@
Copyright 2012 Twitter, Inc.
The MIT License (MIT)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
Copyright (c) 2011-2014 Twitter, Inc
http://www.apache.org/licenses/LICENSE-2.0
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-52
Ver Arquivo
@@ -1,52 +0,0 @@
BOOTSTRAP = ./docs/assets/css/bootstrap.css
BOOTSTRAP_LESS = ./less/bootstrap.less
BOOTSTRAP_RESPONSIVE = ./docs/assets/css/bootstrap-responsive.css
BOOTSTRAP_RESPONSIVE_LESS = ./less/responsive.less
LESS_COMPRESSOR ?= `which lessc`
WATCHR ?= `which watchr`
#
# BUILD DOCS
#
docs: bootstrap
zip -r docs/assets/bootstrap.zip bootstrap
rm -r bootstrap
lessc ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
lessc ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE}
node docs/build
cp img/* docs/assets/img/
cp js/*.js docs/assets/js/
cp js/tests/vendor/jquery.js docs/assets/js/
cp js/tests/vendor/jquery.js docs/assets/js/
#
# BUILD SIMPLE BOOTSTRAP DIRECTORY
# lessc & uglifyjs are required
#
bootstrap:
mkdir -p bootstrap/img
mkdir -p bootstrap/css
mkdir -p bootstrap/js
cp img/* bootstrap/img/
lessc ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css
lessc --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css
lessc ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap.responsive
lessc --compress ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap.min.responsive
cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js > bootstrap/js/bootstrap.js
uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.js
#
# WATCH LESS FILES
#
gh-pages:
cp -r docs/* ../bootstrap-gh-pages
watch:
echo "Watching less files..."; \
watchr -e "watch('less/.*\.less') { system 'make' }"
.PHONY: dist docs watch gh-pages
+148 -69
Ver Arquivo
@@ -1,94 +1,173 @@
TWITTER BOOTSTRAP
=================
# [Bootstrap](http://getbootstrap.com) [![Bower version](https://badge.fury.io/bo/bootstrap.png)](http://badge.fury.io/bo/bootstrap) [![Build Status](https://secure.travis-ci.org/twbs/bootstrap.png)](http://travis-ci.org/twbs/bootstrap) [![devDependency Status](https://david-dm.org/twbs/bootstrap/dev-status.png?theme=shields.io)](https://david-dm.org/twbs/bootstrap#info=devDependencies)
[![Selenium Test Status](https://saucelabs.com/browser-matrix/bootstrap.svg)](https://saucelabs.com/u/bootstrap)
Bootstrap is Twitter's toolkit for kickstarting CSS for websites, apps, and more. It includes base CSS styles for typography, forms, buttons, tables, grids, navigation, alerts, and more.
Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat), and maintained by the [core team](https://github.com/twbs?tab=members) with the massive support and involvement of the community.
To get started -- checkout http://twitter.github.com/bootstrap!
To get started, check out <http://getbootstrap.com>!
## Table of contents
- [Quick start](#quick-start)
- [Bugs and feature requests](#bugs-and-feature-requests)
- [Documentation](#documentation)
- [Compiling CSS and JavaScript](#compiling-css-and-javascript)
- [Contributing](#contributing)
- [Community](#community)
- [Versioning](#versioning)
- [Authors](#authors)
- [Copyright and license](#copyright-and-license)
## Quick start
Three quick start options are available:
- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.1.1.zip).
- Clone the repo: `git clone https://github.com/twbs/bootstrap.git`.
- Install with [Bower](http://bower.io): `bower install bootstrap`.
Read the [Getting Started page](http://getbootstrap.com/getting-started/) for information on the framework contents, templates and examples, and more.
### What's included
Within the download you'll find the following directories and files, logically grouping common assets and providing both compiled and minified variations. You'll see something like this:
```
bootstrap/
├── css/
│ ├── bootstrap.css
│ ├── bootstrap.min.css
│ ├── bootstrap-theme.css
│ └── bootstrap-theme.min.css
├── js/
│ ├── bootstrap.js
│ └── bootstrap.min.js
└── fonts/
├── glyphicons-halflings-regular.eot
├── glyphicons-halflings-regular.svg
├── glyphicons-halflings-regular.ttf
└── glyphicons-halflings-regular.woff
```
We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). Fonts from Glyphicons are included, as is the optional Bootstrap theme.
Versioning
----------
For transparency and insight into our release cycle, and for striving to maintain backwards compatibility, Bootstrap will be maintained under the Semantic Versioning guidelines as much as possible.
## Bugs and feature requests
Releases will be numbered with the follow format:
Have a bug or a feature request? Please first read the [issue guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md#using-the-issue-tracker) and search for existing and closed issues. If your problem or idea is not addressed yet, [please open a new issue](https://github.com/twbs/bootstrap/issues/new).
## Documentation
Bootstrap's documentation, included in this repo in the root directory, is built with [Jekyll](http://jekyllrb.com) and publicly hosted on GitHub Pages at <http://getbootstrap.com>. The docs may also be run locally.
### Running documentation locally
1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v1.x).
- **Windows users:** Read [this unofficial guide](https://github.com/juthilo/run-jekyll-on-windows/) to get Jekyll up and running without problems. We use Pygments for syntax highlighting, so make sure to read the sections on installing Python and Pygments.
2. From the root `/bootstrap` directory, run `jekyll serve` in the command line.
- **Windows users:** While we use Jekyll's `encoding` setting, you might still need to change the command prompt's character encoding ([code page](http://en.wikipedia.org/wiki/Windows_code_page)) to UTF-8 so Jekyll runs without errors. For Ruby 2.0.0, run `chcp 65001` first. For Ruby 1.9.3, you can alternatively do `SET LANG=en_EN.UTF-8`.
3. Open <http://localhost:9001> in your browser, and voilà.
Learn more about using Jekyll by reading its [documentation](http://jekyllrb.com/docs/home/).
### Documentation for previous releases
Documentation for v2.3.2 has been made available for the time being at <http://getbootstrap.com/2.3.2/> while folks transition to Bootstrap 3.
[Previous releases](https://github.com/twbs/bootstrap/releases) and their documentation are also available for download.
## Compiling CSS and JavaScript
Bootstrap uses [Grunt](http://gruntjs.com/) with convenient methods for working with the framework. It's how we compile our code, run tests, and more. To use it, install the required dependencies as directed and then run some Grunt commands.
### Install Grunt
From the command line:
1. Install `grunt-cli` globally with `npm install -g grunt-cli`.
2. Navigate to the root `/bootstrap` directory, then run `npm install`. npm will look at [package.json](https://github.com/twbs/bootstrap/blob/master/package.json) and automatically install the necessary local dependencies listed there.
When completed, you'll be able to run the various Grunt commands provided from the command line.
**Unfamiliar with `npm`? Don't have node installed?** That's a-okay. npm stands for [node packaged modules](http://npmjs.org/) and is a way to manage development dependencies through node.js. [Download and install node.js](http://nodejs.org/download/) before proceeding.
### Available Grunt commands
#### Build - `grunt`
Run `grunt` to run tests locally and compile the CSS and JavaScript into `/dist`. **Uses [Less](http://lesscss.org/) and [UglifyJS](http://lisperator.net/uglifyjs/).**
#### Only compile CSS and JavaScript - `grunt dist`
`grunt dist` creates the `/dist` directory with compiled files. **Uses [Less](http://lesscss.org/) and [UglifyJS](http://lisperator.net/uglifyjs/).**
#### Tests - `grunt test`
Runs [JSHint](http://jshint.com) and [QUnit](http://qunitjs.com/) tests headlessly in [PhantomJS](http://phantomjs.org/) (used for CI).
#### Watch - `grunt watch`
This is a convenience method for watching just Less files and automatically building them whenever you save.
### Troubleshooting dependencies
Should you encounter problems with installing dependencies or running Grunt commands, uninstall all previous dependency versions (global and local). Then, rerun `npm install`.
## Contributing
Please read through our [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.
Moreover, if your pull request contains JavaScript patches or features, you must include relevant unit tests. All HTML and CSS should conform to the [Code Guide](http://github.com/mdo/code-guide), maintained by [Mark Otto](http://github.com/mdo).
Editor preferences are available in the [editor config](https://github.com/twbs/bootstrap/blob/master/.editorconfig) for easy use in common text editors. Read more and download plugins at <http://editorconfig.org>.
## Community
Keep track of development and community news.
- Follow [@twbootstrap on Twitter](http://twitter.com/twbootstrap).
- Read and subscribe to [The Official Bootstrap Blog](http://blog.getbootstrap.com).
- Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##twitter-bootstrap` channel.
- Implementation help may be found at Stack Overflow (tagged [`twitter-bootstrap-3`](http://stackoverflow.com/questions/tagged/twitter-bootstrap-3)).
## Versioning
For transparency into our release cycle and in striving to maintain backward compatibility, Bootstrap is maintained under the Semantic Versioning guidelines. Sometimes we screw up, but we'll adhere to these rules whenever possible.
Releases will be numbered with the following format:
`<major>.<minor>.<patch>`
And constructed with the following guidelines:
* Breaking backwards compatibility bumps the major
* New additions without breaking backwards compatibility bumps the minor
* Bug fixes and misc changes bump the patch
- Breaking backward compatibility **bumps the major** while resetting minor and patch
- New additions without breaking backward compatibility **bumps the minor** while resetting the patch
- Bug fixes and misc changes **bumps only the patch**
For more information on SemVer, please visit http://semver.org/.
For more information on SemVer, please visit <http://semver.org/>.
Bug tracker
-----------
Have a bug? Please create an issue here on GitHub!
https://github.com/twitter/bootstrap/issues
Twitter account
---------------
Keep up to date on announcements and more by following Bootstrap on Twitter, <a href="http://twitter.com/TwBootstrap">@TwBootstrap</a>.
Mailing list
------------
Have a question? Ask on our mailing list!
twitter-bootstrap@googlegroups.com
http://groups.google.com/group/twitter-bootstrap
Developers
----------
We have included a makefile with convenience methods for working with the Bootstrap library.
+ **build** - `make`
This will run the less compiler on the bootstrap lib and regenerate the docs dir.
The lessc compiler is required for this command to run.
+ **watch** - `make watch`
This is a convenience method for watching your less files and automatically building them whenever you save.
Watchr is required for this command to run.
Authors
-------
## Authors
**Mark Otto**
+ http://twitter.com/mdo
+ http://github.com/markdotto
- <http://twitter.com/mdo>
- <http://github.com/mdo>
**Jacob Thornton**
+ http://twitter.com/fat
+ http://github.com/fat
- <http://twitter.com/fat>
- <http://github.com/fat>
Copyright and license
---------------------
Copyright 2012 Twitter, Inc.
## Copyright and license
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this work except in compliance with the License.
You may obtain a copy of the License in the LICENSE file, or at:
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Code and documentation copyright 2011-2014 Twitter, Inc. Code released under [the MIT license](LICENSE). Docs released under [Creative Commons](docs/LICENSE).
+37
Ver Arquivo
@@ -0,0 +1,37 @@
# Dependencies
markdown: rdiscount
pygments: true
# Permalinks
permalink: pretty
# Server
source: ./docs
destination: ./_gh_pages
host: 0.0.0.0
port: 9001
baseurl: /
url: http://localhost:9001
encoding: UTF-8
exclude:
- "jade"
- "vendor"
# Custom vars
current_version: 3.1.1
repo: https://github.com/twbs/bootstrap
sass_repo: https://github.com/twbs/bootstrap-sass
download:
source: https://github.com/twbs/bootstrap/archive/v3.1.1.zip
dist: https://github.com/twbs/bootstrap/releases/download/v3.1.1/bootstrap-3.1.1-dist.zip
sass: https://github.com/twbs/bootstrap-sass/archive/v3.1.1.tar.gz
blog: http://blog.getbootstrap.com
expo: http://expo.getbootstrap.com
cdn:
css: //netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css
css_theme: //netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap-theme.min.css
js: //netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js
+24
Ver Arquivo
@@ -0,0 +1,24 @@
{
"name": "bootstrap",
"version": "3.1.1",
"main": [
"./dist/css/bootstrap.css",
"./dist/js/bootstrap.js",
"./dist/fonts/glyphicons-halflings-regular.eot",
"./dist/fonts/glyphicons-halflings-regular.svg",
"./dist/fonts/glyphicons-halflings-regular.ttf",
"./dist/fonts/glyphicons-halflings-regular.woff"
],
"ignore": [
"**/.*",
"_config.yml",
"CNAME",
"composer.json",
"CONTRIBUTING.md",
"docs",
"js/tests"
],
"dependencies": {
"jquery": ">= 1.9.0"
}
}
+25
Ver Arquivo
@@ -0,0 +1,25 @@
{
"name": "twbs/bootstrap",
"description": "Sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development.",
"keywords": ["bootstrap", "css"],
"homepage": "http://getbootstrap.com",
"authors": [
{
"name": "Mark Otto",
"email": "markdotto@gmail.com"
},
{
"name": "Jacob Thornton",
"email": "jacobthornton@gmail.com"
}
],
"support": {
"issues": "https://github.com/twbs/bootstrap/issues"
},
"license": "MIT",
"extra": {
"branch-alias": {
"dev-master": "3.0.x-dev"
}
}
}
+347
Ver Arquivo
@@ -0,0 +1,347 @@
/*!
* Bootstrap v3.1.1 (http://getbootstrap.com)
* Copyright 2011-2014 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
.btn-default,
.btn-primary,
.btn-success,
.btn-info,
.btn-warning,
.btn-danger {
text-shadow: 0 -1px 0 rgba(0, 0, 0, .2);
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
}
.btn-default:active,
.btn-primary:active,
.btn-success:active,
.btn-info:active,
.btn-warning:active,
.btn-danger:active,
.btn-default.active,
.btn-primary.active,
.btn-success.active,
.btn-info.active,
.btn-warning.active,
.btn-danger.active {
-webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
}
.btn:active,
.btn.active {
background-image: none;
}
.btn-default {
text-shadow: 0 1px 0 #fff;
background-image: -webkit-linear-gradient(top, #fff 0%, #e0e0e0 100%);
background-image: linear-gradient(to bottom, #fff 0%, #e0e0e0 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
background-repeat: repeat-x;
border-color: #dbdbdb;
border-color: #ccc;
}
.btn-default:hover,
.btn-default:focus {
background-color: #e0e0e0;
background-position: 0 -15px;
}
.btn-default:active,
.btn-default.active {
background-color: #e0e0e0;
border-color: #dbdbdb;
}
.btn-primary {
background-image: -webkit-linear-gradient(top, #428bca 0%, #2d6ca2 100%);
background-image: linear-gradient(to bottom, #428bca 0%, #2d6ca2 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff2d6ca2', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
background-repeat: repeat-x;
border-color: #2b669a;
}
.btn-primary:hover,
.btn-primary:focus {
background-color: #2d6ca2;
background-position: 0 -15px;
}
.btn-primary:active,
.btn-primary.active {
background-color: #2d6ca2;
border-color: #2b669a;
}
.btn-success {
background-image: -webkit-linear-gradient(top, #5cb85c 0%, #419641 100%);
background-image: linear-gradient(to bottom, #5cb85c 0%, #419641 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
background-repeat: repeat-x;
border-color: #3e8f3e;
}
.btn-success:hover,
.btn-success:focus {
background-color: #419641;
background-position: 0 -15px;
}
.btn-success:active,
.btn-success.active {
background-color: #419641;
border-color: #3e8f3e;
}
.btn-info {
background-image: -webkit-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
background-image: linear-gradient(to bottom, #5bc0de 0%, #2aabd2 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
background-repeat: repeat-x;
border-color: #28a4c9;
}
.btn-info:hover,
.btn-info:focus {
background-color: #2aabd2;
background-position: 0 -15px;
}
.btn-info:active,
.btn-info.active {
background-color: #2aabd2;
border-color: #28a4c9;
}
.btn-warning {
background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
background-image: linear-gradient(to bottom, #f0ad4e 0%, #eb9316 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
background-repeat: repeat-x;
border-color: #e38d13;
}
.btn-warning:hover,
.btn-warning:focus {
background-color: #eb9316;
background-position: 0 -15px;
}
.btn-warning:active,
.btn-warning.active {
background-color: #eb9316;
border-color: #e38d13;
}
.btn-danger {
background-image: -webkit-linear-gradient(top, #d9534f 0%, #c12e2a 100%);
background-image: linear-gradient(to bottom, #d9534f 0%, #c12e2a 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
background-repeat: repeat-x;
border-color: #b92c28;
}
.btn-danger:hover,
.btn-danger:focus {
background-color: #c12e2a;
background-position: 0 -15px;
}
.btn-danger:active,
.btn-danger.active {
background-color: #c12e2a;
border-color: #b92c28;
}
.thumbnail,
.img-thumbnail {
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
}
.dropdown-menu > li > a:hover,
.dropdown-menu > li > a:focus {
background-color: #e8e8e8;
background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
background-repeat: repeat-x;
}
.dropdown-menu > .active > a,
.dropdown-menu > .active > a:hover,
.dropdown-menu > .active > a:focus {
background-color: #357ebd;
background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%);
background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
background-repeat: repeat-x;
}
.navbar-default {
background-image: -webkit-linear-gradient(top, #fff 0%, #f8f8f8 100%);
background-image: linear-gradient(to bottom, #fff 0%, #f8f8f8 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
background-repeat: repeat-x;
border-radius: 4px;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075);
}
.navbar-default .navbar-nav > .active > a {
background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f3f3f3 100%);
background-image: linear-gradient(to bottom, #ebebeb 0%, #f3f3f3 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff3f3f3', GradientType=0);
background-repeat: repeat-x;
-webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
}
.navbar-brand,
.navbar-nav > li > a {
text-shadow: 0 1px 0 rgba(255, 255, 255, .25);
}
.navbar-inverse {
background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #222 100%);
background-image: linear-gradient(to bottom, #3c3c3c 0%, #222 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
background-repeat: repeat-x;
}
.navbar-inverse .navbar-nav > .active > a {
background-image: -webkit-linear-gradient(top, #222 0%, #282828 100%);
background-image: linear-gradient(to bottom, #222 0%, #282828 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff282828', GradientType=0);
background-repeat: repeat-x;
-webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
}
.navbar-inverse .navbar-brand,
.navbar-inverse .navbar-nav > li > a {
text-shadow: 0 -1px 0 rgba(0, 0, 0, .25);
}
.navbar-static-top,
.navbar-fixed-top,
.navbar-fixed-bottom {
border-radius: 0;
}
.alert {
text-shadow: 0 1px 0 rgba(255, 255, 255, .2);
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
}
.alert-success {
background-image: -webkit-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
background-image: linear-gradient(to bottom, #dff0d8 0%, #c8e5bc 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);
background-repeat: repeat-x;
border-color: #b2dba1;
}
.alert-info {
background-image: -webkit-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
background-image: linear-gradient(to bottom, #d9edf7 0%, #b9def0 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);
background-repeat: repeat-x;
border-color: #9acfea;
}
.alert-warning {
background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
background-image: linear-gradient(to bottom, #fcf8e3 0%, #f8efc0 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);
background-repeat: repeat-x;
border-color: #f5e79e;
}
.alert-danger {
background-image: -webkit-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
background-image: linear-gradient(to bottom, #f2dede 0%, #e7c3c3 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);
background-repeat: repeat-x;
border-color: #dca7a7;
}
.progress {
background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
background-image: linear-gradient(to bottom, #ebebeb 0%, #f5f5f5 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);
background-repeat: repeat-x;
}
.progress-bar {
background-image: -webkit-linear-gradient(top, #428bca 0%, #3071a9 100%);
background-image: linear-gradient(to bottom, #428bca 0%, #3071a9 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0);
background-repeat: repeat-x;
}
.progress-bar-success {
background-image: -webkit-linear-gradient(top, #5cb85c 0%, #449d44 100%);
background-image: linear-gradient(to bottom, #5cb85c 0%, #449d44 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);
background-repeat: repeat-x;
}
.progress-bar-info {
background-image: -webkit-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
background-image: linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
background-repeat: repeat-x;
}
.progress-bar-warning {
background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
background-image: linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);
background-repeat: repeat-x;
}
.progress-bar-danger {
background-image: -webkit-linear-gradient(top, #d9534f 0%, #c9302c 100%);
background-image: linear-gradient(to bottom, #d9534f 0%, #c9302c 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);
background-repeat: repeat-x;
}
.list-group {
border-radius: 4px;
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
}
.list-group-item.active,
.list-group-item.active:hover,
.list-group-item.active:focus {
text-shadow: 0 -1px 0 #3071a9;
background-image: -webkit-linear-gradient(top, #428bca 0%, #3278b3 100%);
background-image: linear-gradient(to bottom, #428bca 0%, #3278b3 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0);
background-repeat: repeat-x;
border-color: #3278b3;
}
.panel {
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
}
.panel-default > .panel-heading {
background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
background-repeat: repeat-x;
}
.panel-primary > .panel-heading {
background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%);
background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
background-repeat: repeat-x;
}
.panel-success > .panel-heading {
background-image: -webkit-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
background-image: linear-gradient(to bottom, #dff0d8 0%, #d0e9c6 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);
background-repeat: repeat-x;
}
.panel-info > .panel-heading {
background-image: -webkit-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
background-image: linear-gradient(to bottom, #d9edf7 0%, #c4e3f3 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);
background-repeat: repeat-x;
}
.panel-warning > .panel-heading {
background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
background-image: linear-gradient(to bottom, #fcf8e3 0%, #faf2cc 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);
background-repeat: repeat-x;
}
.panel-danger > .panel-heading {
background-image: -webkit-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
background-image: linear-gradient(to bottom, #f2dede 0%, #ebcccc 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);
background-repeat: repeat-x;
}
.well {
background-image: -webkit-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
background-image: linear-gradient(to bottom, #e8e8e8 0%, #f5f5f5 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);
background-repeat: repeat-x;
border-color: #dcdcdc;
-webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1);
box-shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1);
}
/*# sourceMappingURL=bootstrap-theme.css.map */
Diff do arquivo suprimido porque uma ou mais linhas são muito longas
Diff do arquivo suprimido porque uma ou mais linhas são muito longas
+5785
Ver Arquivo
Diferenças do arquivo suprimidas por serem muito extensas Carregar Diff
+1
Ver Arquivo
Diff do arquivo suprimido porque uma ou mais linhas são muito longas
+7
Ver Arquivo
Diff do arquivo suprimido porque uma ou mais linhas são muito longas
Arquivo binário não exibido.
+229
Ver Arquivo
@@ -0,0 +1,229 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg xmlns="http://www.w3.org/2000/svg">
<metadata></metadata>
<defs>
<font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
<font-face units-per-em="1200" ascent="960" descent="-240" />
<missing-glyph horiz-adv-x="500" />
<glyph />
<glyph />
<glyph unicode="&#xd;" />
<glyph unicode=" " />
<glyph unicode="*" d="M100 500v200h259l-183 183l141 141l183 -183v259h200v-259l183 183l141 -141l-183 -183h259v-200h-259l183 -183l-141 -141l-183 183v-259h-200v259l-183 -183l-141 141l183 183h-259z" />
<glyph unicode="+" d="M0 400v300h400v400h300v-400h400v-300h-400v-400h-300v400h-400z" />
<glyph unicode="&#xa0;" />
<glyph unicode="&#x2000;" horiz-adv-x="652" />
<glyph unicode="&#x2001;" horiz-adv-x="1304" />
<glyph unicode="&#x2002;" horiz-adv-x="652" />
<glyph unicode="&#x2003;" horiz-adv-x="1304" />
<glyph unicode="&#x2004;" horiz-adv-x="434" />
<glyph unicode="&#x2005;" horiz-adv-x="326" />
<glyph unicode="&#x2006;" horiz-adv-x="217" />
<glyph unicode="&#x2007;" horiz-adv-x="217" />
<glyph unicode="&#x2008;" horiz-adv-x="163" />
<glyph unicode="&#x2009;" horiz-adv-x="260" />
<glyph unicode="&#x200a;" horiz-adv-x="72" />
<glyph unicode="&#x202f;" horiz-adv-x="260" />
<glyph unicode="&#x205f;" horiz-adv-x="326" />
<glyph unicode="&#x20ac;" d="M100 500l100 100h113q0 47 5 100h-218l100 100h135q37 167 112 257q117 141 297 141q242 0 354 -189q60 -103 66 -209h-181q0 55 -25.5 99t-63.5 68t-75 36.5t-67 12.5q-24 0 -52.5 -10t-62.5 -32t-65.5 -67t-50.5 -107h379l-100 -100h-300q-6 -46 -6 -100h406l-100 -100 h-300q9 -74 33 -132t52.5 -91t62 -54.5t59 -29t46.5 -7.5q29 0 66 13t75 37t63.5 67.5t25.5 96.5h174q-31 -172 -128 -278q-107 -117 -274 -117q-205 0 -324 158q-36 46 -69 131.5t-45 205.5h-217z" />
<glyph unicode="&#x2212;" d="M200 400h900v300h-900v-300z" />
<glyph unicode="&#x25fc;" horiz-adv-x="500" d="M0 0z" />
<glyph unicode="&#x2601;" d="M-14 494q0 -80 56.5 -137t135.5 -57h750q120 0 205 86.5t85 207.5t-85 207t-205 86q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5z" />
<glyph unicode="&#x2709;" d="M0 100l400 400l200 -200l200 200l400 -400h-1200zM0 300v600l300 -300zM0 1100l600 -603l600 603h-1200zM900 600l300 300v-600z" />
<glyph unicode="&#x270f;" d="M-13 -13l333 112l-223 223zM187 403l214 -214l614 614l-214 214zM887 1103l214 -214l99 92q13 13 13 32.5t-13 33.5l-153 153q-15 13 -33 13t-33 -13z" />
<glyph unicode="&#xe001;" d="M0 1200h1200l-500 -550v-550h300v-100h-800v100h300v550z" />
<glyph unicode="&#xe002;" d="M14 84q18 -55 86 -75.5t147 5.5q65 21 109 69t44 90v606l600 155v-521q-64 16 -138 -7q-79 -26 -122.5 -83t-25.5 -111q18 -55 86 -75.5t147 4.5q70 23 111.5 63.5t41.5 95.5v881q0 10 -7 15.5t-17 2.5l-752 -193q-10 -3 -17 -12.5t-7 -19.5v-689q-64 17 -138 -7 q-79 -25 -122.5 -82t-25.5 -112z" />
<glyph unicode="&#xe003;" d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233z" />
<glyph unicode="&#xe005;" d="M100 784q0 64 28 123t73 100.5t104.5 64t119 20.5t120 -38.5t104.5 -104.5q48 69 109.5 105t121.5 38t118.5 -20.5t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-149.5 152.5t-126.5 127.5 t-94 124.5t-33.5 117.5z" />
<glyph unicode="&#xe006;" d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1z" />
<glyph unicode="&#xe007;" d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1zM237 700l196 -142l-73 -226l192 140l195 -141l-74 229l193 140h-235l-77 211l-78 -211h-239z" />
<glyph unicode="&#xe008;" d="M0 0v143l400 257v100q-37 0 -68.5 74.5t-31.5 125.5v200q0 124 88 212t212 88t212 -88t88 -212v-200q0 -51 -31.5 -125.5t-68.5 -74.5v-100l400 -257v-143h-1200z" />
<glyph unicode="&#xe009;" d="M0 0v1100h1200v-1100h-1200zM100 100h100v100h-100v-100zM100 300h100v100h-100v-100zM100 500h100v100h-100v-100zM100 700h100v100h-100v-100zM100 900h100v100h-100v-100zM300 100h600v400h-600v-400zM300 600h600v400h-600v-400zM1000 100h100v100h-100v-100z M1000 300h100v100h-100v-100zM1000 500h100v100h-100v-100zM1000 700h100v100h-100v-100zM1000 900h100v100h-100v-100z" />
<glyph unicode="&#xe010;" d="M0 50v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5zM0 650v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5zM600 50v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5zM600 650v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5z" />
<glyph unicode="&#xe011;" d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5zM0 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5 t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5 v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 450v200q0 21 14.5 35.5t35.5 14.5h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5z" />
<glyph unicode="&#xe012;" d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 450q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v200q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5 t-14.5 -35.5v-200zM0 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5 t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM400 450v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM400 850v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5 v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5z" />
<glyph unicode="&#xe013;" d="M29 454l419 -420l818 820l-212 212l-607 -607l-206 207z" />
<glyph unicode="&#xe014;" d="M106 318l282 282l-282 282l212 212l282 -282l282 282l212 -212l-282 -282l282 -282l-212 -212l-282 282l-282 -282z" />
<glyph unicode="&#xe015;" d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233zM300 600v200h100v100h200v-100h100v-200h-100v-100h-200v100h-100z" />
<glyph unicode="&#xe016;" d="M23 694q0 200 142 342t342 142t342 -142t142 -342q0 -141 -78 -262l300 -299q7 -7 7 -18t-7 -18l-109 -109q-8 -8 -18 -8t-18 8l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 694q0 -136 97 -233t234 -97t233.5 97t96.5 233t-96.5 233t-233.5 97t-234 -97 t-97 -233zM300 601h400v200h-400v-200z" />
<glyph unicode="&#xe017;" d="M23 600q0 183 105 331t272 210v-166q-103 -55 -165 -155t-62 -220q0 -177 125 -302t302 -125t302 125t125 302q0 120 -62 220t-165 155v166q167 -62 272 -210t105 -331q0 -118 -45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5 zM500 750q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v400q0 21 -14.5 35.5t-35.5 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-400z" />
<glyph unicode="&#xe018;" d="M100 1h200v300h-200v-300zM400 1v500h200v-500h-200zM700 1v800h200v-800h-200zM1000 1v1200h200v-1200h-200z" />
<glyph unicode="&#xe019;" d="M26 601q0 -33 6 -74l151 -38l2 -6q14 -49 38 -93l3 -5l-80 -134q45 -59 105 -105l133 81l5 -3q45 -26 94 -39l5 -2l38 -151q40 -5 74 -5q27 0 74 5l38 151l6 2q46 13 93 39l5 3l134 -81q56 44 104 105l-80 134l3 5q24 44 39 93l1 6l152 38q5 40 5 74q0 28 -5 73l-152 38 l-1 6q-16 51 -39 93l-3 5l80 134q-44 58 -104 105l-134 -81l-5 3q-45 25 -93 39l-6 1l-38 152q-40 5 -74 5q-27 0 -74 -5l-38 -152l-5 -1q-50 -14 -94 -39l-5 -3l-133 81q-59 -47 -105 -105l80 -134l-3 -5q-25 -47 -38 -93l-2 -6l-151 -38q-6 -48 -6 -73zM385 601 q0 88 63 151t152 63t152 -63t63 -151q0 -89 -63 -152t-152 -63t-152 63t-63 152z" />
<glyph unicode="&#xe020;" d="M100 1025v50q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-50q0 -11 -7 -18t-18 -7h-1050q-11 0 -18 7t-7 18zM200 100v800h900v-800q0 -41 -29.5 -71t-70.5 -30h-700q-41 0 -70.5 30 t-29.5 71zM300 100h100v700h-100v-700zM500 100h100v700h-100v-700zM500 1100h300v100h-300v-100zM700 100h100v700h-100v-700zM900 100h100v700h-100v-700z" />
<glyph unicode="&#xe021;" d="M1 601l656 644l644 -644h-200v-600h-300v400h-300v-400h-300v600h-200z" />
<glyph unicode="&#xe022;" d="M100 25v1150q0 11 7 18t18 7h475v-500h400v-675q0 -11 -7 -18t-18 -7h-850q-11 0 -18 7t-7 18zM700 800v300l300 -300h-300z" />
<glyph unicode="&#xe023;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM500 500v400h100 v-300h200v-100h-300z" />
<glyph unicode="&#xe024;" d="M-100 0l431 1200h209l-21 -300h162l-20 300h208l431 -1200h-538l-41 400h-242l-40 -400h-539zM488 500h224l-27 300h-170z" />
<glyph unicode="&#xe025;" d="M0 0v400h490l-290 300h200v500h300v-500h200l-290 -300h490v-400h-1100zM813 200h175v100h-175v-100z" />
<glyph unicode="&#xe026;" d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233 47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM188 600q0 -170 121 -291t291 -121t291 121t121 291t-121 291t-291 121 t-291 -121t-121 -291zM350 600h150v300h200v-300h150l-250 -300z" />
<glyph unicode="&#xe027;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM350 600l250 300 l250 -300h-150v-300h-200v300h-150z" />
<glyph unicode="&#xe028;" d="M0 25v475l200 700h800l199 -700l1 -475q0 -11 -7 -18t-18 -7h-1150q-11 0 -18 7t-7 18zM200 500h200l50 -200h300l50 200h200l-97 500h-606z" />
<glyph unicode="&#xe029;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM500 397v401 l297 -200z" />
<glyph unicode="&#xe030;" d="M23 600q0 -118 45.5 -224.5t123 -184t184 -123t224.5 -45.5t224.5 45.5t184 123t123 184t45.5 224.5h-150q0 -177 -125 -302t-302 -125t-302 125t-125 302t125 302t302 125q136 0 246 -81l-146 -146h400v400l-145 -145q-157 122 -355 122q-118 0 -224.5 -45.5t-184 -123 t-123 -184t-45.5 -224.5z" />
<glyph unicode="&#xe031;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5q198 0 355 -122l145 145v-400h-400l147 147q-112 80 -247 80q-177 0 -302 -125t-125 -302h-150zM100 0v400h400l-147 -147q112 -80 247 -80q177 0 302 125t125 302h150q0 -118 -45.5 -224.5t-123 -184t-184 -123 t-224.5 -45.5q-198 0 -355 122z" />
<glyph unicode="&#xe032;" d="M100 0h1100v1200h-1100v-1200zM200 100v900h900v-900h-900zM300 200v100h100v-100h-100zM300 400v100h100v-100h-100zM300 600v100h100v-100h-100zM300 800v100h100v-100h-100zM500 200h500v100h-500v-100zM500 400v100h500v-100h-500zM500 600v100h500v-100h-500z M500 800v100h500v-100h-500z" />
<glyph unicode="&#xe033;" d="M0 100v600q0 41 29.5 70.5t70.5 29.5h100v200q0 82 59 141t141 59h300q82 0 141 -59t59 -141v-200h100q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-900q-41 0 -70.5 29.5t-29.5 70.5zM400 800h300v150q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-150z" />
<glyph unicode="&#xe034;" d="M100 0v1100h100v-1100h-100zM300 400q60 60 127.5 84t127.5 17.5t122 -23t119 -30t110 -11t103 42t91 120.5v500q-40 -81 -101.5 -115.5t-127.5 -29.5t-138 25t-139.5 40t-125.5 25t-103 -29.5t-65 -115.5v-500z" />
<glyph unicode="&#xe035;" d="M0 275q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v300q0 127 70.5 231.5t184.5 161.5t245 57t245 -57t184.5 -161.5t70.5 -231.5v-300q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v300q0 116 -49.5 227t-131 192.5t-192.5 131t-227 49.5t-227 -49.5t-192.5 -131t-131 -192.5 t-49.5 -227v-300zM200 20v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14zM800 20v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14z" />
<glyph unicode="&#xe036;" d="M0 400h300l300 -200v800l-300 -200h-300v-400zM688 459l141 141l-141 141l71 71l141 -141l141 141l71 -71l-141 -141l141 -141l-71 -71l-141 141l-141 -141z" />
<glyph unicode="&#xe037;" d="M0 400h300l300 -200v800l-300 -200h-300v-400zM700 857l69 53q111 -135 111 -310q0 -169 -106 -302l-67 54q86 110 86 248q0 146 -93 257z" />
<glyph unicode="&#xe038;" d="M0 401v400h300l300 200v-800l-300 200h-300zM702 858l69 53q111 -135 111 -310q0 -170 -106 -303l-67 55q86 110 86 248q0 145 -93 257zM889 951l7 -8q123 -151 123 -344q0 -189 -119 -339l-7 -8l81 -66l6 8q142 178 142 405q0 230 -144 408l-6 8z" />
<glyph unicode="&#xe039;" d="M0 0h500v500h-200v100h-100v-100h-200v-500zM0 600h100v100h400v100h100v100h-100v300h-500v-600zM100 100v300h300v-300h-300zM100 800v300h300v-300h-300zM200 200v100h100v-100h-100zM200 900h100v100h-100v-100zM500 500v100h300v-300h200v-100h-100v-100h-200v100 h-100v100h100v200h-200zM600 0v100h100v-100h-100zM600 1000h100v-300h200v-300h300v200h-200v100h200v500h-600v-200zM800 800v300h300v-300h-300zM900 0v100h300v-100h-300zM900 900v100h100v-100h-100zM1100 200v100h100v-100h-100z" />
<glyph unicode="&#xe040;" d="M0 200h100v1000h-100v-1000zM100 0v100h300v-100h-300zM200 200v1000h100v-1000h-100zM500 0v91h100v-91h-100zM500 200v1000h200v-1000h-200zM700 0v91h100v-91h-100zM800 200v1000h100v-1000h-100zM900 0v91h200v-91h-200zM1000 200v1000h200v-1000h-200z" />
<glyph unicode="&#xe041;" d="M0 700l1 475q0 10 7.5 17.5t17.5 7.5h474l700 -700l-500 -500zM148 953q0 -42 29 -71q30 -30 71.5 -30t71.5 30q29 29 29 71t-29 71q-30 30 -71.5 30t-71.5 -30q-29 -29 -29 -71z" />
<glyph unicode="&#xe042;" d="M1 700l1 475q0 11 7 18t18 7h474l700 -700l-500 -500zM148 953q0 -42 30 -71q29 -30 71 -30t71 30q30 29 30 71t-30 71q-29 30 -71 30t-71 -30q-30 -29 -30 -71zM701 1200h100l700 -700l-500 -500l-50 50l450 450z" />
<glyph unicode="&#xe043;" d="M100 0v1025l175 175h925v-1000l-100 -100v1000h-750l-100 -100h750v-1000h-900z" />
<glyph unicode="&#xe044;" d="M200 0l450 444l450 -443v1150q0 20 -14.5 35t-35.5 15h-800q-21 0 -35.5 -15t-14.5 -35v-1151z" />
<glyph unicode="&#xe045;" d="M0 100v700h200l100 -200h600l100 200h200v-700h-200v200h-800v-200h-200zM253 829l40 -124h592l62 124l-94 346q-2 11 -10 18t-18 7h-450q-10 0 -18 -7t-10 -18zM281 24l38 152q2 10 11.5 17t19.5 7h500q10 0 19.5 -7t11.5 -17l38 -152q2 -10 -3.5 -17t-15.5 -7h-600 q-10 0 -15.5 7t-3.5 17z" />
<glyph unicode="&#xe046;" d="M0 200q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-150q-4 8 -11.5 21.5t-33 48t-53 61t-69 48t-83.5 21.5h-200q-41 0 -82 -20.5t-70 -50t-52 -59t-34 -50.5l-12 -20h-150q-41 0 -70.5 -29.5t-29.5 -70.5v-600z M356 500q0 100 72 172t172 72t172 -72t72 -172t-72 -172t-172 -72t-172 72t-72 172zM494 500q0 -44 31 -75t75 -31t75 31t31 75t-31 75t-75 31t-75 -31t-31 -75zM900 700v100h100v-100h-100z" />
<glyph unicode="&#xe047;" d="M53 0h365v66q-41 0 -72 11t-49 38t1 71l92 234h391l82 -222q16 -45 -5.5 -88.5t-74.5 -43.5v-66h417v66q-34 1 -74 43q-18 19 -33 42t-21 37l-6 13l-385 998h-93l-399 -1006q-24 -48 -52 -75q-12 -12 -33 -25t-36 -20l-15 -7v-66zM416 521l178 457l46 -140l116 -317h-340 z" />
<glyph unicode="&#xe048;" d="M100 0v89q41 7 70.5 32.5t29.5 65.5v827q0 28 -1 39.5t-5.5 26t-15.5 21t-29 14t-49 14.5v71l471 -1q120 0 213 -88t93 -228q0 -55 -11.5 -101.5t-28 -74t-33.5 -47.5t-28 -28l-12 -7q8 -3 21.5 -9t48 -31.5t60.5 -58t47.5 -91.5t21.5 -129q0 -84 -59 -156.5t-142 -111 t-162 -38.5h-500zM400 200h161q89 0 153 48.5t64 132.5q0 90 -62.5 154.5t-156.5 64.5h-159v-400zM400 700h139q76 0 130 61.5t54 138.5q0 82 -84 130.5t-239 48.5v-379z" />
<glyph unicode="&#xe049;" d="M200 0v57q77 7 134.5 40.5t65.5 80.5l173 849q10 56 -10 74t-91 37q-6 1 -10.5 2.5t-9.5 2.5v57h425l2 -57q-33 -8 -62 -25.5t-46 -37t-29.5 -38t-17.5 -30.5l-5 -12l-128 -825q-10 -52 14 -82t95 -36v-57h-500z" />
<glyph unicode="&#xe050;" d="M-75 200h75v800h-75l125 167l125 -167h-75v-800h75l-125 -167zM300 900v300h150h700h150v-300h-50q0 29 -8 48.5t-18.5 30t-33.5 15t-39.5 5.5t-50.5 1h-200v-850l100 -50v-100h-400v100l100 50v850h-200q-34 0 -50.5 -1t-40 -5.5t-33.5 -15t-18.5 -30t-8.5 -48.5h-49z " />
<glyph unicode="&#xe051;" d="M33 51l167 125v-75h800v75l167 -125l-167 -125v75h-800v-75zM100 901v300h150h700h150v-300h-50q0 29 -8 48.5t-18 30t-33.5 15t-40 5.5t-50.5 1h-200v-650l100 -50v-100h-400v100l100 50v650h-200q-34 0 -50.5 -1t-39.5 -5.5t-33.5 -15t-18.5 -30t-8 -48.5h-50z" />
<glyph unicode="&#xe052;" d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 350q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM0 650q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1000q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 950q0 -20 14.5 -35t35.5 -15h600q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-600q-21 0 -35.5 -14.5 t-14.5 -35.5v-100z" />
<glyph unicode="&#xe053;" d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 650q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM200 350q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM200 950q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5 t-14.5 -35.5v-100z" />
<glyph unicode="&#xe054;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1000q-21 0 -35.5 15 t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-600 q-21 0 -35.5 15t-14.5 35z" />
<glyph unicode="&#xe055;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100 q-21 0 -35.5 15t-14.5 35z" />
<glyph unicode="&#xe056;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15 t-14.5 35zM300 50v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800 q-21 0 -35.5 15t-14.5 35zM300 650v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM300 950v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15 h-800q-21 0 -35.5 15t-14.5 35z" />
<glyph unicode="&#xe057;" d="M-101 500v100h201v75l166 -125l-166 -125v75h-201zM300 0h100v1100h-100v-1100zM500 50q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 350q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35 v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 650q0 -20 14.5 -35t35.5 -15h500q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 950q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35v100 q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100z" />
<glyph unicode="&#xe058;" d="M1 50q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 350q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 650 q0 -20 14.5 -35t35.5 -15h500q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 950q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM801 0v1100h100v-1100 h-100zM934 550l167 -125v75h200v100h-200v75z" />
<glyph unicode="&#xe059;" d="M0 275v650q0 31 22 53t53 22h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53zM900 600l300 300v-600z" />
<glyph unicode="&#xe060;" d="M0 44v1012q0 18 13 31t31 13h1112q19 0 31.5 -13t12.5 -31v-1012q0 -18 -12.5 -31t-31.5 -13h-1112q-18 0 -31 13t-13 31zM100 263l247 182l298 -131l-74 156l293 318l236 -288v500h-1000v-737zM208 750q0 56 39 95t95 39t95 -39t39 -95t-39 -95t-95 -39t-95 39t-39 95z " />
<glyph unicode="&#xe062;" d="M148 745q0 124 60.5 231.5t165 172t226.5 64.5q123 0 227 -63t164.5 -169.5t60.5 -229.5t-73 -272q-73 -114 -166.5 -237t-150.5 -189l-57 -66q-10 9 -27 26t-66.5 70.5t-96 109t-104 135.5t-100.5 155q-63 139 -63 262zM342 772q0 -107 75.5 -182.5t181.5 -75.5 q107 0 182.5 75.5t75.5 182.5t-75.5 182t-182.5 75t-182 -75.5t-75 -181.5z" />
<glyph unicode="&#xe063;" d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233 47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM173 600q0 -177 125.5 -302t301.5 -125v854q-176 0 -301.5 -125 t-125.5 -302z" />
<glyph unicode="&#xe064;" d="M117 406q0 94 34 186t88.5 172.5t112 159t115 177t87.5 194.5q21 -71 57.5 -142.5t76 -130.5t83 -118.5t82 -117t70 -116t50 -125.5t18.5 -136q0 -89 -39 -165.5t-102 -126.5t-140 -79.5t-156 -33.5q-114 6 -211.5 53t-161.5 139t-64 210zM243 414q14 -82 59.5 -136 t136.5 -80l16 98q-7 6 -18 17t-34 48t-33 77q-15 73 -14 143.5t10 122.5l9 51q-92 -110 -119.5 -185t-12.5 -156z" />
<glyph unicode="&#xe065;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5q366 -6 397 -14l-186 -186h-311q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v125l200 200v-225q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM436 341l161 50l412 412l-114 113l-405 -405zM995 1015l113 -113l113 113l-21 85l-92 28z" />
<glyph unicode="&#xe066;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h261l2 -80q-133 -32 -218 -120h-145q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-53q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5 zM423 524q30 38 81.5 64t103 35.5t99 14t77.5 3.5l29 -1v-209l360 324l-359 318v-216q-7 0 -19 -1t-48 -8t-69.5 -18.5t-76.5 -37t-76.5 -59t-62 -88t-39.5 -121.5z" />
<glyph unicode="&#xe067;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q61 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-169q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM342 632l283 -284l567 567l-137 137l-430 -431l-146 147z" />
<glyph unicode="&#xe068;" d="M0 603l300 296v-198h200v200h-200l300 300l295 -300h-195v-200h200v198l300 -296l-300 -300v198h-200v-200h195l-295 -300l-300 300h200v200h-200v-198z" />
<glyph unicode="&#xe069;" d="M200 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-1100l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z" />
<glyph unicode="&#xe070;" d="M0 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-487l500 487v-1100l-500 488v-488l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z" />
<glyph unicode="&#xe071;" d="M136 550l564 550v-487l500 487v-1100l-500 488v-488z" />
<glyph unicode="&#xe072;" d="M200 0l900 550l-900 550v-1100z" />
<glyph unicode="&#xe073;" d="M200 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5t-14.5 -35.5v-800zM600 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-800z" />
<glyph unicode="&#xe074;" d="M200 150q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35v800q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5v-800z" />
<glyph unicode="&#xe075;" d="M0 0v1100l500 -487v487l564 -550l-564 -550v488z" />
<glyph unicode="&#xe076;" d="M0 0v1100l500 -487v487l500 -487v437q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-500 -488v488z" />
<glyph unicode="&#xe077;" d="M300 0v1100l500 -487v437q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438z" />
<glyph unicode="&#xe078;" d="M100 250v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5zM100 500h1100l-550 564z" />
<glyph unicode="&#xe079;" d="M185 599l592 -592l240 240l-353 353l353 353l-240 240z" />
<glyph unicode="&#xe080;" d="M272 194l353 353l-353 353l241 240l572 -571l21 -22l-1 -1v-1l-592 -591z" />
<glyph unicode="&#xe081;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM300 500h200v-200h200v200h200v200h-200v200h-200v-200h-200v-200z" />
<glyph unicode="&#xe082;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM300 500h600v200h-600v-200z" />
<glyph unicode="&#xe083;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM246 459l213 -213l141 142l141 -142l213 213l-142 141l142 141l-213 212l-141 -141l-141 142l-212 -213l141 -141 z" />
<glyph unicode="&#xe084;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM270 551l276 -277l411 411l-175 174l-236 -236l-102 102z" />
<glyph unicode="&#xe085;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM364 700h143q4 0 11.5 -1t11 -1t6.5 3t3 9t1 11t3.5 8.5t3.5 6t5.5 4t6.5 2.5t9 1.5t9 0.5h11.5h12.5 q19 0 30 -10t11 -26q0 -22 -4 -28t-27 -22q-5 -1 -12.5 -3t-27 -13.5t-34 -27t-26.5 -46t-11 -68.5h200q5 3 14 8t31.5 25.5t39.5 45.5t31 69t14 94q0 51 -17.5 89t-42 58t-58.5 32t-58.5 15t-51.5 3q-50 0 -90.5 -12t-75 -38.5t-53.5 -74.5t-19 -114zM500 300h200v100h-200 v-100z" />
<glyph unicode="&#xe086;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM400 300h400v100h-100v300h-300v-100h100v-200h-100v-100zM500 800h200v100h-200v-100z" />
<glyph unicode="&#xe087;" d="M0 500v200h195q31 125 98.5 199.5t206.5 100.5v200h200v-200q54 -20 113 -60t112.5 -105.5t71.5 -134.5h203v-200h-203q-25 -102 -116.5 -186t-180.5 -117v-197h-200v197q-140 27 -208 102.5t-98 200.5h-194zM290 500q24 -73 79.5 -127.5t130.5 -78.5v206h200v-206 q149 48 201 206h-201v200h200q-25 74 -75.5 127t-124.5 77v-204h-200v203q-75 -23 -130 -77t-79 -126h209v-200h-210z" />
<glyph unicode="&#xe088;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM356 465l135 135 l-135 135l109 109l135 -135l135 135l109 -109l-135 -135l135 -135l-109 -109l-135 135l-135 -135z" />
<glyph unicode="&#xe089;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM322 537l141 141 l87 -87l204 205l142 -142l-346 -345z" />
<glyph unicode="&#xe090;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -115 62 -215l568 567q-100 62 -216 62q-171 0 -292.5 -121.5t-121.5 -292.5zM391 245q97 -59 209 -59q171 0 292.5 121.5t121.5 292.5 q0 112 -59 209z" />
<glyph unicode="&#xe091;" d="M0 547l600 453v-300h600v-300h-600v-301z" />
<glyph unicode="&#xe092;" d="M0 400v300h600v300l600 -453l-600 -448v301h-600z" />
<glyph unicode="&#xe093;" d="M204 600l450 600l444 -600h-298v-600h-300v600h-296z" />
<glyph unicode="&#xe094;" d="M104 600h296v600h300v-600h298l-449 -600z" />
<glyph unicode="&#xe095;" d="M0 200q6 132 41 238.5t103.5 193t184 138t271.5 59.5v271l600 -453l-600 -448v301q-95 -2 -183 -20t-170 -52t-147 -92.5t-100 -135.5z" />
<glyph unicode="&#xe096;" d="M0 0v400l129 -129l294 294l142 -142l-294 -294l129 -129h-400zM635 777l142 -142l294 294l129 -129v400h-400l129 -129z" />
<glyph unicode="&#xe097;" d="M34 176l295 295l-129 129h400v-400l-129 130l-295 -295zM600 600v400l129 -129l295 295l142 -141l-295 -295l129 -130h-400z" />
<glyph unicode="&#xe101;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM456 851l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5 t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5h-207q-21 0 -33 -14.5t-8 -34.5zM500 300h200v100h-200v-100z" />
<glyph unicode="&#xe102;" d="M0 800h100v-200h400v300h200v-300h400v200h100v100h-111q1 1 1 6.5t-1.5 15t-3.5 17.5l-34 172q-11 39 -41.5 63t-69.5 24q-32 0 -61 -17l-239 -144q-22 -13 -40 -35q-19 24 -40 36l-238 144q-33 18 -62 18q-39 0 -69.5 -23t-40.5 -61l-35 -177q-2 -8 -3 -18t-1 -15v-6 h-111v-100zM100 0h400v400h-400v-400zM200 900q-3 0 14 48t36 96l18 47l213 -191h-281zM700 0v400h400v-400h-400zM731 900l202 197q5 -12 12 -32.5t23 -64t25 -72t7 -28.5h-269z" />
<glyph unicode="&#xe103;" d="M0 -22v143l216 193q-9 53 -13 83t-5.5 94t9 113t38.5 114t74 124q47 60 99.5 102.5t103 68t127.5 48t145.5 37.5t184.5 43.5t220 58.5q0 -189 -22 -343t-59 -258t-89 -181.5t-108.5 -120t-122 -68t-125.5 -30t-121.5 -1.5t-107.5 12.5t-87.5 17t-56.5 7.5l-99 -55z M238.5 300.5q19.5 -6.5 86.5 76.5q55 66 367 234q70 38 118.5 69.5t102 79t99 111.5t86.5 148q22 50 24 60t-6 19q-7 5 -17 5t-26.5 -14.5t-33.5 -39.5q-35 -51 -113.5 -108.5t-139.5 -89.5l-61 -32q-369 -197 -458 -401q-48 -111 -28.5 -117.5z" />
<glyph unicode="&#xe104;" d="M111 408q0 -33 5 -63q9 -56 44 -119.5t105 -108.5q31 -21 64 -16t62 23.5t57 49.5t48 61.5t35 60.5q32 66 39 184.5t-13 157.5q79 -80 122 -164t26 -184q-5 -33 -20.5 -69.5t-37.5 -80.5q-10 -19 -14.5 -29t-12 -26t-9 -23.5t-3 -19t2.5 -15.5t11 -9.5t19.5 -5t30.5 2.5 t42 8q57 20 91 34t87.5 44.5t87 64t65.5 88.5t47 122q38 172 -44.5 341.5t-246.5 278.5q22 -44 43 -129q39 -159 -32 -154q-15 2 -33 9q-79 33 -120.5 100t-44 175.5t48.5 257.5q-13 -8 -34 -23.5t-72.5 -66.5t-88.5 -105.5t-60 -138t-8 -166.5q2 -12 8 -41.5t8 -43t6 -39.5 t3.5 -39.5t-1 -33.5t-6 -31.5t-13.5 -24t-21 -20.5t-31 -12q-38 -10 -67 13t-40.5 61.5t-15 81.5t10.5 75q-52 -46 -83.5 -101t-39 -107t-7.5 -85z" />
<glyph unicode="&#xe105;" d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5t145.5 -23.5t132.5 -59t116.5 -83.5t97 -90t74.5 -85.5t49 -63.5t20 -30l26 -40l-26 -40q-6 -10 -20 -30t-49 -63.5t-74.5 -85.5t-97 -90t-116.5 -83.5t-132.5 -59t-145.5 -23.5 t-145.5 23.5t-132.5 59t-116.5 83.5t-97 90t-74.5 85.5t-49 63.5t-20 30zM120 600q7 -10 40.5 -58t56 -78.5t68 -77.5t87.5 -75t103 -49.5t125 -21.5t123.5 20t100.5 45.5t85.5 71.5t66.5 75.5t58 81.5t47 66q-1 1 -28.5 37.5t-42 55t-43.5 53t-57.5 63.5t-58.5 54 q49 -74 49 -163q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 85 46 158q-102 -87 -226 -258zM377 656q49 -124 154 -191l105 105q-37 24 -75 72t-57 84l-20 36z" />
<glyph unicode="&#xe106;" d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5q61 0 121 -17l37 142h148l-314 -1200h-148l37 143q-82 21 -165 71.5t-140 102t-109.5 112t-72 88.5t-29.5 43zM120 600q210 -282 393 -336l37 141q-107 18 -178.5 101.5t-71.5 193.5 q0 85 46 158q-102 -87 -226 -258zM377 656q49 -124 154 -191l47 47l23 87q-30 28 -59 69t-44 68l-14 26zM780 161l38 145q22 15 44.5 34t46 44t40.5 44t41 50.5t33.5 43.5t33 44t24.5 34q-97 127 -140 175l39 146q67 -54 131.5 -125.5t87.5 -103.5t36 -52l26 -40l-26 -40 q-7 -12 -25.5 -38t-63.5 -79.5t-95.5 -102.5t-124 -100t-146.5 -79z" />
<glyph unicode="&#xe107;" d="M-97.5 34q13.5 -34 50.5 -34h1294q37 0 50.5 35.5t-7.5 67.5l-642 1056q-20 34 -48 36.5t-48 -29.5l-642 -1066q-21 -32 -7.5 -66zM155 200l445 723l445 -723h-345v100h-200v-100h-345zM500 600l100 -300l100 300v100h-200v-100z" />
<glyph unicode="&#xe108;" d="M100 262v41q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44t106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -91 100 -113v-64q0 -20 -13 -28.5t-32 0.5l-94 78h-222l-94 -78q-19 -9 -32 -0.5t-13 28.5 v64q0 22 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5z" />
<glyph unicode="&#xe109;" d="M0 50q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v750h-1100v-750zM0 900h1100v150q0 21 -14.5 35.5t-35.5 14.5h-150v100h-100v-100h-500v100h-100v-100h-150q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 100v100h100v-100h-100zM100 300v100h100v-100h-100z M100 500v100h100v-100h-100zM300 100v100h100v-100h-100zM300 300v100h100v-100h-100zM300 500v100h100v-100h-100zM500 100v100h100v-100h-100zM500 300v100h100v-100h-100zM500 500v100h100v-100h-100zM700 100v100h100v-100h-100zM700 300v100h100v-100h-100zM700 500 v100h100v-100h-100zM900 100v100h100v-100h-100zM900 300v100h100v-100h-100zM900 500v100h100v-100h-100z" />
<glyph unicode="&#xe110;" d="M0 200v200h259l600 600h241v198l300 -295l-300 -300v197h-159l-600 -600h-341zM0 800h259l122 -122l141 142l-181 180h-341v-200zM678 381l141 142l122 -123h159v198l300 -295l-300 -300v197h-241z" />
<glyph unicode="&#xe111;" d="M0 400v600q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5z" />
<glyph unicode="&#xe112;" d="M100 600v200h300v-250q0 -113 6 -145q17 -92 102 -117q39 -11 92 -11q37 0 66.5 5.5t50 15.5t36 24t24 31.5t14 37.5t7 42t2.5 45t0 47v25v250h300v-200q0 -42 -3 -83t-15 -104t-31.5 -116t-58 -109.5t-89 -96.5t-129 -65.5t-174.5 -25.5t-174.5 25.5t-129 65.5t-89 96.5 t-58 109.5t-31.5 116t-15 104t-3 83zM100 900v300h300v-300h-300zM800 900v300h300v-300h-300z" />
<glyph unicode="&#xe113;" d="M-30 411l227 -227l352 353l353 -353l226 227l-578 579z" />
<glyph unicode="&#xe114;" d="M70 797l580 -579l578 579l-226 227l-353 -353l-352 353z" />
<glyph unicode="&#xe115;" d="M-198 700l299 283l300 -283h-203v-400h385l215 -200h-800v600h-196zM402 1000l215 -200h381v-400h-198l299 -283l299 283h-200v600h-796z" />
<glyph unicode="&#xe116;" d="M18 939q-5 24 10 42q14 19 39 19h896l38 162q5 17 18.5 27.5t30.5 10.5h94q20 0 35 -14.5t15 -35.5t-15 -35.5t-35 -14.5h-54l-201 -961q-2 -4 -6 -10.5t-19 -17.5t-33 -11h-31v-50q0 -20 -14.5 -35t-35.5 -15t-35.5 15t-14.5 35v50h-300v-50q0 -20 -14.5 -35t-35.5 -15 t-35.5 15t-14.5 35v50h-50q-21 0 -35.5 15t-14.5 35q0 21 14.5 35.5t35.5 14.5h535l48 200h-633q-32 0 -54.5 21t-27.5 43z" />
<glyph unicode="&#xe117;" d="M0 0v800h1200v-800h-1200zM0 900v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-100h-1200z" />
<glyph unicode="&#xe118;" d="M1 0l300 700h1200l-300 -700h-1200zM1 400v600h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-200h-1000z" />
<glyph unicode="&#xe119;" d="M302 300h198v600h-198l298 300l298 -300h-198v-600h198l-298 -300z" />
<glyph unicode="&#xe120;" d="M0 600l300 298v-198h600v198l300 -298l-300 -297v197h-600v-197z" />
<glyph unicode="&#xe121;" d="M0 100v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM31 400l172 739q5 22 23 41.5t38 19.5h672q19 0 37.5 -22.5t23.5 -45.5l172 -732h-1138zM800 100h100v100h-100v-100z M1000 100h100v100h-100v-100z" />
<glyph unicode="&#xe122;" d="M-101 600v50q0 24 25 49t50 38l25 13v-250l-11 5.5t-24 14t-30 21.5t-24 27.5t-11 31.5zM100 500v250v8v8v7t0.5 7t1.5 5.5t2 5t3 4t4.5 3.5t6 1.5t7.5 0.5h200l675 250v-850l-675 200h-38l47 -276q2 -12 -3 -17.5t-11 -6t-21 -0.5h-8h-83q-20 0 -34.5 14t-18.5 35 q-55 337 -55 351zM1100 200v850q0 21 14.5 35.5t35.5 14.5q20 0 35 -14.5t15 -35.5v-850q0 -20 -15 -35t-35 -15q-21 0 -35.5 15t-14.5 35z" />
<glyph unicode="&#xe123;" d="M74 350q0 21 13.5 35.5t33.5 14.5h18l117 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3 32t29 13h94q20 0 29 -10.5t3 -29.5q-18 -36 -18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q20 0 33.5 -14.5t13.5 -35.5q0 -20 -13 -40t-31 -27q-8 -3 -23 -8.5 t-65 -20t-103 -25t-132.5 -19.5t-158.5 -9q-125 0 -245.5 20.5t-178.5 40.5l-58 20q-18 7 -31 27.5t-13 40.5zM497 110q12 -49 40 -79.5t63 -30.5t63 30.5t39 79.5q-48 -6 -102 -6t-103 6z" />
<glyph unicode="&#xe124;" d="M21 445l233 -45l-78 -224l224 78l45 -233l155 179l155 -179l45 233l224 -78l-78 224l234 45l-180 155l180 156l-234 44l78 225l-224 -78l-45 233l-155 -180l-155 180l-45 -233l-224 78l78 -225l-233 -44l179 -156z" />
<glyph unicode="&#xe125;" d="M0 200h200v600h-200v-600zM300 275q0 -75 100 -75h61q124 -100 139 -100h250q46 0 83 57l238 344q29 31 29 74v100q0 44 -30.5 84.5t-69.5 40.5h-328q28 118 28 125v150q0 44 -30.5 84.5t-69.5 40.5h-50q-27 0 -51 -20t-38 -48l-96 -198l-145 -196q-20 -26 -20 -63v-400z M400 300v375l150 213l100 212h50v-175l-50 -225h450v-125l-250 -375h-214l-136 100h-100z" />
<glyph unicode="&#xe126;" d="M0 400v600h200v-600h-200zM300 525v400q0 75 100 75h61q124 100 139 100h250q46 0 83 -57l238 -344q29 -31 29 -74v-100q0 -44 -30.5 -84.5t-69.5 -40.5h-328q28 -118 28 -125v-150q0 -44 -30.5 -84.5t-69.5 -40.5h-50q-27 0 -51 20t-38 48l-96 198l-145 196 q-20 26 -20 63zM400 525l150 -212l100 -213h50v175l-50 225h450v125l-250 375h-214l-136 -100h-100v-375z" />
<glyph unicode="&#xe127;" d="M8 200v600h200v-600h-200zM308 275v525q0 17 14 35.5t28 28.5l14 9l362 230q14 6 25 6q17 0 29 -12l109 -112q14 -14 14 -34q0 -18 -11 -32l-85 -121h302q85 0 138.5 -38t53.5 -110t-54.5 -111t-138.5 -39h-107l-130 -339q-7 -22 -20.5 -41.5t-28.5 -19.5h-341 q-7 0 -90 81t-83 94zM408 289l100 -89h293l131 339q6 21 19.5 41t28.5 20h203q16 0 25 15t9 36q0 20 -9 34.5t-25 14.5h-457h-6.5h-7.5t-6.5 0.5t-6 1t-5 1.5t-5.5 2.5t-4 4t-4 5.5q-5 12 -5 20q0 14 10 27l147 183l-86 83l-339 -236v-503z" />
<glyph unicode="&#xe128;" d="M-101 651q0 72 54 110t139 38l302 -1l-85 121q-11 16 -11 32q0 21 14 34l109 113q13 12 29 12q11 0 25 -6l365 -230q7 -4 17 -10.5t26.5 -26t16.5 -36.5v-526q0 -13 -86 -93.5t-94 -80.5h-341q-16 0 -29.5 20t-19.5 41l-130 339h-107q-84 0 -139 39t-55 111zM-1 601h222 q15 0 28.5 -20.5t19.5 -40.5l131 -339h293l107 89v502l-343 237l-87 -83l145 -184q10 -11 10 -26q0 -11 -5 -20q-1 -3 -3.5 -5.5l-4 -4t-5 -2.5t-5.5 -1.5t-6.5 -1t-6.5 -0.5h-7.5h-6.5h-476v-100zM1000 201v600h200v-600h-200z" />
<glyph unicode="&#xe129;" d="M97 719l230 -363q4 -6 10.5 -15.5t26 -25t36.5 -15.5h525q13 0 94 83t81 90v342q0 15 -20 28.5t-41 19.5l-339 131v106q0 84 -39 139t-111 55t-110 -53.5t-38 -138.5v-302l-121 84q-15 12 -33.5 11.5t-32.5 -13.5l-112 -110q-22 -22 -6 -53zM172 739l83 86l183 -146 q22 -18 47 -5q3 1 5.5 3.5l4 4t2.5 5t1.5 5.5t1 6.5t0.5 6.5v7.5v6.5v456q0 22 25 31t50 -0.5t25 -30.5v-202q0 -16 20 -29.5t41 -19.5l339 -130v-294l-89 -100h-503zM400 0v200h600v-200h-600z" />
<glyph unicode="&#xe130;" d="M2 585q-16 -31 6 -53l112 -110q13 -13 32 -13.5t34 10.5l121 85q0 -51 -0.5 -153.5t-0.5 -148.5q0 -84 38.5 -138t110.5 -54t111 55t39 139v106l339 131q20 6 40.5 19.5t20.5 28.5v342q0 7 -81 90t-94 83h-525q-17 0 -35.5 -14t-28.5 -28l-10 -15zM77 565l236 339h503 l89 -100v-294l-340 -130q-20 -6 -40 -20t-20 -29v-202q0 -22 -25 -31t-50 0t-25 31v456v14.5t-1.5 11.5t-5 12t-9.5 7q-24 13 -46 -5l-184 -146zM305 1104v200h600v-200h-600z" />
<glyph unicode="&#xe131;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM298 701l2 -201h300l-2 -194l402 294l-402 298v-197h-300z" />
<glyph unicode="&#xe132;" d="M0 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t231.5 47.5q122 0 232.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-218 -217.5t-300 -80t-299.5 80t-217.5 217.5t-80 299.5zM200 600l402 -294l-2 194h300l2 201h-300v197z" />
<glyph unicode="&#xe133;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600h200v-300h200v300h200l-300 400z" />
<glyph unicode="&#xe134;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600l300 -400l300 400h-200v300h-200v-300h-200z" />
<glyph unicode="&#xe135;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q121 0 231.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM254 780q-8 -33 5.5 -92.5t7.5 -87.5q0 -9 17 -44t16 -60 q12 0 23 -5.5t23 -15t20 -13.5q24 -12 108 -42q22 -8 53 -31.5t59.5 -38.5t57.5 -11q8 -18 -15 -55t-20 -57q42 -71 87 -80q0 -6 -3 -15.5t-3.5 -14.5t4.5 -17q104 -3 221 112q30 29 47 47t34.5 49t20.5 62q-14 9 -37 9.5t-36 7.5q-14 7 -49 15t-52 19q-9 0 -39.5 -0.5 t-46.5 -1.5t-39 -6.5t-39 -16.5q-50 -35 -66 -12q-4 2 -3.5 25.5t0.5 25.5q-6 13 -26.5 17t-24.5 7q2 22 -2 41t-16.5 28t-38.5 -20q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q12 -19 32 -37.5t34 -27.5l14 -8q0 3 9.5 39.5t5.5 57.5 q-4 23 14.5 44.5t22.5 31.5q5 14 10 35t8.5 31t15.5 22.5t34 21.5q-6 18 10 37q8 0 23.5 -1.5t24.5 -1.5t20.5 4.5t20.5 15.5q-10 23 -30.5 42.5t-38 30t-49 26.5t-43.5 23q11 39 2 44q31 -13 58 -14.5t39 3.5l11 4q7 36 -16.5 53.5t-64.5 28.5t-56 23q-19 -3 -37 0 q-15 -12 -36.5 -21t-34.5 -12t-44 -8t-39 -6q-15 -3 -45.5 0.5t-45.5 -2.5q-21 -7 -52 -26.5t-34 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -90.5t-29.5 -79.5zM518 916q3 12 16 30t16 25q10 -10 18.5 -10t14 6t14.5 14.5t16 12.5q0 -24 17 -66.5t17 -43.5 q-9 2 -31 5t-36 5t-32 8t-30 14zM692 1003h1h-1z" />
<glyph unicode="&#xe136;" d="M0 164.5q0 21.5 15 37.5l600 599q-33 101 6 201.5t135 154.5q164 92 306 -9l-259 -138l145 -232l251 126q13 -175 -151 -267q-123 -70 -253 -23l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5z" />
<glyph unicode="&#xe137;" horiz-adv-x="1220" d="M0 196v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 596v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5zM0 996v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM600 596h500v100h-500v-100zM800 196h300v100h-300v-100zM900 996h200v100h-200v-100z" />
<glyph unicode="&#xe138;" d="M100 1100v100h1000v-100h-1000zM150 1000h900l-350 -500v-300l-200 -200v500z" />
<glyph unicode="&#xe139;" d="M0 200v200h1200v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500z M500 1000h200v100h-200v-100z" />
<glyph unicode="&#xe140;" d="M0 0v400l129 -129l200 200l142 -142l-200 -200l129 -129h-400zM0 800l129 129l200 -200l142 142l-200 200l129 129h-400v-400zM729 329l142 142l200 -200l129 129v-400h-400l129 129zM729 871l200 200l-129 129h400v-400l-129 129l-200 -200z" />
<glyph unicode="&#xe141;" d="M0 596q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 596q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM291 655 q0 23 15.5 38.5t38.5 15.5t39 -16t16 -38q0 -23 -16 -39t-39 -16q-22 0 -38 16t-16 39zM400 850q0 22 16 38.5t39 16.5q22 0 38 -16t16 -39t-16 -39t-38 -16q-23 0 -39 16.5t-16 38.5zM514 609q0 32 20.5 56.5t51.5 29.5l122 126l1 1q-9 14 -9 28q0 22 16 38.5t39 16.5 q22 0 38 -16t16 -39t-16 -39t-38 -16q-14 0 -29 10l-55 -145q17 -22 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5zM800 655q0 22 16 38t39 16t38.5 -15.5t15.5 -38.5t-16 -39t-38 -16q-23 0 -39 16t-16 39z" />
<glyph unicode="&#xe142;" d="M-40 375q-13 -95 35 -173q35 -57 94 -89t129 -32q63 0 119 28q33 16 65 40.5t52.5 45.5t59.5 64q40 44 57 61l394 394q35 35 47 84t-3 96q-27 87 -117 104q-20 2 -29 2q-46 0 -78.5 -16.5t-67.5 -51.5l-389 -396l-7 -7l69 -67l377 373q20 22 39 38q23 23 50 23 q38 0 53 -36q16 -39 -20 -75l-547 -547q-52 -52 -125 -52q-55 0 -100 33t-54 96q-5 35 2.5 66t31.5 63t42 50t56 54q24 21 44 41l348 348q52 52 82.5 79.5t84 54t107.5 26.5q25 0 48 -4q95 -17 154 -94.5t51 -175.5q-7 -101 -98 -192l-252 -249l-253 -256l7 -7l69 -60 l517 511q67 67 95 157t11 183q-16 87 -67 154t-130 103q-69 33 -152 33q-107 0 -197 -55q-40 -24 -111 -95l-512 -512q-68 -68 -81 -163z" />
<glyph unicode="&#xe143;" d="M80 784q0 131 98.5 229.5t230.5 98.5q143 0 241 -129q103 129 246 129q129 0 226 -98.5t97 -229.5q0 -46 -17.5 -91t-61 -99t-77 -89.5t-104.5 -105.5q-197 -191 -293 -322l-17 -23l-16 23q-43 58 -100 122.5t-92 99.5t-101 100q-71 70 -104.5 105.5t-77 89.5t-61 99 t-17.5 91zM250 784q0 -27 30.5 -70t61.5 -75.5t95 -94.5l22 -22q93 -90 190 -201q82 92 195 203l12 12q64 62 97.5 97t64.5 79t31 72q0 71 -48 119.5t-105 48.5q-74 0 -132 -83l-118 -171l-114 174q-51 80 -123 80q-60 0 -109.5 -49.5t-49.5 -118.5z" />
<glyph unicode="&#xe144;" d="M57 353q0 -95 66 -159l141 -142q68 -66 159 -66q93 0 159 66l283 283q66 66 66 159t-66 159l-141 141q-8 9 -19 17l-105 -105l212 -212l-389 -389l-247 248l95 95l-18 18q-46 45 -75 101l-55 -55q-66 -66 -66 -159zM269 706q0 -93 66 -159l141 -141q7 -7 19 -17l105 105 l-212 212l389 389l247 -247l-95 -96l18 -17q47 -49 77 -100l29 29q35 35 62.5 88t27.5 96q0 93 -66 159l-141 141q-66 66 -159 66q-95 0 -159 -66l-283 -283q-66 -64 -66 -159z" />
<glyph unicode="&#xe145;" d="M200 100v953q0 21 30 46t81 48t129 38t163 15t162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5zM300 300h600v700h-600v-700zM496 150q0 -43 30.5 -73.5t73.5 -30.5t73.5 30.5t30.5 73.5t-30.5 73.5t-73.5 30.5 t-73.5 -30.5t-30.5 -73.5z" />
<glyph unicode="&#xe146;" d="M0 0l303 380l207 208l-210 212h300l267 279l-35 36q-15 14 -15 35t15 35q14 15 35 15t35 -15l283 -282q15 -15 15 -36t-15 -35q-14 -15 -35 -15t-35 15l-36 35l-279 -267v-300l-212 210l-208 -207z" />
<glyph unicode="&#xe148;" d="M295 433h139q5 -77 48.5 -126.5t117.5 -64.5v335q-6 1 -15.5 4t-11.5 3q-46 14 -79 26.5t-72 36t-62.5 52t-40 72.5t-16.5 99q0 92 44 159.5t109 101t144 40.5v78h100v-79q38 -4 72.5 -13.5t75.5 -31.5t71 -53.5t51.5 -84t24.5 -118.5h-159q-8 72 -35 109.5t-101 50.5 v-307l64 -14q34 -7 64 -16.5t70 -31.5t67.5 -52t47.5 -80.5t20 -112.5q0 -139 -89 -224t-244 -96v-77h-100v78q-152 17 -237 104q-40 40 -52.5 93.5t-15.5 139.5zM466 889q0 -29 8 -51t16.5 -34t29.5 -22.5t31 -13.5t38 -10q7 -2 11 -3v274q-61 -8 -97.5 -37.5t-36.5 -102.5 zM700 237q170 18 170 151q0 64 -44 99.5t-126 60.5v-311z" />
<glyph unicode="&#xe149;" d="M100 600v100h166q-24 49 -44 104q-10 26 -14.5 55.5t-3 72.5t25 90t68.5 87q97 88 263 88q129 0 230 -89t101 -208h-153q0 52 -34 89.5t-74 51.5t-76 14q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -28 16.5 -69.5t28 -62.5t41.5 -72h241v-100h-197q8 -50 -2.5 -115 t-31.5 -94q-41 -59 -99 -113q35 11 84 18t70 7q33 1 103 -16t103 -17q76 0 136 30l50 -147q-41 -25 -80.5 -36.5t-59 -13t-61.5 -1.5q-23 0 -128 33t-155 29q-39 -4 -82 -17t-66 -25l-24 -11l-55 145l16.5 11t15.5 10t13.5 9.5t14.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221z" />
<glyph unicode="&#xe150;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM602 900l298 300l298 -300h-198v-900h-200v900h-198z" />
<glyph unicode="&#xe151;" d="M2 300h198v900h200v-900h198l-298 -300zM700 0v200h100v-100h200v-100h-300zM700 400v100h300v-200h-99v-100h-100v100h99v100h-200zM700 700v500h300v-500h-100v100h-100v-100h-100zM801 900h100v200h-100v-200z" />
<glyph unicode="&#xe152;" d="M2 300h198v900h200v-900h198l-298 -300zM700 0v500h300v-500h-100v100h-100v-100h-100zM700 700v200h100v-100h200v-100h-300zM700 1100v100h300v-200h-99v-100h-100v100h99v100h-200zM801 200h100v200h-100v-200z" />
<glyph unicode="&#xe153;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM800 100v400h300v-500h-100v100h-200zM800 1100v100h200v-500h-100v400h-100zM901 200h100v200h-100v-200z" />
<glyph unicode="&#xe154;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM800 400v100h200v-500h-100v400h-100zM800 800v400h300v-500h-100v100h-200zM901 900h100v200h-100v-200z" />
<glyph unicode="&#xe155;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM700 100v200h500v-200h-500zM700 400v200h400v-200h-400zM700 700v200h300v-200h-300zM700 1000v200h200v-200h-200z" />
<glyph unicode="&#xe156;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM700 100v200h200v-200h-200zM700 400v200h300v-200h-300zM700 700v200h400v-200h-400zM700 1000v200h500v-200h-500z" />
<glyph unicode="&#xe157;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q162 0 281 -118.5t119 -281.5v-300q0 -165 -118.5 -282.5t-281.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500z" />
<glyph unicode="&#xe158;" d="M0 400v300q0 163 119 281.5t281 118.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-163 0 -281.5 117.5t-118.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM400 300l333 250l-333 250v-500z" />
<glyph unicode="&#xe159;" d="M0 400v300q0 163 117.5 281.5t282.5 118.5h300q163 0 281.5 -119t118.5 -281v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 700l250 -333l250 333h-500z" />
<glyph unicode="&#xe160;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -162 -118.5 -281t-281.5 -119h-300q-165 0 -282.5 118.5t-117.5 281.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 400h500l-250 333z" />
<glyph unicode="&#xe161;" d="M0 400v300h300v200l400 -350l-400 -350v200h-300zM500 0v200h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-500v200h400q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-400z" />
<glyph unicode="&#xe162;" d="M217 519q8 -19 31 -19h302q-155 -438 -160 -458q-5 -21 4 -32l9 -8h9q14 0 26 15q11 13 274.5 321.5t264.5 308.5q14 19 5 36q-8 17 -31 17l-301 -1q1 4 78 219.5t79 227.5q2 15 -5 27l-9 9h-9q-15 0 -25 -16q-4 -6 -98 -111.5t-228.5 -257t-209.5 -237.5q-16 -19 -6 -41 z" />
<glyph unicode="&#xe163;" d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q47 0 100 15v185h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h500v185q-14 4 -114 7.5t-193 5.5l-93 2q-165 0 -282.5 -117.5t-117.5 -282.5v-300zM600 400v300h300v200l400 -350l-400 -350v200h-300z " />
<glyph unicode="&#xe164;" d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q163 0 281.5 117.5t118.5 282.5v98l-78 73l-122 -123v-148q0 -41 -29.5 -70.5t-70.5 -29.5h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h156l118 122l-74 78h-100q-165 0 -282.5 -117.5t-117.5 -282.5 v-300zM496 709l353 342l-149 149h500v-500l-149 149l-342 -353z" />
<glyph unicode="&#xe165;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM406 600 q0 80 57 137t137 57t137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137z" />
<glyph unicode="&#xe166;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 800l445 -500l450 500h-295v400h-300v-400h-300zM900 150h100v50h-100v-50z" />
<glyph unicode="&#xe167;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 700h300v-300h300v300h295l-445 500zM900 150h100v50h-100v-50z" />
<glyph unicode="&#xe168;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 705l305 -305l596 596l-154 155l-442 -442l-150 151zM900 150h100v50h-100v-50z" />
<glyph unicode="&#xe169;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 988l97 -98l212 213l-97 97zM200 400l697 1l3 699l-250 -239l-149 149l-212 -212l149 -149zM900 150h100v50h-100v-50z" />
<glyph unicode="&#xe170;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM200 612l212 -212l98 97l-213 212zM300 1200l239 -250l-149 -149l212 -212l149 148l249 -237l-1 697zM900 150h100v50h-100v-50z" />
<glyph unicode="&#xe171;" d="M23 415l1177 784v-1079l-475 272l-310 -393v416h-392zM494 210l672 938l-672 -712v-226z" />
<glyph unicode="&#xe172;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-850q0 -21 -15 -35.5t-35 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 1000h100v200h-100v-200z" />
<glyph unicode="&#xe173;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-218l-276 -275l-120 120l-126 -127h-378v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM581 306l123 123l120 -120l353 352l123 -123l-475 -476zM600 1000h100v200h-100v-200z" />
<glyph unicode="&#xe174;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-269l-103 -103l-170 170l-298 -298h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 1000h100v200h-100v-200zM700 133l170 170l-170 170l127 127l170 -170l170 170l127 -128l-170 -169l170 -170 l-127 -127l-170 170l-170 -170z" />
<glyph unicode="&#xe175;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-300h-400v-200h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 300l300 -300l300 300h-200v300h-200v-300h-200zM600 1000v200h100v-200h-100z" />
<glyph unicode="&#xe176;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-402l-200 200l-298 -298h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 300h200v-300h200v300h200l-300 300zM600 1000v200h100v-200h-100z" />
<glyph unicode="&#xe177;" d="M0 250q0 -21 14.5 -35.5t35.5 -14.5h1100q21 0 35.5 14.5t14.5 35.5v550h-1200v-550zM0 900h1200v150q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 300v200h400v-200h-400z" />
<glyph unicode="&#xe178;" d="M0 400l300 298v-198h400v-200h-400v-198zM100 800v200h100v-200h-100zM300 800v200h100v-200h-100zM500 800v200h400v198l300 -298l-300 -298v198h-400zM800 300v200h100v-200h-100zM1000 300h100v200h-100v-200z" />
<glyph unicode="&#xe179;" d="M100 700v400l50 100l50 -100v-300h100v300l50 100l50 -100v-300h100v300l50 100l50 -100v-400l-100 -203v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447zM800 597q0 -29 10.5 -55.5t25 -43t29 -28.5t25.5 -18l10 -5v-397q0 -21 14.5 -35.5 t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v1106q0 31 -18 40.5t-44 -7.5l-276 -116q-25 -17 -43.5 -51.5t-18.5 -65.5v-359z" />
<glyph unicode="&#xe180;" d="M100 0h400v56q-75 0 -87.5 6t-12.5 44v394h500v-394q0 -38 -12.5 -44t-87.5 -6v-56h400v56q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v888q0 22 25 34.5t50 13.5l25 2v56h-400v-56q75 0 87.5 -6t12.5 -44v-394h-500v394q0 38 12.5 44t87.5 6v56h-400v-56q4 0 11 -0.5 t24 -3t30 -7t24 -15t11 -24.5v-888q0 -22 -25 -34.5t-50 -13.5l-25 -2v-56z" />
<glyph unicode="&#xe181;" d="M0 300q0 -41 29.5 -70.5t70.5 -29.5h300q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-300q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM100 100h400l200 200h105l295 98v-298h-425l-100 -100h-375zM100 300v200h300v-200h-300zM100 600v200h300v-200h-300z M100 1000h400l200 -200v-98l295 98h105v200h-425l-100 100h-375zM700 402v163l400 133v-163z" />
<glyph unicode="&#xe182;" d="M16.5 974.5q0.5 -21.5 16 -90t46.5 -140t104 -177.5t175 -208q103 -103 207.5 -176t180 -103.5t137 -47t92.5 -16.5l31 1l163 162q17 18 13.5 41t-22.5 37l-192 136q-19 14 -45 12t-42 -19l-118 -118q-142 101 -268 227t-227 268l118 118q17 17 20 41.5t-11 44.5 l-139 194q-14 19 -36.5 22t-40.5 -14l-162 -162q-1 -11 -0.5 -32.5z" />
<glyph unicode="&#xe183;" d="M0 50v212q0 20 10.5 45.5t24.5 39.5l365 303v50q0 4 1 10.5t12 22.5t30 28.5t60 23t97 10.5t97 -10t60 -23.5t30 -27.5t12 -24l1 -10v-50l365 -303q14 -14 24.5 -39.5t10.5 -45.5v-212q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-20 0 -35 14.5t-15 35.5zM0 712 q0 -21 14.5 -33.5t34.5 -8.5l202 33q20 4 34.5 21t14.5 38v146q141 24 300 24t300 -24v-146q0 -21 14.5 -38t34.5 -21l202 -33q20 -4 34.5 8.5t14.5 33.5v200q-6 8 -19 20.5t-63 45t-112 57t-171 45t-235 20.5q-92 0 -175 -10.5t-141.5 -27t-108.5 -36.5t-81.5 -40 t-53.5 -36.5t-31 -27.5l-9 -10v-200z" />
<glyph unicode="&#xe184;" d="M100 0v100h1100v-100h-1100zM175 200h950l-125 150v250l100 100v400h-100v-200h-100v200h-200v-200h-100v200h-200v-200h-100v200h-100v-400l100 -100v-250z" />
<glyph unicode="&#xe185;" d="M100 0h300v400q0 41 -29.5 70.5t-70.5 29.5h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-400zM500 0v1000q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-1000h-300zM900 0v700q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-700h-300z" />
<glyph unicode="&#xe186;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v300h-200v100h200v100h-300v-300h200v-100h-200v-100zM600 300h200v100h100v300h-100v100h-200v-500 zM700 400v300h100v-300h-100z" />
<glyph unicode="&#xe187;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h100v200h100v-200h100v500h-100v-200h-100v200h-100v-500zM600 300h200v100h100v300h-100v100h-200v-500 zM700 400v300h100v-300h-100z" />
<glyph unicode="&#xe188;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v100h-200v300h200v100h-300v-500zM600 300h300v100h-200v300h200v100h-300v-500z" />
<glyph unicode="&#xe189;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 550l300 -150v300zM600 400l300 150l-300 150v-300z" />
<glyph unicode="&#xe190;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300v500h700v-500h-700zM300 400h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130v-300zM575 549 q0 -65 27 -107t68 -42h130v300h-130q-38 0 -66.5 -43t-28.5 -108z" />
<glyph unicode="&#xe191;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v300h-200v100h200v100h-300v-300h200v-100h-200v-100zM601 300h100v100h-100v-100zM700 700h100 v-400h100v500h-200v-100z" />
<glyph unicode="&#xe192;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v400h-200v100h-100v-500zM301 400v200h100v-200h-100zM601 300h100v100h-100v-100zM700 700h100 v-400h100v500h-200v-100z" />
<glyph unicode="&#xe193;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 700v100h300v-300h-99v-100h-100v100h99v200h-200zM201 300v100h100v-100h-100zM601 300v100h100v-100h-100z M700 700v100h200v-500h-100v400h-100z" />
<glyph unicode="&#xe194;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM400 500v200 l100 100h300v-100h-300v-200h300v-100h-300z" />
<glyph unicode="&#xe195;" d="M0 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM400 400v400h300 l100 -100v-100h-100v100h-200v-100h200v-100h-200v-100h-100zM700 400v100h100v-100h-100z" />
<glyph unicode="&#xe197;" d="M-14 494q0 -80 56.5 -137t135.5 -57h222v300h400v-300h128q120 0 205 86.5t85 207.5t-85 207t-205 86q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200h200v300h200v-300h200 l-300 -300z" />
<glyph unicode="&#xe198;" d="M-14 494q0 -80 56.5 -137t135.5 -57h8l414 414l403 -403q94 26 154.5 104.5t60.5 178.5q0 120 -85 206.5t-205 86.5q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200l300 300 l300 -300h-200v-300h-200v300h-200z" />
<glyph unicode="&#xe199;" d="M100 200h400v-155l-75 -45h350l-75 45v155h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170z" />
<glyph unicode="&#xe200;" d="M121 700q0 -53 28.5 -97t75.5 -65q-4 -16 -4 -38q0 -74 52.5 -126.5t126.5 -52.5q56 0 100 30v-306l-75 -45h350l-75 45v306q46 -30 100 -30q74 0 126.5 52.5t52.5 126.5q0 24 -9 55q50 32 79.5 83t29.5 112q0 90 -61.5 155.5t-150.5 71.5q-26 89 -99.5 145.5 t-167.5 56.5q-116 0 -197.5 -81.5t-81.5 -197.5q0 -4 1 -11.5t1 -11.5q-14 2 -23 2q-74 0 -126.5 -52.5t-52.5 -126.5z" />
</font>
</defs></svg>

Depois

Largura:  |  Altura:  |  Tamanho: 62 KiB

Arquivo binário não exibido.
Arquivo binário não exibido.
+1951
Ver Arquivo
Diferenças do arquivo suprimidas por serem muito extensas Carregar Diff
+6
Ver Arquivo
Diff do arquivo suprimido porque uma ou mais linhas são muito longas
+319
Ver Arquivo
@@ -0,0 +1,319 @@
Creative Commons Legal Code
Attribution 3.0 Unported
CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
DAMAGES RESULTING FROM ITS USE.
License
THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
CONDITIONS.
1. Definitions
a. "Adaptation" means a work based upon the Work, or upon the Work and
other pre-existing works, such as a translation, adaptation,
derivative work, arrangement of music or other alterations of a
literary or artistic work, or phonogram or performance and includes
cinematographic adaptations or any other form in which the Work may be
recast, transformed, or adapted including in any form recognizably
derived from the original, except that a work that constitutes a
Collection will not be considered an Adaptation for the purpose of
this License. For the avoidance of doubt, where the Work is a musical
work, performance or phonogram, the synchronization of the Work in
timed-relation with a moving image ("synching") will be considered an
Adaptation for the purpose of this License.
b. "Collection" means a collection of literary or artistic works, such as
encyclopedias and anthologies, or performances, phonograms or
broadcasts, or other works or subject matter other than works listed
in Section 1(f) below, which, by reason of the selection and
arrangement of their contents, constitute intellectual creations, in
which the Work is included in its entirety in unmodified form along
with one or more other contributions, each constituting separate and
independent works in themselves, which together are assembled into a
collective whole. A work that constitutes a Collection will not be
considered an Adaptation (as defined above) for the purposes of this
License.
c. "Distribute" means to make available to the public the original and
copies of the Work or Adaptation, as appropriate, through sale or
other transfer of ownership.
d. "Licensor" means the individual, individuals, entity or entities that
offer(s) the Work under the terms of this License.
e. "Original Author" means, in the case of a literary or artistic work,
the individual, individuals, entity or entities who created the Work
or if no individual or entity can be identified, the publisher; and in
addition (i) in the case of a performance the actors, singers,
musicians, dancers, and other persons who act, sing, deliver, declaim,
play in, interpret or otherwise perform literary or artistic works or
expressions of folklore; (ii) in the case of a phonogram the producer
being the person or legal entity who first fixes the sounds of a
performance or other sounds; and, (iii) in the case of broadcasts, the
organization that transmits the broadcast.
f. "Work" means the literary and/or artistic work offered under the terms
of this License including without limitation any production in the
literary, scientific and artistic domain, whatever may be the mode or
form of its expression including digital form, such as a book,
pamphlet and other writing; a lecture, address, sermon or other work
of the same nature; a dramatic or dramatico-musical work; a
choreographic work or entertainment in dumb show; a musical
composition with or without words; a cinematographic work to which are
assimilated works expressed by a process analogous to cinematography;
a work of drawing, painting, architecture, sculpture, engraving or
lithography; a photographic work to which are assimilated works
expressed by a process analogous to photography; a work of applied
art; an illustration, map, plan, sketch or three-dimensional work
relative to geography, topography, architecture or science; a
performance; a broadcast; a phonogram; a compilation of data to the
extent it is protected as a copyrightable work; or a work performed by
a variety or circus performer to the extent it is not otherwise
considered a literary or artistic work.
g. "You" means an individual or entity exercising rights under this
License who has not previously violated the terms of this License with
respect to the Work, or who has received express permission from the
Licensor to exercise rights under this License despite a previous
violation.
h. "Publicly Perform" means to perform public recitations of the Work and
to communicate to the public those public recitations, by any means or
process, including by wire or wireless means or public digital
performances; to make available to the public Works in such a way that
members of the public may access these Works from a place and at a
place individually chosen by them; to perform the Work to the public
by any means or process and the communication to the public of the
performances of the Work, including by public digital performance; to
broadcast and rebroadcast the Work by any means including signs,
sounds or images.
i. "Reproduce" means to make copies of the Work by any means including
without limitation by sound or visual recordings and the right of
fixation and reproducing fixations of the Work, including storage of a
protected performance or phonogram in digital form or other electronic
medium.
2. Fair Dealing Rights. Nothing in this License is intended to reduce,
limit, or restrict any uses free from copyright or rights arising from
limitations or exceptions that are provided for in connection with the
copyright protection under copyright law or other applicable laws.
3. License Grant. Subject to the terms and conditions of this License,
Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
perpetual (for the duration of the applicable copyright) license to
exercise the rights in the Work as stated below:
a. to Reproduce the Work, to incorporate the Work into one or more
Collections, and to Reproduce the Work as incorporated in the
Collections;
b. to create and Reproduce Adaptations provided that any such Adaptation,
including any translation in any medium, takes reasonable steps to
clearly label, demarcate or otherwise identify that changes were made
to the original Work. For example, a translation could be marked "The
original work was translated from English to Spanish," or a
modification could indicate "The original work has been modified.";
c. to Distribute and Publicly Perform the Work including as incorporated
in Collections; and,
d. to Distribute and Publicly Perform Adaptations.
e. For the avoidance of doubt:
i. Non-waivable Compulsory License Schemes. In those jurisdictions in
which the right to collect royalties through any statutory or
compulsory licensing scheme cannot be waived, the Licensor
reserves the exclusive right to collect such royalties for any
exercise by You of the rights granted under this License;
ii. Waivable Compulsory License Schemes. In those jurisdictions in
which the right to collect royalties through any statutory or
compulsory licensing scheme can be waived, the Licensor waives the
exclusive right to collect such royalties for any exercise by You
of the rights granted under this License; and,
iii. Voluntary License Schemes. The Licensor waives the right to
collect royalties, whether individually or, in the event that the
Licensor is a member of a collecting society that administers
voluntary licensing schemes, via that society, from any exercise
by You of the rights granted under this License.
The above rights may be exercised in all media and formats whether now
known or hereafter devised. The above rights include the right to make
such modifications as are technically necessary to exercise the rights in
other media and formats. Subject to Section 8(f), all rights not expressly
granted by Licensor are hereby reserved.
4. Restrictions. The license granted in Section 3 above is expressly made
subject to and limited by the following restrictions:
a. You may Distribute or Publicly Perform the Work only under the terms
of this License. You must include a copy of, or the Uniform Resource
Identifier (URI) for, this License with every copy of the Work You
Distribute or Publicly Perform. You may not offer or impose any terms
on the Work that restrict the terms of this License or the ability of
the recipient of the Work to exercise the rights granted to that
recipient under the terms of the License. You may not sublicense the
Work. You must keep intact all notices that refer to this License and
to the disclaimer of warranties with every copy of the Work You
Distribute or Publicly Perform. When You Distribute or Publicly
Perform the Work, You may not impose any effective technological
measures on the Work that restrict the ability of a recipient of the
Work from You to exercise the rights granted to that recipient under
the terms of the License. This Section 4(a) applies to the Work as
incorporated in a Collection, but this does not require the Collection
apart from the Work itself to be made subject to the terms of this
License. If You create a Collection, upon notice from any Licensor You
must, to the extent practicable, remove from the Collection any credit
as required by Section 4(b), as requested. If You create an
Adaptation, upon notice from any Licensor You must, to the extent
practicable, remove from the Adaptation any credit as required by
Section 4(b), as requested.
b. If You Distribute, or Publicly Perform the Work or any Adaptations or
Collections, You must, unless a request has been made pursuant to
Section 4(a), keep intact all copyright notices for the Work and
provide, reasonable to the medium or means You are utilizing: (i) the
name of the Original Author (or pseudonym, if applicable) if supplied,
and/or if the Original Author and/or Licensor designate another party
or parties (e.g., a sponsor institute, publishing entity, journal) for
attribution ("Attribution Parties") in Licensor's copyright notice,
terms of service or by other reasonable means, the name of such party
or parties; (ii) the title of the Work if supplied; (iii) to the
extent reasonably practicable, the URI, if any, that Licensor
specifies to be associated with the Work, unless such URI does not
refer to the copyright notice or licensing information for the Work;
and (iv) , consistent with Section 3(b), in the case of an Adaptation,
a credit identifying the use of the Work in the Adaptation (e.g.,
"French translation of the Work by Original Author," or "Screenplay
based on original Work by Original Author"). The credit required by
this Section 4 (b) may be implemented in any reasonable manner;
provided, however, that in the case of a Adaptation or Collection, at
a minimum such credit will appear, if a credit for all contributing
authors of the Adaptation or Collection appears, then as part of these
credits and in a manner at least as prominent as the credits for the
other contributing authors. For the avoidance of doubt, You may only
use the credit required by this Section for the purpose of attribution
in the manner set out above and, by exercising Your rights under this
License, You may not implicitly or explicitly assert or imply any
connection with, sponsorship or endorsement by the Original Author,
Licensor and/or Attribution Parties, as appropriate, of You or Your
use of the Work, without the separate, express prior written
permission of the Original Author, Licensor and/or Attribution
Parties.
c. Except as otherwise agreed in writing by the Licensor or as may be
otherwise permitted by applicable law, if You Reproduce, Distribute or
Publicly Perform the Work either by itself or as part of any
Adaptations or Collections, You must not distort, mutilate, modify or
take other derogatory action in relation to the Work which would be
prejudicial to the Original Author's honor or reputation. Licensor
agrees that in those jurisdictions (e.g. Japan), in which any exercise
of the right granted in Section 3(b) of this License (the right to
make Adaptations) would be deemed to be a distortion, mutilation,
modification or other derogatory action prejudicial to the Original
Author's honor and reputation, the Licensor will waive or not assert,
as appropriate, this Section, to the fullest extent permitted by the
applicable national law, to enable You to reasonably exercise Your
right under Section 3(b) of this License (right to make Adaptations)
but not otherwise.
5. Representations, Warranties and Disclaimer
UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS
BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
7. Termination
a. This License and the rights granted hereunder will terminate
automatically upon any breach by You of the terms of this License.
Individuals or entities who have received Adaptations or Collections
from You under this License, however, will not have their licenses
terminated provided such individuals or entities remain in full
compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will
survive any termination of this License.
b. Subject to the above terms and conditions, the license granted here is
perpetual (for the duration of the applicable copyright in the Work).
Notwithstanding the above, Licensor reserves the right to release the
Work under different license terms or to stop distributing the Work at
any time; provided, however that any such election will not serve to
withdraw this License (or any other license that has been, or is
required to be, granted under the terms of this License), and this
License will continue in full force and effect unless terminated as
stated above.
8. Miscellaneous
a. Each time You Distribute or Publicly Perform the Work or a Collection,
the Licensor offers to the recipient a license to the Work on the same
terms and conditions as the license granted to You under this License.
b. Each time You Distribute or Publicly Perform an Adaptation, Licensor
offers to the recipient a license to the original Work on the same
terms and conditions as the license granted to You under this License.
c. If any provision of this License is invalid or unenforceable under
applicable law, it shall not affect the validity or enforceability of
the remainder of the terms of this License, and without further action
by the parties to this agreement, such provision shall be reformed to
the minimum extent necessary to make such provision valid and
enforceable.
d. No term or provision of this License shall be deemed waived and no
breach consented to unless such waiver or consent shall be in writing
and signed by the party to be charged with such waiver or consent.
e. This License constitutes the entire agreement between the parties with
respect to the Work licensed here. There are no understandings,
agreements or representations with respect to the Work not specified
here. Licensor shall not be bound by any additional provisions that
may appear in any communication from You. This License may not be
modified without the mutual written agreement of the Licensor and You.
f. The rights granted under, and the subject matter referenced, in this
License were drafted utilizing the terminology of the Berne Convention
for the Protection of Literary and Artistic Works (as amended on
September 28, 1979), the Rome Convention of 1961, the WIPO Copyright
Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996
and the Universal Copyright Convention (as revised on July 24, 1971).
These rights and subject matter take effect in the relevant
jurisdiction in which the License terms are sought to be enforced
according to the corresponding provisions of the implementation of
those treaty provisions in the applicable national law. If the
standard suite of rights granted under applicable copyright law
includes additional rights not granted under this License, such
additional rights are deemed to be included in the License; this
License is not intended to restrict the license of any rights under
applicable law.
Creative Commons Notice
Creative Commons is not a party to this License, and makes no warranty
whatsoever in connection with the Work. Creative Commons will not be
liable to You or any party on any legal theory for any damages
whatsoever, including without limitation any general, special,
incidental or consequential damages arising in connection to this
license. Notwithstanding the foregoing two (2) sentences, if Creative
Commons has expressly identified itself as the Licensor hereunder, it
shall have all rights and obligations of Licensor.
Except for the limited purpose of indicating to the public that the
Work is licensed under the CCPL, Creative Commons does not authorize
the use by either party of the trademark "Creative Commons" or any
related trademark or logo of Creative Commons without the prior
written consent of Creative Commons. Any permitted use will be in
compliance with Creative Commons' then-current trademark usage
guidelines, as may be published on its website or otherwise made
available upon request from time to time. For the avoidance of doubt,
this trademark restriction does not form part of this License.
Creative Commons may be contacted at http://creativecommons.org/.
+19
Ver Arquivo
@@ -0,0 +1,19 @@
- name: Mark Otto
user: mdo
gravatar: bc4ab438f7a4ce1c406aadc688427f2c
- name: Jacob Thornton
user: fat
gravatar: a98244cbdacaf1c0b55499466002f7a8
- name: Chris Rebert
user: cvrebert
gravatar: edec428c425453955f770095a7d26c50
- name: Julian Thilo
user: juthilo
gravatar: 0f7dd3ce58a416be5685ea6194f82b11
- name: XhmikosR
user: xhmikosr
gravatar: e37759b1ea0125d4e97b1e00b5eed26f
+203
Ver Arquivo
@@ -0,0 +1,203 @@
# This file is generated via Grunt task. **Do not edit directly.**
# See the 'build-glyphicons-data' task in Gruntfile.js.
- glyphicon-asterisk
- glyphicon-plus
- glyphicon-euro
- glyphicon-minus
- glyphicon-cloud
- glyphicon-envelope
- glyphicon-pencil
- glyphicon-glass
- glyphicon-music
- glyphicon-search
- glyphicon-heart
- glyphicon-star
- glyphicon-star-empty
- glyphicon-user
- glyphicon-film
- glyphicon-th-large
- glyphicon-th
- glyphicon-th-list
- glyphicon-ok
- glyphicon-remove
- glyphicon-zoom-in
- glyphicon-zoom-out
- glyphicon-off
- glyphicon-signal
- glyphicon-cog
- glyphicon-trash
- glyphicon-home
- glyphicon-file
- glyphicon-time
- glyphicon-road
- glyphicon-download-alt
- glyphicon-download
- glyphicon-upload
- glyphicon-inbox
- glyphicon-play-circle
- glyphicon-repeat
- glyphicon-refresh
- glyphicon-list-alt
- glyphicon-lock
- glyphicon-flag
- glyphicon-headphones
- glyphicon-volume-off
- glyphicon-volume-down
- glyphicon-volume-up
- glyphicon-qrcode
- glyphicon-barcode
- glyphicon-tag
- glyphicon-tags
- glyphicon-book
- glyphicon-bookmark
- glyphicon-print
- glyphicon-camera
- glyphicon-font
- glyphicon-bold
- glyphicon-italic
- glyphicon-text-height
- glyphicon-text-width
- glyphicon-align-left
- glyphicon-align-center
- glyphicon-align-right
- glyphicon-align-justify
- glyphicon-list
- glyphicon-indent-left
- glyphicon-indent-right
- glyphicon-facetime-video
- glyphicon-picture
- glyphicon-map-marker
- glyphicon-adjust
- glyphicon-tint
- glyphicon-edit
- glyphicon-share
- glyphicon-check
- glyphicon-move
- glyphicon-step-backward
- glyphicon-fast-backward
- glyphicon-backward
- glyphicon-play
- glyphicon-pause
- glyphicon-stop
- glyphicon-forward
- glyphicon-fast-forward
- glyphicon-step-forward
- glyphicon-eject
- glyphicon-chevron-left
- glyphicon-chevron-right
- glyphicon-plus-sign
- glyphicon-minus-sign
- glyphicon-remove-sign
- glyphicon-ok-sign
- glyphicon-question-sign
- glyphicon-info-sign
- glyphicon-screenshot
- glyphicon-remove-circle
- glyphicon-ok-circle
- glyphicon-ban-circle
- glyphicon-arrow-left
- glyphicon-arrow-right
- glyphicon-arrow-up
- glyphicon-arrow-down
- glyphicon-share-alt
- glyphicon-resize-full
- glyphicon-resize-small
- glyphicon-exclamation-sign
- glyphicon-gift
- glyphicon-leaf
- glyphicon-fire
- glyphicon-eye-open
- glyphicon-eye-close
- glyphicon-warning-sign
- glyphicon-plane
- glyphicon-calendar
- glyphicon-random
- glyphicon-comment
- glyphicon-magnet
- glyphicon-chevron-up
- glyphicon-chevron-down
- glyphicon-retweet
- glyphicon-shopping-cart
- glyphicon-folder-close
- glyphicon-folder-open
- glyphicon-resize-vertical
- glyphicon-resize-horizontal
- glyphicon-hdd
- glyphicon-bullhorn
- glyphicon-bell
- glyphicon-certificate
- glyphicon-thumbs-up
- glyphicon-thumbs-down
- glyphicon-hand-right
- glyphicon-hand-left
- glyphicon-hand-up
- glyphicon-hand-down
- glyphicon-circle-arrow-right
- glyphicon-circle-arrow-left
- glyphicon-circle-arrow-up
- glyphicon-circle-arrow-down
- glyphicon-globe
- glyphicon-wrench
- glyphicon-tasks
- glyphicon-filter
- glyphicon-briefcase
- glyphicon-fullscreen
- glyphicon-dashboard
- glyphicon-paperclip
- glyphicon-heart-empty
- glyphicon-link
- glyphicon-phone
- glyphicon-pushpin
- glyphicon-usd
- glyphicon-gbp
- glyphicon-sort
- glyphicon-sort-by-alphabet
- glyphicon-sort-by-alphabet-alt
- glyphicon-sort-by-order
- glyphicon-sort-by-order-alt
- glyphicon-sort-by-attributes
- glyphicon-sort-by-attributes-alt
- glyphicon-unchecked
- glyphicon-expand
- glyphicon-collapse-down
- glyphicon-collapse-up
- glyphicon-log-in
- glyphicon-flash
- glyphicon-log-out
- glyphicon-new-window
- glyphicon-record
- glyphicon-save
- glyphicon-open
- glyphicon-saved
- glyphicon-import
- glyphicon-export
- glyphicon-send
- glyphicon-floppy-disk
- glyphicon-floppy-saved
- glyphicon-floppy-remove
- glyphicon-floppy-save
- glyphicon-floppy-open
- glyphicon-credit-card
- glyphicon-transfer
- glyphicon-cutlery
- glyphicon-header
- glyphicon-compressed
- glyphicon-earphone
- glyphicon-phone-alt
- glyphicon-tower
- glyphicon-stats
- glyphicon-sd-video
- glyphicon-hd-video
- glyphicon-subtitles
- glyphicon-sound-stereo
- glyphicon-sound-dolby
- glyphicon-sound-5-1
- glyphicon-sound-6-1
- glyphicon-sound-7-1
- glyphicon-copyright-mark
- glyphicon-registration-mark
- glyphicon-cloud-download
- glyphicon-cloud-upload
- glyphicon-tree-conifer
- glyphicon-tree-deciduous
+7
Ver Arquivo
@@ -0,0 +1,7 @@
- name: Thomas McDonald
user: thomas-mcdonald
gravatar: 24cd55ab1a62ffb113ab8c02f64c9301
- name: Gleb Mazovetskiy
user: glebm
gravatar: 729f685b8e8d7e9feed18c177c82e59b
+19
Ver Arquivo
@@ -0,0 +1,19 @@
- name: Little
url: http://littleco.com
expo_url: http://expo.getbootstrap.com/2014/02/12/little/
img: http://expo.getbootstrap.com/screenshots/little.jpg
- name: Engine Yard
url: http://engineyard.com
expo_url: http://expo.getbootstrap.com/2014/02/10/engine-yard/
img: http://expo.getbootstrap.com/screenshots/engine-yard.jpg
- name: Webflow
url: http://webflow.com
expo_url: http://expo.getbootstrap.com/2014/02/04/webflow/
img: http://expo.getbootstrap.com/screenshots/webflow.jpg
- name: Sentry
url: https://getsentry.com
expo_url: http://expo.getbootstrap.com/2013/05/09/sentry/
img: http://expo.getbootstrap.com/screenshots/sentry.jpg
+1
Ver Arquivo
@@ -0,0 +1 @@
<div id="carbonads-container"><div class="carbonad"><div id="azcarbon"></div><script>var z = document.createElement("script"); z.async = true; z.src = "http://engine.carbonads.com/z/32341/azcarbon_2_1_0_HORIZ"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);</script></div></div>
Diferenças do arquivo suprimidas por serem muito extensas Carregar Diff
+70
Ver Arquivo
@@ -0,0 +1,70 @@
<!-- Footer
================================================== -->
<footer class="bs-docs-footer" role="contentinfo">
<div class="container">
{% include social-buttons.html %}
<p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
<p>Maintained by the <a href="https://github.com/twbs?tab=members">core team</a> with the help of <a href="https://github.com/twbs/bootstrap/graphs/contributors">our contributors</a>.</p>
<p>Code licensed under <a href="https://github.com/twbs/bootstrap/blob/master/LICENSE" target="_blank">MIT</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
<ul class="bs-docs-footer-links muted">
<li>Currently v{{ site.current_version }}</li>
<li>&middot;</li>
<li><a href="{{ site.repo }}">GitHub</a></li>
<li>&middot;</li>
<li><a href="../getting-started/#examples">Examples</a></li>
<li>&middot;</li>
<li><a href="../2.3.2/">v2.3.2 docs</a></li>
<li>&middot;</li>
<li><a href="../about/">About</a></li>
<li>&middot;</li>
<li><a href="{{ site.expo }}">Expo</a></li>
<li>&middot;</li>
<li><a href="{{ site.blog }}">Blog</a></li>
<li>&middot;</li>
<li><a href="{{ site.repo }}/issues?state=open">Issues</a></li>
<li>&middot;</li>
<li><a href="{{ site.repo }}/releases">Releases</a></li>
</ul>
</div>
</footer>
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
<script src="../dist/js/bootstrap.min.js"></script>
<script src="../assets/js/docs.min.js"></script>
{% if page.slug == "customize" %}
<script src="../assets/js/customize.min.js"></script>
{% endif %}
{% comment %}
Inject Twitter widgets asynchronously. Snippet snipped from Twitter's
JS interface site: https://dev.twitter.com/docs/tfw-javascript
* "js.async=1;" added to add async attribute to the generated script tag.
{% endcomment %}
<script>
window.twttr = (function (d,s,id) {
var t, js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return; js=d.createElement(s); js.id=id; js.async=1;
js.src="https://platform.twitter.com/widgets.js"; fjs.parentNode.insertBefore(js, fjs);
return window.twttr || (t = { _e: [], ready: function(f){ t._e.push(f) } });
}(document, "script", "twitter-wjs"));
</script>
<!-- Analytics
================================================== -->
<script>
var _gauges = _gauges || [];
(function() {
var t = document.createElement('script');
t.async = true;
t.id = 'gauges-tracker';
t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013');
t.src = '//secure.gaug.es/track.js';
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(t, s);
})();
</script>
+42
Ver Arquivo
@@ -0,0 +1,42 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="Bootstrap, a sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development.">
<meta name="keywords" content="HTML, CSS, JS, JavaScript, framework, bootstrap, front-end, frontend, web development">
<meta name="author" content="Mark Otto, Jacob Thornton, and Bootstrap contributors">
<title>
{% if page.title == "Bootstrap" %}
{{ page.title }}
{% else %}
{{ page.title }} &middot; Bootstrap
{% endif %}
</title>
<!-- Bootstrap core CSS -->
<link href="../dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Documentation extras -->
<link href="../assets/css/docs.min.css" rel="stylesheet">
<!--[if lt IE 9]><script src="../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
<![endif]-->
<!-- Favicons -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="shortcut icon" href="../assets/ico/favicon.ico">
<script>
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-146052-10']);
_gaq.push(['_trackPageview']);
(function() {
var ga = document.createElement('script'); ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
+9
Ver Arquivo
@@ -0,0 +1,9 @@
<li>
<a href="#history">History</a>
</li>
<li>
<a href="#team">Team</a>
</li>
<li>
<a href="#brand">Brand guidelines</a>
</li>
+139
Ver Arquivo
@@ -0,0 +1,139 @@
<li>
<a href="#glyphicons">Glyphicons</a>
<ul class="nav">
<li><a href="#glyphicons-glyphs">Available glyphs</a></li>
<li><a href="#glyphicons-how-to-use">How to use</a></li>
<li><a href="#glyphicons-examples">Examples</a></li>
</ul>
</li>
<li>
<a href="#dropdowns">Dropdowns</a>
<ul class="nav">
<li><a href="#dropdowns-example">Example</a></li>
<li><a href="#dropdowns-alignment">Alignment options</a></li>
<li><a href="#dropdowns-headers">Headers</a></li>
<li><a href="#dropdowns-disabled">Disabled menu items</a></li>
</ul>
</li>
<li>
<a href="#btn-groups">Button groups</a>
<ul class="nav">
<li><a href="#btn-groups-single">Basic example</a></li>
<li><a href="#btn-groups-toolbar">Button toolbar</a></li>
<li><a href="#btn-groups-sizing">Sizing</a></li>
<li><a href="#btn-groups-nested">Nesting</a></li>
<li><a href="#btn-groups-vertical">Vertical variation</a></li>
<li><a href="#btn-groups-justified">Justified link variation</a></li>
</ul>
</li>
<li>
<a href="#btn-dropdowns">Button dropdowns</a>
<ul class="nav">
<li><a href="#btn-dropdowns-single">Single button dropdowns</a></li>
<li><a href="#btn-dropdowns-split">Split button dropdowns</a></li>
<li><a href="#btn-dropdowns-sizing">Sizing</a></li>
<li><a href="#btn-dropdowns-dropup">Dropup variation</a></li>
</ul>
</li>
<li>
<a href="#input-groups">Input groups</a>
<ul class="nav">
<li><a href="#input-groups-basic">Basic example</a></li>
<li><a href="#input-groups-sizing">Sizing</a></li>
<li><a href="#input-groups-checkboxes-radios">Checkbox and radios addons</a></li>
<li><a href="#input-groups-buttons">Button addons</a></li>
<li><a href="#input-groups-buttons-dropdowns">Buttons with dropdowns</a></li>
<li><a href="#input-groups-buttons-segmented">Segmented buttons</a></li>
</ul>
</li>
<li>
<a href="#nav">Navs</a>
<ul class="nav">
<li><a href="#nav-tabs">Tabs</a></li>
<li><a href="#nav-pills">Pills</a></li>
<li><a href="#nav-justified">Justified nav</a></li>
<li><a href="#nav-disabled-links">Disabled links</a></li>
<li><a href="#nav-dropdowns">Using dropdowns</a></li>
</ul>
</li>
<li>
<a href="#navbar">Navbar</a>
<ul class="nav">
<li><a href="#navbar-default">Default navbar</a></li>
<li><a href="#navbar-forms">Forms</a></li>
<li><a href="#navbar-buttons">Buttons</a></li>
<li><a href="#navbar-text">Text</a></li>
<li><a href="#navbar-links">Non-nav links</a></li>
<li><a href="#navbar-component-alignment">Component alignment</a></li>
<li><a href="#navbar-fixed-top">Fixed to top</a></li>
<li><a href="#navbar-fixed-bottom">Fixed to bottom</a></li>
<li><a href="#navbar-static-top">Static top</a></li>
<li><a href="#navbar-inverted">Inverted navbar</a></li>
</ul>
</li>
<li><a href="#breadcrumbs">Breadcrumbs</a></li>
<li>
<a href="#pagination">Pagination</a>
<ul class="nav">
<li><a href="#pagination-default">Default pagination</a></li>
<li><a href="#pagination-pager">Pager</a></li>
</ul>
</li>
<li><a href="#labels">Labels</a></li>
<li><a href="#badges">Badges</a></li>
<li><a href="#jumbotron">Jumbotron</a></li>
<li><a href="#page-header">Page header</a></li>
<li>
<a href="#thumbnails">Thumbnails</a>
<ul class="nav">
<li><a href="#thumbnails-default">Default example</a></li>
<li><a href="#thumbnails-custom-content">Custom content</a></li>
</ul>
</li>
<li>
<a href="#alerts">Alerts</a>
<ul class="nav">
<li><a href="#alerts-examples">Examples</a></li>
<li><a href="#alerts-dismissable">Dismissable alerts</a></li>
<li><a href="#alerts-links">Links in alerts</a></li>
</ul>
</li>
<li>
<a href="#progress">Progress bars</a>
<ul class="nav">
<li><a href="#progress-basic">Basic example</a></li>
<li><a href="#progress-label">With label</a></li>
<li><a href="#progress-alternatives">Contextual alternatives</a></li>
<li><a href="#progress-striped">Striped</a></li>
<li><a href="#progress-animated">Animated</a></li>
<li><a href="#progress-stacked">Stacked</a></li>
</ul>
</li>
<li>
<a href="#media">Media object</a>
<ul class="nav">
<li><a href="#media-default">Default media</a></li>
<li><a href="#media-list">Media list</a></li>
</ul>
</li>
<li>
<a href="#list-group">List group</a>
<ul class="nav">
<li><a href="#list-group-basic">Basic example</a></li>
<li><a href="#list-group-badges">Badges</a></li>
<li><a href="#list-group-linked">Linked items</a></li>
<li><a href="#list-group-contextual-classes">Contextual classes</a></li>
<li><a href="#list-group-custom-content">Custom content</a></li>
</ul>
</li>
<li>
<a href="#panels">Panels</a>
<ul class="nav">
<li><a href="#panels-basic">Basic example</a></li>
<li><a href="#panels-heading">Panel with heading</a></li>
<li><a href="#panels-alternatives">Contextual alternatives</a></li>
<li><a href="#panels-tables">With tables</a>
<li><a href="#panels-list-group">With list groups</a>
</ul>
</li>
<li><a href="#wells">Wells</a></li>
+130
Ver Arquivo
@@ -0,0 +1,130 @@
<li>
<a href="#overview">Overview</a>
<ul class="nav">
<li><a href="#overview-doctype">HTML5 doctype</a></li>
<li><a href="#overview-mobile">Mobile first</a></li>
<li><a href="#overview-type-links">Typography and links</a></li>
<li><a href="#overview-normalize">Normalize.css</a></li>
<li><a href="#overview-container">Containers</a></li>
</ul>
</li>
<li>
<a href="#grid">Grid system</a>
<ul class="nav">
<li><a href="#grid-intro">Introduction</a></li>
<li><a href="#grid-media-queries">Media queries</a></li>
<li><a href="#grid-options">Grid options</a></li>
<li><a href="#grid-example-basic">Ex: Stacked-to-horizontal</a></li>
<li><a href="#grid-example-fluid">Ex: Fluid container</a></li>
<li><a href="#grid-example-mixed">Ex: Mobile and desktops</a></li>
<li><a href="#grid-example-mixed-complete">Ex: Mobile, tablet, desktops</a></li>
<li><a href="#grid-responsive-resets">Responsive column resets</a></li>
<li><a href="#grid-offsetting">Offsetting columns</a></li>
<li><a href="#grid-nesting">Nesting columns</a></li>
<li><a href="#grid-column-ordering">Column ordering</a></li>
<li><a href="#grid-less">Less mixins and variables</a></li>
</ul>
</li>
<li>
<a href="#type">Typography</a>
<ul class="nav">
<li><a href="#type-headings">Headings</a></li>
<li><a href="#type-body-copy">Body copy</a></li>
<li><a href="#type-emphasis">Emphasis</a></li>
<li><a href="#type-abbreviations">Abbreviations</a></li>
<li><a href="#type-addresses">Addresses</a></li>
<li><a href="#type-blockquotes">Blockquotes</a></li>
<li><a href="#type-lists">Lists</a></li>
</ul>
</li>
<li>
<a href="#code">Code</a>
<ul class="nav">
<li><a href="#code-inline">Inline code</a></li>
<li><a href="#code-user-input">User input</a></li>
<li><a href="#code-block">Blocks of code</a></li>
</ul>
</li>
<li>
<a href="#tables">Tables</a>
<ul class="nav">
<li><a href="#tables-example">Basic example</a></li>
<li><a href="#tables-striped">Striped rows</a></li>
<li><a href="#tables-bordered">Bordered table</a></li>
<li><a href="#tables-hover-rows">Hover rows</a></li>
<li><a href="#tables-condensed">Condensed table</a></li>
<li><a href="#tables-contextual-classes">Contextual classes</a></li>
<li><a href="#tables-responsive">Responsive tables</a></li>
</ul>
</li>
<li>
<a href="#forms">Forms</a>
<ul class="nav">
<li><a href="#forms-example">Basic example</a></li>
<li><a href="#forms-inline">Inline form</a></li>
<li><a href="#forms-horizontal">Horizontal form</a></li>
<li><a href="#forms-controls">Supported controls</a></li>
<li><a href="#forms-controls-static">Static control</a></li>
<li><a href="#forms-control-focus">Focus state</a></li>
<li><a href="#forms-control-disabled">Disabled state</a></li>
<li><a href="#forms-control-validation">Validation states</a></li>
<li><a href="#forms-control-sizes">Control sizing</a></li>
<li><a href="#forms-help-text">Help text</a></li>
</ul>
</li>
<li>
<a href="#buttons">Buttons</a>
<ul class="nav">
<li><a href="#buttons-options">Options</a></li>
<li><a href="#buttons-sizes">Sizes</a></li>
<li><a href="#buttons-active">Active state</a></li>
<li><a href="#buttons-disabled">Disabled state</a></li>
<li><a href="#buttons-tags">Button tags</a></li>
</ul>
</li>
<li>
<a href="#images">Images</a>
<ul class="nav">
<li><a href="#images-responsive">Responsive images</a></li>
<li><a href="#images-shapes">Image shapes</a></li>
</ul>
</li>
<li>
<a href="#helper-classes">Helper classes</a>
<ul class="nav">
<li><a href="#helper-classes-colors">Contextual colors</a></li>
<li><a href="#helper-classes-backgrounds">Contextual backgrounds</a></li>
<li><a href="#helper-classes-close">Close icon</a></li>
<li><a href="#helper-classes-carets">Carets</a></li>
<li><a href="#helper-classes-floats">Quick floats</a></li>
<li><a href="#helper-classes-center">Center content blocks</a></li>
<li><a href="#helper-classes-clearfix">Clearfix</a></li>
<li><a href="#helper-classes-show-hide">Showing and hiding content</a></li>
<li><a href="#helper-classes-screen-readers">Screen reader content</a></li>
<li><a href="#helper-classes-image-replacement">Image replacement</a></li>
</ul>
</li>
<li>
<a href="#responsive-utilities">Responsive utilities</a>
<ul class="nav">
<li><a href="#responsive-utilities-classes">Available classes</a></li>
<li><a href="#responsive-utilities-print">Print classes</a></li>
<li><a href="#responsive-utilities-tests">Test cases</a></li>
</ul>
</li>
<li>
<a href="#less">Using Less</a>
<ul class="nav">
<li><a href="#less-bootstrap">Compiling Bootstrap</a></li>
<li><a href="#less-variables">Variables</a></li>
<li><a href="#less-mixins-vendor">Vendor mixins</a></li>
<li><a href="#less-mixins-utility">Utility mixins</a></li>
</ul>
</li>
<li>
<a href="#sass">Using Sass</a>
<ul class="nav">
<li><a href="#sass-contents">What's included</a></li>
<li><a href="#sass-installation">Rails install</a></li>
</ul>
</li>
+46
Ver Arquivo
@@ -0,0 +1,46 @@
<!-- NOTE: DO NOT EDIT THE FOLLOWING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-nav.jade template.-->
<li><a href="#less">Less components</a></li>
<li><a href="#plugins">jQuery plugins</a></li>
<li><a href="#less-variables">Less variables</a>
<ul class="nav">
<li><a href="#colors">Colors</a></li>
<li><a href="#scaffolding">Scaffolding</a></li>
<li><a href="#typography">Typography</a></li>
<li><a href="#components">Components</a></li>
<li><a href="#tables">Tables</a></li>
<li><a href="#buttons">Buttons</a></li>
<li><a href="#forms">Forms</a></li>
<li><a href="#dropdowns">Dropdowns</a></li>
<li><a href="#media-queries-breakpoints">Media queries breakpoints</a></li>
<li><a href="#grid-system">Grid system</a></li>
<li><a href="#container-sizes">Container sizes</a></li>
<li><a href="#navbar">Navbar</a></li>
<li><a href="#navs">Navs</a></li>
<li><a href="#tabs">Tabs</a></li>
<li><a href="#pills">Pills</a></li>
<li><a href="#pagination">Pagination</a></li>
<li><a href="#pager">Pager</a></li>
<li><a href="#jumbotron">Jumbotron</a></li>
<li><a href="#form-states-and-alerts">Form states and alerts</a></li>
<li><a href="#tooltips">Tooltips</a></li>
<li><a href="#popovers">Popovers</a></li>
<li><a href="#labels">Labels</a></li>
<li><a href="#modals">Modals</a></li>
<li><a href="#alerts">Alerts</a></li>
<li><a href="#progress-bars">Progress bars</a></li>
<li><a href="#list-group">List group</a></li>
<li><a href="#panels">Panels</a></li>
<li><a href="#thumbnails">Thumbnails</a></li>
<li><a href="#wells">Wells</a></li>
<li><a href="#badges">Badges</a></li>
<li><a href="#breadcrumbs">Breadcrumbs</a></li>
<li><a href="#carousel">Carousel</a></li>
<li><a href="#close">Close</a></li>
<li><a href="#code">Code</a></li>
<li><a href="#type">Type</a></li>
<li><a href="#miscellaneous">Miscellaneous</a></li>
</ul>
</li>
<li><a href="#download">Download</a></li>
<!-- NOTE: DO NOT EDIT THE PRECEDING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-nav.jade template.-->
+62
Ver Arquivo
@@ -0,0 +1,62 @@
<li>
<a href="#download">Download</a>
</li>
<li>
<a href="#whats-included">What's included</a>
<ul class="nav">
<li><a href="#whats-included-precompiled">Precompiled</a></li>
<li><a href="#whats-included-source">Source code</a></li>
</ul>
</li>
<li>
<a href="#template">Basic template</a>
</li>
<li>
<a href="#examples">Examples</a>
<ul class="nav">
<li><a href="#examples-framework">Using the framework</a></li>
<li><a href="#examples-navbars">Navbars in action</a></li>
<li><a href="#examples-custom">Custom components</a></li>
<li><a href="#examples-experiments">Experiments</a></li>
</ul>
</li>
<li>
<a href="#community">Community</a>
</li>
<li>
<a href="#disable-responsive">Disabling responsiveness</a>
</li>
<li>
<a href="#migration">Migrating from 2.x to 3.0</a>
</li>
<li>
<a href="#support">Browser and device support</a>
<ul class="nav">
<li><a href="#support-browsers">Supported browsers</a></li>
<li><a href="#support-ie8-ie9">Internet Explorer 8-9</a></li>
<li><a href="#support-ie8-respondjs">IE8 and Respond.js</a></li>
<li><a href="#support-ie8-box-sizing">IE8 and box-sizing</a></li>
<li><a href="#support-ie-compatibility-modes">IE Compatibility modes</a></li>
<li><a href="#support-ie10-width">IE10 and Windows (Phone) 8</a></li>
<li><a href="#support-safari-percentages">Safari percent rounding</a></li>
<li><a href="#support-fixed-position-keyboards">Modals, navbars, and virtual keyboards</a></li>
<li><a href="#support-browser-zooming">Browser zooming</a></li>
<li><a href="#support-printing">Printer viewports</a></li>
<li><a href="#support-android-stock-browser">Android stock browser</a></li>
</ul>
</li>
<li>
<a href="#third-parties">Third party support</a>
</li>
<li>
<a href="#accessibility">Accessibility</a>
</li>
<li>
<a href="#license-faqs">License FAQs</a>
</li>
<li>
<a href="#customizing">Customizing Bootstrap</a>
</li>
<li>
<a href="#translations">Translations</a>
</li>
+89
Ver Arquivo
@@ -0,0 +1,89 @@
<li>
<a href="#js-overview">Overview</a>
<ul class="nav">
<li><a href="#js-individual-compiled">Individual or compiled</a></li>
<li><a href="#js-data-attrs">Data attributes</a></li>
<li><a href="#js-programmatic-api">Programmatic API</a></li>
<li><a href="#js-noconflict">No conflict</a></li>
<li><a href="#js-events">Events</a></li>
</ul>
</li>
<li><a href="#transitions">Transitions</a></li>
<li>
<a href="#modals">Modal</a>
<ul class="nav">
<li><a href="#modals-examples">Examples</a></li>
<li><a href="#modals-sizes">Sizes</a></li>
<li><a href="#modals-usage">Usage</a></li>
</ul>
</li>
<li>
<a href="#dropdowns">Dropdown</a>
<ul class="nav">
<li><a href="#dropdowns-examples">Examples</a></li>
<li><a href="#dropdowns-usage">Usage</a></li>
</ul>
</li>
<li>
<a href="#scrollspy">Scrollspy</a>
<ul class="nav">
<li><a href="#scrollspy-examples">Examples</a></li>
<li><a href="#scrollspy-usage">Usage</a></li>
</ul>
</li>
<li>
<a href="#tabs">Tab</a>
<ul class="nav">
<li><a href="#tabs-examples">Examples</a></li>
<li><a href="#tabs-usage">Usage</a></li>
</ul>
</li>
<li>
<a href="#tooltips">Tooltip</a>
<ul class="nav">
<li><a href="#tooltips-examples">Examples</a></li>
<li><a href="#tooltips-usage">Usage</a></li>
</ul>
</li>
<li>
<a href="#popovers">Popover</a>
<ul class="nav">
<li><a href="#popovers-examples">Examples</a></li>
<li><a href="#popovers-usage">Usage</a></li>
</ul>
</li>
<li>
<a href="#alerts">Alert</a>
<ul class="nav">
<li><a href="#alerts-examples">Examples</a></li>
<li><a href="#alerts-usage">Usage</a></li>
</ul>
</li>
<li>
<a href="#buttons">Button</a>
<ul class="nav">
<li><a href="#buttons-examples">Examples</a></li>
<li><a href="#buttons-usage">Usage</a></li>
</ul>
</li>
<li>
<a href="#collapse">Collapse</a>
<ul class="nav">
<li><a href="#collapse-examples">Examples</a></li>
<li><a href="#collapse-usage">Usage</a></li>
</ul>
</li>
<li>
<a href="#carousel">Carousel</a>
<ul class="nav">
<li><a href="#carousel-examples">Examples</a></li>
<li><a href="#carousel-usage">Usage</a></li>
</ul>
</li>
<li>
<a href="#affix">Affix</a>
<ul class="nav">
<li><a href="#affix-examples">Examples</a></li>
<li><a href="#affix-usage">Usage</a></li>
</ul>
</li>
+36
Ver Arquivo
@@ -0,0 +1,36 @@
<header class="navbar navbar-static-top bs-docs-nav" id="top" role="banner">
<div class="container">
<div class="navbar-header">
<button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a href="../" class="navbar-brand">Bootstrap</a>
</div>
<nav class="collapse navbar-collapse bs-navbar-collapse" role="navigation">
<ul class="nav navbar-nav">
<li{% if page.slug == "getting-started" %} class="active"{% endif %}>
<a href="../getting-started">Getting started</a>
</li>
<li{% if page.slug == "css" %} class="active"{% endif %}>
<a href="../css">CSS</a>
</li>
<li{% if page.slug == "components" %} class="active"{% endif %}>
<a href="../components">Components</a>
</li>
<li{% if page.slug == "js" %} class="active"{% endif %}>
<a href="../javascript">JavaScript</a>
</li>
<li{% if page.slug == "customize" %} class="active"{% endif %}>
<a href="../customize">Customize</a>
</li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li><a href="{{ site.expo }}" onclick="_gaq.push(['_trackEvent', 'Navbar', 'Community links', 'Expo']);">Expo</a></li>
<li><a href="{{ site.blog }}" onclick="_gaq.push(['_trackEvent', 'Navbar', 'Community links', 'Blog']);">Blog</a></li>
</ul>
</nav>
</div>
</header>
+12
Ver Arquivo
@@ -0,0 +1,12 @@
<li>
<a href="#classes">Major class changes</a>
</li>
<li>
<a href="#new">What's new</a>
</li>
<li>
<a href="#dropped">What's removed</a>
</li>
<li>
<a href="#notes">Additional notes</a>
</li>
+16
Ver Arquivo
@@ -0,0 +1,16 @@
<div class="bs-docs-social">
<ul class="bs-docs-social-buttons">
<li>
<iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twbs&amp;repo=bootstrap&amp;type=watch&amp;count=true" width="100" height="20" title="Star on GitHub"></iframe>
</li>
<li>
<iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twbs&amp;repo=bootstrap&amp;type=fork&amp;count=true" width="102" height="20" title="Fork on GitHub"></iframe>
</li>
<li class="follow-btn">
<a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true">Follow @twbootstrap</a>
</li>
<li class="tweet-btn">
<a href="https://twitter.com/share" class="twitter-share-button" data-url="http://getbootstrap.com/" data-count="horizontal" data-via="twbootstrap" data-related="mdo:Creator of Bootstrap">Tweet</a>
</li>
</ul>
</div>
+58
Ver Arquivo
@@ -0,0 +1,58 @@
<!DOCTYPE html>
<html lang="en">
<head>
<!-- Meta, title, CSS, favicons, etc. -->
{% include header.html %}
</head>
<body>
<a class="sr-only" href="#content">Skip to main content</a>
<!-- Docs master nav -->
{% include nav-main.html %}
<!-- Docs page layout -->
<div class="bs-docs-header" id="content">
<div class="container">
<h1>{{ page.title }}</h1>
<p>{{ page.lead }}</p>
{% include ads.html %}
</div>
</div>
<div class="container bs-docs-container">
<div class="row">
<div class="col-md-9" role="main">
{{ content }}
</div>
<div class="col-md-3">
<div class="bs-docs-sidebar hidden-print" role="complementary">
<ul class="nav bs-docs-sidenav">
{% if page.slug == "getting-started" %}
{% include nav-getting-started.html %}
{% elsif page.slug == "css" %}
{% include nav-css.html %}
{% elsif page.slug == "components" %}
{% include nav-components.html %}
{% elsif page.slug == "js" %}
{% include nav-javascript.html %}
{% elsif page.slug == "customize" %}
{% include nav-customize.html %}
{% elsif page.slug == "about" %}
{% include nav-about.html %}
{% elsif page.slug == "migration" %}
{% include nav-migration.html %}
{% endif %}
</ul>
<a class="back-to-top" href="#top">
Back to top
</a>
</div>
</div>
</div>
</div>
{% include footer.html %}
</body>
</html>
+18
Ver Arquivo
@@ -0,0 +1,18 @@
<!DOCTYPE html>
<html lang="en">
<head>
<!-- Meta, title, CSS, favicons, etc. -->
{% include header.html %}
</head>
<body class="bs-docs-home">
<a class="sr-only" href="#content">Skip to main content</a>
<!-- Docs master nav -->
{% include nav-main.html %}
<!-- Page content of course! -->
{{ content }}
{% include footer.html %}
</body>
</html>
+111
Ver Arquivo
@@ -0,0 +1,111 @@
---
layout: default
title: About
slug: about
lead: "Learn about the project's history, meet the maintaining teams, and find out how to use the Bootstrap brand."
---
<!-- History
================================================== -->
<div class="bs-docs-section">
<h1 id="history" class="page-header">History</h1>
<p class="lead">Originally created by a designer and a developer at Twitter, Bootstrap has become one of the most popular front-end frameworks and open source projects in the world.</p>
<p>Bootstrap was created at Twitter in mid-2010 by <a href="https://twitter.com/mdo">@mdo</a> and <a href="https://twitter.com/fat">@fat</a>. Prior to being an open-sourced framework, Bootstrap was known as <em>Twitter Blueprint</em>. A few months into development, Twitter held its <a href="https://blog.twitter.com/2010/hack-week">first Hack Week</a> and the project exploded as developers of all skill levels jumped in without any external guidance. It served as the style guide for internal tools development at the company for over a year before its public release, and continues to do so today.</p>
<p>Originally <a href="https://dev.twitter.com/blog/bootstrap-twitter">released</a> on <a href="https://twitter.com/mdo/statuses/104620039650557952"><time datetime="2011-08-19 11:25">Friday, August 19, 2011</time></a>, we've since had over <a href="https://github.com/twbs/bootstrap/releases">twenty releases</a>, including two major rewrites with v2 and v3. With Bootstrap 2, we added responsive functionality to the entire framework as an optional stylesheet. Building on that with Bootstrap 3, we rewrote the library once more to make it responsive by default with a mobile first approach.</p>
</div>
<!-- Team
================================================== -->
<div class="bs-docs-section">
<h1 id="team" class="page-header">Team</h1>
<p class="lead">Bootstrap is maintained by the founding team and a small group of invaluable core contributors, with the massive support and involvement of our community.</p>
<h2 id="team-core">Core team</h2>
<div class="list-group bs-team">
{% for member in site.data.core-team %}
<div class="list-group-item">
<iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user={{ member.user }}&amp;type=follow"></iframe>
<a class="team-member" href="https://github.com/{{ member.user }}">
<img src="http://www.gravatar.com/avatar/{{ member.gravatar }}" alt="@{{ member.user }}">
<strong>{{ member.name }}</strong> <small>@{{ member.user }}</small>
</a>
</div>
{% endfor %}
</div>
<p>Get involved with Bootstrap development by <a href="https://github.com/twbs/bootstrap/issues/new">opening an issue</a> or submitting a pull request. Read our <a href="https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md">contributing guidelines</a> for information on how we develop.</p>
<h2 id="team-sass">Sass team</h2>
<div class="list-group bs-team">
{% for member in site.data.sass-team %}
<div class="list-group-item">
<iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user={{ member.user }}&amp;type=follow"></iframe>
<a class="team-member" href="https://github.com/{{ member.user }}">
<img src="http://www.gravatar.com/avatar/{{ member.gravatar }}" alt="@{{ member.user }}">
<strong>{{ member.name }}</strong> <small>@{{ member.user }}</small>
</a>
</div>
{% endfor %}
</div>
<p>The <a href="{{ site.sass_repo }}">official Sass port of Bootstrap</a> was created and is maintained by this team. It became part of Bootstrap's organization with v3.1.0. Read the Sass <a href="https://github.com/twbs/bootstrap-sass/blob/master/CONTRIBUTING.md">contributing guidelines</a> for information on how the Sass port is developed.</p>
</div>
<!-- Brand
================================================== -->
<div class="bs-docs-section">
<h1 id="brand" class="page-header">Brand guidelines</h1>
<p class="lead">Have a need for Bootstrap's brand resources? Great! We have only a few guidelines we follow, and in turn ask you to follow as well. These guidelines were inspired by MailChimp's <a href="http://mailchimp.com/about/brand-assets/" target="_blank">Brand Assets</a>.</p>
<h2>Mark and logo</h2>
<p>Use either the Bootstrap mark (a capital <strong>B</strong>) or the standard logo (just <strong>Bootstrap</strong>). It should always appear in Helvetica Neue Bold. <strong>Do not use the Twitter bird</strong> in association with Bootstrap.</p>
<div class="bs-brand-logos">
<div class="bs-brand-item">
<div class="bs-docs-booticon bs-docs-booticon-lg">B</div>
</div>
<div class="bs-brand-item inverse">
<div class="bs-docs-booticon bs-docs-booticon-lg bs-docs-booticon-inverse">B</div>
</div>
</div>
<div class="bs-brand-logos">
<div class="bs-brand-item">
<h1>Bootstrap</h1>
</div>
<div class="bs-brand-item inverse">
<h1>Bootstrap</h1>
</div>
</div>
<h2>Name</h2>
<p>The project and framework should always be referred to as <strong>Bootstrap</strong>. No Twitter before it, no capital <em>s</em>, and no abbreviations except for one, a capital <strong>B</strong>.</p>
<div class="bs-brand-logos">
<div class="bs-brand-item">
<h3>Bootstrap</h3>
<span class="glyphicon glyphicon-ok"></span>
</div>
<div class="bs-brand-item">
<h3 class="text-muted">BootStrap</h3>
<span class="glyphicon glyphicon-remove"></span>
</div>
<div class="bs-brand-item">
<h3 class="text-muted">Twitter Bootstrap</h3>
<span class="glyphicon glyphicon-remove"></span>
</div>
</div>
<h2>Colors</h2>
<p>Our docs and branding use a handful of primary colors to differentiate what <em>is</em> Bootstrap from what <em>is in</em> Bootstrap. In other words, if it's purple, it's representative of Bootstrap.</p>
<div class="bs-brand">
<div class="color-swatches">
<div class="color-swatch bs-purple"></div>
<div class="color-swatch bs-purple-light"></div>
<div class="color-swatch bs-purple-lighter"></div>
<div class="color-swatch bs-gray"></div>
</div>
</div>
</div>
Arquivo binário não exibido.
-567
Ver Arquivo
@@ -1,567 +0,0 @@
/*!
* Bootstrap Responsive v2.0.0
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
*/
.hidden {
display: none;
visibility: hidden;
}
@media (max-width: 480px) {
.nav-collapse {
-webkit-transform: translate3d(0, 0, 0);
}
.page-header h1 small {
display: block;
line-height: 18px;
}
input[class*="span"],
select[class*="span"],
textarea[class*="span"],
.uneditable-input {
display: block;
width: 100%;
height: 28px;
/* Make inputs at least the height of their button counterpart */
/* Makes inputs behave like true block-level elements */
-webkit-box-sizing: border-box;
/* Older Webkit */
-moz-box-sizing: border-box;
/* Older FF */
-ms-box-sizing: border-box;
/* IE8 */
box-sizing: border-box;
/* CSS3 spec*/
}
.input-prepend input[class*="span"], .input-append input[class*="span"] {
width: auto;
}
input[type="checkbox"], input[type="radio"] {
border: 1px solid #ccc;
}
.form-horizontal .control-group > label {
float: none;
width: auto;
padding-top: 0;
text-align: left;
}
.form-horizontal .controls {
margin-left: 0;
}
.form-horizontal .control-list {
padding-top: 0;
}
.form-horizontal .form-actions {
padding-left: 10px;
padding-right: 10px;
}
.modal {
position: absolute;
top: 10px;
left: 10px;
right: 10px;
width: auto;
margin: 0;
}
.modal.fade.in {
top: auto;
}
.modal-header .close {
padding: 10px;
margin: -10px;
}
.carousel-caption {
position: static;
}
}
@media (max-width: 768px) {
.container {
width: auto;
padding: 0 20px;
}
.row-fluid {
width: 100%;
}
.row {
margin-left: 0;
}
.row > [class*="span"], .row-fluid > [class*="span"] {
float: none;
display: block;
width: auto;
margin: 0;
}
}
@media (min-width: 768px) and (max-width: 980px) {
.row {
margin-left: -20px;
*zoom: 1;
}
.row:before, .row:after {
display: table;
content: "";
}
.row:after {
clear: both;
}
[class*="span"] {
float: left;
margin-left: 20px;
}
.span1 {
width: 42px;
}
.span2 {
width: 104px;
}
.span3 {
width: 166px;
}
.span4 {
width: 228px;
}
.span5 {
width: 290px;
}
.span6 {
width: 352px;
}
.span7 {
width: 414px;
}
.span8 {
width: 476px;
}
.span9 {
width: 538px;
}
.span10 {
width: 600px;
}
.span11 {
width: 662px;
}
.span12, .container {
width: 724px;
}
.offset1 {
margin-left: 82px;
}
.offset2 {
margin-left: 144px;
}
.offset3 {
margin-left: 206px;
}
.offset4 {
margin-left: 268px;
}
.offset5 {
margin-left: 330px;
}
.offset6 {
margin-left: 392px;
}
.offset7 {
margin-left: 454px;
}
.offset8 {
margin-left: 516px;
}
.offset9 {
margin-left: 578px;
}
.offset10 {
margin-left: 640px;
}
.offset11 {
margin-left: 702px;
}
.row-fluid {
width: 100%;
*zoom: 1;
}
.row-fluid:before, .row-fluid:after {
display: table;
content: "";
}
.row-fluid:after {
clear: both;
}
.row-fluid > [class*="span"] {
float: left;
margin-left: 2.762430939%;
}
.row-fluid > [class*="span"]:first-child {
margin-left: 0;
}
.row-fluid .span1 {
width: 5.801104972%;
}
.row-fluid .span2 {
width: 14.364640883%;
}
.row-fluid .span3 {
width: 22.928176794%;
}
.row-fluid .span4 {
width: 31.491712705%;
}
.row-fluid .span5 {
width: 40.055248616%;
}
.row-fluid .span6 {
width: 48.618784527%;
}
.row-fluid .span7 {
width: 57.182320438000005%;
}
.row-fluid .span8 {
width: 65.74585634900001%;
}
.row-fluid .span9 {
width: 74.30939226%;
}
.row-fluid .span10 {
width: 82.87292817100001%;
}
.row-fluid .span11 {
width: 91.436464082%;
}
.row-fluid .span12 {
width: 99.999999993%;
}
input.span1, textarea.span1, .uneditable-input.span1 {
width: 32px;
}
input.span2, textarea.span2, .uneditable-input.span2 {
width: 94px;
}
input.span3, textarea.span3, .uneditable-input.span3 {
width: 156px;
}
input.span4, textarea.span4, .uneditable-input.span4 {
width: 218px;
}
input.span5, textarea.span5, .uneditable-input.span5 {
width: 280px;
}
input.span6, textarea.span6, .uneditable-input.span6 {
width: 342px;
}
input.span7, textarea.span7, .uneditable-input.span7 {
width: 404px;
}
input.span8, textarea.span8, .uneditable-input.span8 {
width: 466px;
}
input.span9, textarea.span9, .uneditable-input.span9 {
width: 528px;
}
input.span10, textarea.span10, .uneditable-input.span10 {
width: 590px;
}
input.span11, textarea.span11, .uneditable-input.span11 {
width: 652px;
}
input.span12, textarea.span12, .uneditable-input.span12 {
width: 714px;
}
}
@media (max-width: 980px) {
body {
padding-top: 0;
}
.navbar-fixed-top {
position: static;
margin-bottom: 18px;
}
.navbar-fixed-top .navbar-inner {
padding: 5px;
}
.navbar .container {
width: auto;
padding: 0;
}
.navbar .brand {
padding-left: 10px;
padding-right: 10px;
margin: 0 0 0 -5px;
}
.navbar .nav-collapse {
clear: left;
}
.navbar .nav {
float: none;
margin: 0 0 9px;
}
.navbar .nav > li {
float: none;
}
.navbar .nav > li > a {
margin-bottom: 2px;
}
.navbar .nav > .divider-vertical {
display: none;
}
.navbar .nav > li > a, .navbar .dropdown-menu a {
padding: 6px 15px;
font-weight: bold;
color: #999999;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
.navbar .dropdown-menu li + li a {
margin-bottom: 2px;
}
.navbar .nav > li > a:hover, .navbar .dropdown-menu a:hover {
background-color: #222222;
}
.navbar .dropdown-menu {
position: static;
top: auto;
left: auto;
float: none;
display: block;
max-width: none;
margin: 0 15px;
padding: 0;
background-color: transparent;
border: none;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
.navbar .dropdown-menu:before, .navbar .dropdown-menu:after {
display: none;
}
.navbar .dropdown-menu .divider {
display: none;
}
.navbar-form, .navbar-search {
float: none;
padding: 9px 15px;
margin: 9px 0;
border-top: 1px solid #222222;
border-bottom: 1px solid #222222;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
}
.navbar .nav.pull-right {
float: none;
margin-left: 0;
}
.navbar-static .navbar-inner {
padding-left: 10px;
padding-right: 10px;
}
.btn-navbar {
display: block;
}
.nav-collapse {
overflow: hidden;
height: 0;
}
}
@media (min-width: 980px) {
.nav-collapse.collapse {
height: auto !important;
}
}
@media (min-width: 1200px) {
.row {
margin-left: -30px;
*zoom: 1;
}
.row:before, .row:after {
display: table;
content: "";
}
.row:after {
clear: both;
}
[class*="span"] {
float: left;
margin-left: 30px;
}
.span1 {
width: 70px;
}
.span2 {
width: 170px;
}
.span3 {
width: 270px;
}
.span4 {
width: 370px;
}
.span5 {
width: 470px;
}
.span6 {
width: 570px;
}
.span7 {
width: 670px;
}
.span8 {
width: 770px;
}
.span9 {
width: 870px;
}
.span10 {
width: 970px;
}
.span11 {
width: 1070px;
}
.span12, .container {
width: 1170px;
}
.offset1 {
margin-left: 130px;
}
.offset2 {
margin-left: 230px;
}
.offset3 {
margin-left: 330px;
}
.offset4 {
margin-left: 430px;
}
.offset5 {
margin-left: 530px;
}
.offset6 {
margin-left: 630px;
}
.offset7 {
margin-left: 730px;
}
.offset8 {
margin-left: 830px;
}
.offset9 {
margin-left: 930px;
}
.offset10 {
margin-left: 1030px;
}
.offset11 {
margin-left: 1130px;
}
.row-fluid {
width: 100%;
*zoom: 1;
}
.row-fluid:before, .row-fluid:after {
display: table;
content: "";
}
.row-fluid:after {
clear: both;
}
.row-fluid > [class*="span"] {
float: left;
margin-left: 2.564102564%;
}
.row-fluid > [class*="span"]:first-child {
margin-left: 0;
}
.row-fluid .span1 {
width: 5.982905983%;
}
.row-fluid .span2 {
width: 14.529914530000001%;
}
.row-fluid .span3 {
width: 23.076923077%;
}
.row-fluid .span4 {
width: 31.623931624%;
}
.row-fluid .span5 {
width: 40.170940171000005%;
}
.row-fluid .span6 {
width: 48.717948718%;
}
.row-fluid .span7 {
width: 57.264957265%;
}
.row-fluid .span8 {
width: 65.81196581200001%;
}
.row-fluid .span9 {
width: 74.358974359%;
}
.row-fluid .span10 {
width: 82.905982906%;
}
.row-fluid .span11 {
width: 91.45299145300001%;
}
.row-fluid .span12 {
width: 100%;
}
input.span1, textarea.span1, .uneditable-input.span1 {
width: 60px;
}
input.span2, textarea.span2, .uneditable-input.span2 {
width: 160px;
}
input.span3, textarea.span3, .uneditable-input.span3 {
width: 260px;
}
input.span4, textarea.span4, .uneditable-input.span4 {
width: 360px;
}
input.span5, textarea.span5, .uneditable-input.span5 {
width: 460px;
}
input.span6, textarea.span6, .uneditable-input.span6 {
width: 560px;
}
input.span7, textarea.span7, .uneditable-input.span7 {
width: 660px;
}
input.span8, textarea.span8, .uneditable-input.span8 {
width: 760px;
}
input.span9, textarea.span9, .uneditable-input.span9 {
width: 860px;
}
input.span10, textarea.span10, .uneditable-input.span10 {
width: 960px;
}
input.span11, textarea.span11, .uneditable-input.span11 {
width: 1060px;
}
input.span12, textarea.span12, .uneditable-input.span12 {
width: 1160px;
}
.thumbnails {
margin-left: -30px;
}
.thumbnails > li {
margin-left: 30px;
}
}
-3363
Ver Arquivo
Diferenças do arquivo suprimidas por serem muito extensas Carregar Diff
+1373 -743
Ver Arquivo
Diferenças do arquivo suprimidas por serem muito extensas Carregar Diff
Diff do arquivo suprimido porque uma ou mais linhas são muito longas
+66
Ver Arquivo
@@ -0,0 +1,66 @@
.hll { background-color: #ffffcc }
/*{ background: #f0f3f3; }*/
.c { color: #999; } /* Comment */
.err { color: #AA0000; background-color: #FFAAAA } /* Error */
.k { color: #006699; } /* Keyword */
.o { color: #555555 } /* Operator */
.cm { color: #999; } /* Comment.Multiline */ /* Edited to remove italics and make into comment */
.cp { color: #009999 } /* Comment.Preproc */
.c1 { color: #999; } /* Comment.Single */
.cs { color: #999; } /* Comment.Special */
.gd { background-color: #FFCCCC; border: 1px solid #CC0000 } /* Generic.Deleted */
.ge { font-style: italic } /* Generic.Emph */
.gr { color: #FF0000 } /* Generic.Error */
.gh { color: #003300; } /* Generic.Heading */
.gi { background-color: #CCFFCC; border: 1px solid #00CC00 } /* Generic.Inserted */
.go { color: #AAAAAA } /* Generic.Output */
.gp { color: #000099; } /* Generic.Prompt */
.gs { } /* Generic.Strong */
.gu { color: #003300; } /* Generic.Subheading */
.gt { color: #99CC66 } /* Generic.Traceback */
.kc { color: #006699; } /* Keyword.Constant */
.kd { color: #006699; } /* Keyword.Declaration */
.kn { color: #006699; } /* Keyword.Namespace */
.kp { color: #006699 } /* Keyword.Pseudo */
.kr { color: #006699; } /* Keyword.Reserved */
.kt { color: #007788; } /* Keyword.Type */
.m { color: #FF6600 } /* Literal.Number */
.s { color: #d44950 } /* Literal.String */
.na { color: #4f9fcf } /* Name.Attribute */
.nb { color: #336666 } /* Name.Builtin */
.nc { color: #00AA88; } /* Name.Class */
.no { color: #336600 } /* Name.Constant */
.nd { color: #9999FF } /* Name.Decorator */
.ni { color: #999999; } /* Name.Entity */
.ne { color: #CC0000; } /* Name.Exception */
.nf { color: #CC00FF } /* Name.Function */
.nl { color: #9999FF } /* Name.Label */
.nn { color: #00CCFF; } /* Name.Namespace */
.nt { color: #2f6f9f; } /* Name.Tag */
.nv { color: #003333 } /* Name.Variable */
.ow { color: #000000; } /* Operator.Word */
.w { color: #bbbbbb } /* Text.Whitespace */
.mf { color: #FF6600 } /* Literal.Number.Float */
.mh { color: #FF6600 } /* Literal.Number.Hex */
.mi { color: #FF6600 } /* Literal.Number.Integer */
.mo { color: #FF6600 } /* Literal.Number.Oct */
.sb { color: #CC3300 } /* Literal.String.Backtick */
.sc { color: #CC3300 } /* Literal.String.Char */
.sd { color: #CC3300; font-style: italic } /* Literal.String.Doc */
.s2 { color: #CC3300 } /* Literal.String.Double */
.se { color: #CC3300; } /* Literal.String.Escape */
.sh { color: #CC3300 } /* Literal.String.Heredoc */
.si { color: #AA0000 } /* Literal.String.Interpol */
.sx { color: #CC3300 } /* Literal.String.Other */
.sr { color: #33AAAA } /* Literal.String.Regex */
.s1 { color: #CC3300 } /* Literal.String.Single */
.ss { color: #FFCC33 } /* Literal.String.Symbol */
.bp { color: #336666 } /* Name.Builtin.Pseudo */
.vc { color: #003333 } /* Name.Variable.Class */
.vg { color: #003333 } /* Name.Variable.Global */
.vi { color: #003333 } /* Name.Variable.Instance */
.il { color: #FF6600 } /* Literal.Number.Integer.Long */
.css .o,
.css .o + .nt,
.css .nt + .nt { color: #999; }
Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 3.5 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 5.4 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 2.7 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 3.7 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 1.1 KiB

Depois

Largura:  |  Altura:  |  Tamanho: 5.3 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 3.0 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 128 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 82 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 50 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 19 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 3.0 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 6.5 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 486 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 564 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 369 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 76 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 41 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 7.1 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 51 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 30 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 42 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 25 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 22 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 7.0 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 398 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 4.3 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 4.3 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 316 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 305 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 213 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 345 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 117 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 172 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 301 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 292 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 405 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 370 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 312 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 452 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 264 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 13 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 1.2 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 1.1 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 14 KiB

-106
Ver Arquivo
@@ -1,106 +0,0 @@
## 2.0 BOOTSTRAP JS PHILOSOPHY
These are the high-level design rules which guide the development of Bootstrap's plugin apis.
---
### DATA-ATTRIBUTE API
We believe you should be able to use all plugins provided by Bootstrap purely through the markup API without writing a single line of javascript.
We acknowledge that this isn't always the most performant and sometimes it may be desirable to turn this functionality off altogether. Therefore, as of 2.0 we provide the ability to disable the data attribute API by unbinding all events on the body namespaced with `'data-api'`. This looks like this:
$('body').off('.data-api')
To target a specific plugin, just include the plugins name as a namespace along with the data-api namespace like this:
$('body').off('.alert.data-api')
---
### PROGRAMATIC API
We also believe you should be able to use all plugins provided by Bootstrap purely through the JS API.
All public APIs should be single, chainable methods, and return the collection acted upon.
$(".btn.danger").button("toggle").addClass("fat")
All methods should accept an optional options object, a string which targets a particular method, or null which initiates the default behavior:
$("#myModal").modal() // initialized with defaults
$("#myModal").modal({ keyboard: false }) // initialized with now keyboard
$("#myModal").modal('show') // initializes and invokes show immediately afterqwe2
---
### OPTIONS
Options should be sparse and add universal value. We should pick the right defaults.
All plugins should have a default object which can be modified to effect all instance's default options. The defaults object should be available via `$.fn.plugin.defaults`.
$.fn.modal.defaults = { … }
An options definition should take the following form:
*noun*: *adjective* - describes or modifies a quality of an instance
examples:
backdrop: true
keyboard: false
placement: 'top'
---
### EVENTS
All events should have an infinitive and past participle form. The infinitive is fired just before an action takes place, the past participle on completion of the action.
show | shown
hide | hidden
---
### CONSTRUCTORS
Each plugin should expose it's raw constructor on a `Constructor` property -- accessed in the following way:
$.fn.popover.Constructor
---
### DATA ACCESSOR
Each plugin stores a copy of the invoked class on an object. This class instance can be accessed directly through jQuery's data API like this:
$('[rel=popover]').data('popover') instanceof $.fn.popover.Constructor
---
### DATA ATTRIBUTES
Data attributes should take the following form:
- data-{{verb}}={{plugin}} - defines main interaction
- data-target || href^=# - defined on "control" element (if element controls an element other than self)
- data-{{noun}} - defines class instance options
examples:
// control other targets
data-toggle="modal" data-target="#foo"
data-toggle="collapse" data-target="#foo" data-parent="#bar"
// defined on element they control
data-spy="scroll"
data-dismiss="modal"
data-dismiss="alert"
data-toggle="dropdown"
data-toggle="button"
data-toggle="buttons-checkbox"
data-toggle="buttons-radio"
+68 -148
Ver Arquivo
@@ -2,85 +2,93 @@
// IT'S ALL JUST JUNK FOR OUR DOCS!
// ++++++++++++++++++++++++++++++++++++++++++
/*!
* JavaScript for Bootstrap's docs (http://getbootstrap.com)
* Copyright 2011-2014 Twitter, Inc.
* Licensed under the Creative Commons Attribution 3.0 Unported License. For
* details, see http://creativecommons.org/licenses/by/3.0/.
*/
!function ($) {
$(function(){
$(function () {
// Disable certain links in docs
$('section [href^=#]').click(function (e) {
// IE10 viewport hack for Surface/desktop Windows 8 bug
//
// See Getting Started docs for more information
if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
var msViewportStyle = document.createElement('style')
msViewportStyle.appendChild(
document.createTextNode(
'@-ms-viewport{width:auto!important}'
)
)
document.querySelector('head').appendChild(msViewportStyle)
}
var $window = $(window)
var $body = $(document.body)
var navHeight = $('.navbar').outerHeight(true) + 10
$body.scrollspy({
target: '.bs-docs-sidebar',
// offset: navHeight
})
$window.on('load', function () {
$body.scrollspy('refresh')
})
$('.bs-docs-container [href=#]').click(function (e) {
e.preventDefault()
})
// make code pretty
window.prettyPrint && prettyPrint()
// back to top
setTimeout(function () {
var $sideBar = $('.bs-docs-sidebar')
// add-ons
$('.add-on :checkbox').on('click', function () {
var $this = $(this)
, method = $this.attr('checked') ? 'addClass' : 'removeClass'
$(this).parents('.add-on')[method]('active')
})
$sideBar.affix({
offset: {
top: function () {
var offsetTop = $sideBar.offset().top
var sideBarMargin = parseInt($sideBar.children(0).css('margin-top'), 10)
var navOuterHeight = $('.bs-docs-nav').height()
// position static twipsies for components page
if ($(".twipsies a").length) {
$(window).on('load resize', function () {
$(".twipsies a").each(function () {
$(this)
.tooltip({
placement: $(this).attr('title')
, trigger: 'manual'
})
.tooltip('show')
})
return (this.top = offsetTop - navOuterHeight - sideBarMargin)
},
bottom: function () {
return (this.bottom = $('.bs-docs-footer').outerHeight(true))
}
}
})
}
}, 100)
// add tipsies to grid for scaffolding
if ($('#grid-system').length) {
$('#grid-system').tooltip({
selector: '.show-grid > div'
, title: function () { return $(this).width() + 'px' }
})
}
// fix sub nav on scroll
var $win = $(window)
, $nav = $('.subnav')
, navTop = $('.subnav').length && $('.subnav').offset().top - 40
, isFixed = 0
processScroll()
$win.on('scroll', processScroll)
function processScroll() {
var i, scrollTop = $win.scrollTop()
if (scrollTop >= navTop && !isFixed) {
isFixed = 1
$nav.addClass('subnav-fixed')
} else if (scrollTop <= navTop && isFixed) {
isFixed = 0
$nav.removeClass('subnav-fixed')
}
}
setTimeout(function () {
$('.bs-top').affix()
}, 100)
// tooltip demo
$('.tooltip-demo.well').tooltip({
selector: "a[rel=tooltip]"
$('.tooltip-demo').tooltip({
selector: '[data-toggle=tooltip]',
container: 'body'
})
$('.tooltip-test').tooltip()
$('.popover-test').popover()
$('.bs-docs-navbar').tooltip({
selector: 'a[data-toggle=tooltip]',
container: '.bs-docs-navbar .nav'
})
// popover demo
$("a[rel=popover]")
.popover()
.click(function(e) {
e.preventDefault()
})
$('[data-toggle=popover]').popover()
// button state demo
$('#fat-btn')
$('#loading-example-btn')
.click(function () {
var btn = $(this)
btn.button('loading')
@@ -88,94 +96,6 @@
btn.button('reset')
}, 3000)
})
// carousel demo
$('#myCarousel').carousel()
// javascript build logic
var inputsComponent = $("#components.download input")
, inputsPlugin = $("#plugins.download input")
, inputsVariables = $("#variables.download input")
// toggle all plugin checkboxes
$('#components.download .toggle-all').on('click', function (e) {
e.preventDefault()
inputsComponent.attr('checked', !inputsComponent.is(':checked'))
})
$('#plugins.download .toggle-all').on('click', function (e) {
e.preventDefault()
inputsPlugin.attr('checked', !inputsPlugin.is(':checked'))
})
$('#variables.download .toggle-all').on('click', function (e) {
e.preventDefault()
inputsVariables.val('')
})
// request built javascript
$('.download-btn').on('click', function () {
var css = $("#components.download input:checked")
.map(function () { return this.value })
.toArray()
, js = $("#plugins.download input:checked")
.map(function () { return this.value })
.toArray()
, vars = {}
, img = ['glyphicons-halflings.png', 'glyphicons-halflings-white.png']
$("#variables.download input")
.each(function () {
$(this).val() && (vars[ $(this).prev().text() ] = $(this).val())
})
$.ajax({
type: 'POST'
, url: 'http://bootstrap.herokuapp.com'
, dataType: 'jsonpi'
, params: {
branch: '2.0-wip'
, js: js
, css: css
, vars: vars
, img: img
}
})
})
})
// Modified from the original jsonpi https://github.com/benvinegar/jquery-jsonpi
$.ajaxTransport('jsonpi', function(opts, originalOptions, jqXHR) {
var url = opts.url;
return {
send: function(_, completeCallback) {
var name = 'jQuery_iframe_' + jQuery.now()
, iframe, form
iframe = $('<iframe>')
.attr('name', name)
.appendTo('head')
form = $('<form>')
.attr('method', opts.type) // GET or POST
.attr('action', url)
.attr('target', name)
$.each(opts.params, function(k, v) {
$('<input>')
.attr('type', 'hidden')
.attr('name', k)
.attr('value', typeof v == 'string' ? v : JSON.stringify(v))
.appendTo(form)
})
form.appendTo('body').submit()
}
}
})
}(window.jQuery)
}(jQuery)
-91
Ver Arquivo
@@ -1,91 +0,0 @@
/* ==========================================================
* bootstrap-alert.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ========================================================== */
!function( $ ){
"use strict"
/* ALERT CLASS DEFINITION
* ====================== */
var dismiss = '[data-dismiss="alert"]'
, Alert = function ( el ) {
$(el).on('click', dismiss, this.close)
}
Alert.prototype = {
constructor: Alert
, close: function ( e ) {
var $this = $(this)
, selector = $this.attr('data-target')
, $parent
if (!selector) {
selector = $this.attr('href')
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
}
$parent = $(selector)
$parent.trigger('close')
e && e.preventDefault()
$parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
$parent.removeClass('in')
function removeElement() {
$parent.remove()
$parent.trigger('closed')
}
$.support.transition && $parent.hasClass('fade') ?
$parent.on($.support.transition.end, removeElement) :
removeElement()
}
}
/* ALERT PLUGIN DEFINITION
* ======================= */
$.fn.alert = function ( option ) {
return this.each(function () {
var $this = $(this)
, data = $this.data('alert')
if (!data) $this.data('alert', (data = new Alert(this)))
if (typeof option == 'string') data[option].call($this)
})
}
$.fn.alert.Constructor = Alert
/* ALERT DATA-API
* ============== */
$(function () {
$('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
})
}( window.jQuery )
-98
Ver Arquivo
@@ -1,98 +0,0 @@
/* ============================================================
* bootstrap-button.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ============================================================ */
!function( $ ){
"use strict"
/* BUTTON PUBLIC CLASS DEFINITION
* ============================== */
var Button = function ( element, options ) {
this.$element = $(element)
this.options = $.extend({}, $.fn.button.defaults, options)
}
Button.prototype = {
constructor: Button
, setState: function ( state ) {
var d = 'disabled'
, $el = this.$element
, data = $el.data()
, val = $el.is('input') ? 'val' : 'html'
state = state + 'Text'
data.resetText || $el.data('resetText', $el[val]())
$el[val](data[state] || this.options[state])
// push to event loop to allow forms to submit
setTimeout(function () {
state == 'loadingText' ?
$el.addClass(d).attr(d, d) :
$el.removeClass(d).removeAttr(d)
}, 0)
}
, toggle: function () {
var $parent = this.$element.parent('[data-toggle="buttons-radio"]')
$parent && $parent
.find('.active')
.removeClass('active')
this.$element.toggleClass('active')
}
}
/* BUTTON PLUGIN DEFINITION
* ======================== */
$.fn.button = function ( option ) {
return this.each(function () {
var $this = $(this)
, data = $this.data('button')
, options = typeof option == 'object' && option
if (!data) $this.data('button', (data = new Button(this, options)))
if (option == 'toggle') data.toggle()
else if (option) data.setState(option)
})
}
$.fn.button.defaults = {
loadingText: 'loading...'
}
$.fn.button.Constructor = Button
/* BUTTON DATA-API
* =============== */
$(function () {
$('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) {
$(e.target).button('toggle')
})
})
}( window.jQuery )

Alguns arquivos não foram exibidos porque demasiados arquivos foram alterados neste diff Mostrar Mais