root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
7,906 Commits 110 Branches 92 Tags 666 MiB
Commit Graph

3411 Commits

Author SHA1 Message Date
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 5fcdf1229d Fixes #8001: add IDs for example inputs 2013-06-19 19:02:29 -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
Chris Rebert 7b60d04f0c docs/javascript.html: backticks -> <code> 2013-06-18 14:35:37 -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
Mark Otto 5f3f73c620 Merge pull request #8184 from FLOKER/3.0.0-wip 
redundant lines removed
 2013-06-16 20:48:27 -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
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
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 c14f23192a Merge pull request #8167 from marsuboss/patch-1 
Duplicate ID drop5
 2013-06-13 13:40:40 -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
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 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 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 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 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 a05f6d4cea fixes #8066: add missing % functions to grid less code 2013-06-03 11:58:38 -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 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
Robert Burns 97e6e5f150 Fix navbar toggles 2013-06-02 17:51:36 -04: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 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
Robert Burns cc684750e5 Fix for carousel indicators 2013-06-01 08:15:40 -04: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
fat a7a87c8e8c rebuild 2013-05-27 12:48:16 -07:00
fat 9257bdc097 fixes #7163 2013-05-27 12:45:13 -07: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 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
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 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
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
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
AJ Acevedo 9a2218dd38 Fixed broken Customizer link for docs 2013-05-21 02:23:19 -04: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 5f7352a6fe Better grid template; link color change in docs navbar 2013-05-16 22:11:31 -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 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
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
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 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 6307dc40d7 Fixes #7898: ensure button type 
Sets `type="button"` on all buttons in the docs
 2013-05-15 10:01:09 -07: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
Robert Burns da9cf1009b Fix glyphicon in "Dropdown in a button group" example 2013-05-13 21:40:48 -04:00
Robert Burns a38a3429fc Fix caret position 2013-05-13 20:03:53 -04: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 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
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 23b32fec65 Recompiled using makefile recess 2013-12-05 01:36:19 +05:30
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
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
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 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
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 9013ff002a add offcanvas layout example based on bradfrost/this-is-responsive 2013-05-08 14:25:37 +02: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 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 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
Edgar Schnueriger 240305321f fixed not working example code for modals 2013-05-06 09:48:05 +02: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 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 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 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 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 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 07117f97b6 Use padding instead of #push with box-sizing: border-box 2013-05-03 15:23:10 +12: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 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 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
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 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
Robert Burns 3326e1b21e Fix navbar on phone/tablet devices after navbar overhaul 2013-04-28 10:09:57 -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
Stephen Edgar 8311ad513f 'docs' folder .editorconfig code guide updates 2013-04-24 14:38:51 +02: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
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 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
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