root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity
4,629 Commits 133 Branches 94 Tags 680 MiB
Commit Graph

1425 Commits

Author SHA1 Message Date
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
Aaron 94cc333553 Fix component margin and padding values to use @line-height-computed 2013-05-10 09:21:27 -06: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 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 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
Blake Embrey 4a03d45651 Make icons antialiased on Webkit browsers. 2013-05-09 13:48:02 -07:00
Blake Embrey cc5e6619b4 Remove backface-visibility from progress bars. 2013-05-09 13:09:33 -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 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
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 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 f06294d80f Outdent nav links a bit more so they line up in navbar 2013-05-07 10:33:41 -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
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 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 e1d947f53e Scope .table-bordered styles to immediate children only 2013-05-03 14:56:57 -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 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
Kevin Ingersoll 08fea3304a Fix input border flicker in Chrome from @garoevans, closes #7689 2013-05-03 15:33:12 +12:00
DarDar 9cd3a92713 Use @font-size-... variables instead of hardcoded font-size in px 2013-05-02 08:05:00 +02: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 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
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
Robert Burns c087e383ed Fix navbar-toggle after commit bbee78b30b 
The following commit introduced an issue with the navbar toggle placement:
bbee78b30b
 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
Robert Burns 3326e1b21e Fix navbar on phone/tablet devices after navbar overhaul 2013-04-28 10:09:57 -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
Artur Kwiatkowski 270db6f55e - changed comments 
- added hover and focus state for [href] color variations
 2013-04-24 14:38:53 +02:00
Stephen Edgar 22a1a7273a 'less' folder .editorconfig code guide updates 2013-04-24 14:38:49 +02:00
Chris Rebert 159105dad3 Fixes #7661 2013-04-24 14:38:46 +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 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
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 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 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
Artur Kwiatkowski 3861e3f5d5 replaced parametric .is() mixin with non-parametric .a() to simplify usage 2013-04-20 15:54:48 +02:00
Artur Kwiatkowski 39bb8146f8 more nested labels component 2013-04-19 21:31:55 +02: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
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
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
Artur Kwiatkowski dc97a1967b more nested navs 2013-04-16 16:45:51 +02: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 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 5fbe66307f more specific comment, better placement of code 2013-04-13 21:45:21 -07: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
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 24f8d9e137 don't use table for label variatons 2013-04-09 10:43:37 -07: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
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 7ff40635d4 fixes #7497: use var for jumbotron border radius 2013-04-07 11:44:17 -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 7a8d071735 use font-size-base var 2013-04-05 11:42:29 -07:00