root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity
19,170 Commits 125 Branches 94 Tags 674 MiB
Commit Graph

19170 Commits

Author SHA1 Message Date
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