rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Code Issues Actions Packages Releases Activity
7,744 Commits 108 Branches 89 Tags 552 MiB
0fab6e7ea7
Commit Graph

161 Commits

Author SHA1 Message Date
Mark Otto
5663833bfc Restore .btn-info 2013-01-17 19:51:22 -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
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
1916eb7c7f Fix btn link hover and tweak dropdown border/shadows 2013-01-13 04:04:16 -08:00
Mark Otto
01db5db2f6 white text on buttons on hover for links 2013-01-12 20:08:13 -08:00
Mark Otto
583fc4b962 buttons and button group flattening improvements 2013-01-12 18:52:06 -08:00
Mark Otto
a9a66e9c34 finetune buttons flattened colors 2013-01-12 17:51:57 -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
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
c11f41ba04 flatten buttons and forms 2012-12-21 00:50:28 -08:00
Mark Otto
14844db862 Holy shit, buttons, button states, and input states updated 2012-12-19 23:37:33 -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
9b4e5746a4 More button tweaks 2012-12-19 22:54:04 -08:00
Mark Otto
afef81c0d7 remove commented out buttons css, update docs 2012-12-19 22:30:08 -08:00
Mark Otto
c38b7206eb overhaul buttons 2012-12-19 22:25:56 -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
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
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
be45a821bb Fixes #6148: Icons in mini buttons properly aligned 2012-12-07 09:51:01 -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
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
f2bbee2075 remove * line-height 2012-11-08 23:56:29 -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
075e320a83 remove unnecessary bg declarations in buttons per #5684 2012-11-04 13:26:03 -08: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
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
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
dd8b745b88 use border-radius vars where possible 2012-10-03 09:26:52 -07:00
Mark Otto
8da78223ff reset input and button heights with updated padding 2012-10-01 00:19:29 -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
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
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
0220015edd remove all ie7 conditionals and mixins 2012-09-25 22:07:53 -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
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
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
beb0b64096 fixes #4889: btn-link disabled styles 2012-08-31 14:02:18 -07:00
Luis Aleman
2719ac3e9b Unescaped box-shadows to take advantage of new box-shadow mixin 2012-08-27 19:14:00 -04:00
Mark Otto
3b67ece2d1 fixes #4666: overrides for input types with .btn-block 2012-08-27 15:39:55 -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
94ba211c40 fixes #4462: mixins instead of vanilla css 2012-08-19 20:32:29 -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
Mark Otto
5b947b8a2f fix up padding on small buttons, add button examples 2012-08-17 16:11:52 -07:00
tobz
27e9214e05 Removed pixel designation from a zeroed-out property. 2012-08-15 10:38:59 -03:00
tobz
6bfa58ea4d Updated margin adjustments of button-based icon overrides. 2012-08-15 10:37:49 -03:00
Mark Otto
f3479a3953 compensate for ie7 button padding with no borders, fix indentation 2012-08-14 15:44:25 -07:00
Mark Otto
b979cd9e67 darken default button borders 2012-08-01 17:01: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
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
aac3736eea fixes #3845: add .btn-link for transparent buttons styled as links 2012-07-17 23:32:52 -07: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
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
nextgenthemes
7d1c8c2a0c Wrapped btn:hover, btn.disabled inside .btn 2012-07-07 23:20:50 +03:00
Mark Otto
68146db004 buttons and pre updates for font-size 2012-07-05 15:15:57 -07:00
Mark Otto
62c386259b rewrite docs homepage, new graphics 2012-07-04 23:31:30 -07:00
Mark Otto
70e81e6f55 new jumbotron 2012-07-01 08:42:09 -07:00
Mark Otto
cd2d82150c standardize top level file comments 2012-06-28 21:46:45 -07:00
Mark Otto
1c2db11d58 fix ie7 button group toggles and button borders 2012-04-24 01:46:20 -07:00
Mark Otto
419e50e339 fix up buttons after recess property order 2012-04-23 10:06:35 -07:00
Jacob Thornton
2881269e16 lots of property ordering 2012-04-16 16:34:08 -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
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
Mark Otto
a5552a1d70 revert bart's mixin fix 2012-03-25 12:42:47 -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
7f3a2b3813 button group sizes for ie7 fixes 2012-03-12 12:44:47 -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
d3e922f0c8 add a ton new variables for type, buttons, inputs 2012-03-05 00:29:16 -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
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
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
e7d45184f1 swap last .btn-dark reference 2012-02-17 20:25:49 -08:00
Andreas Cederström
1e6d386b8d Keep origin in track 2012-02-17 13:31:36 +01:00
Mark Otto
268e7d67ab add mini buttons per #1971 2012-02-16 21:28:16 -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
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
24df7f1e1d update ff comment in buttons 2012-02-12 13:20:08 -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
4ddc8fd0e4 remove color on :active of buttons 2012-02-11 16:43:53 -08:00
Simon
451a642ae8 Added a black/dark button 2012-02-09 23:08:14 +01: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
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
8a1769c9e2 fix missing ; in buttons.less 2012-02-01 18:18:39 -08:00
Mark Otto
5c9a687665 fix button styles on active and disabled 2012-01-30 23:16:27 -08:00
Mark Otto
0f3a073b8d *really* refactor the buttons and update them all over the docs 2012-01-30 21:15:57 -08:00
Mark Otto
21bebe77fe refactor buttons.less 2012-01-30 20:50:51 -08:00
Mark Otto
2d40b07afc adding warning (orange) button, fix responsive navbar problem 2012-01-30 08:15:28 -08:00
Mark Otto
2bfda031ce darken buttons, uncomment out firefox keyframes from progress bars 2012-01-28 12:43:19 -08:00
Mark Otto
28ba9d69c8 nav, buttons, and docs updates to account for outline: 0; on :active 2012-01-28 11:21:39 -08:00
Mark Otto
3934d1b6c4 rgba text color on active buttons for a bit more contrast from their non-active siblings 2012-01-27 21:08:04 -08:00
Mark Otto
9800196bf7 use quotes on attr selectors more consistently 2012-01-27 20:05:03 -08:00