0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-03-15 15:29:22 +01:00

60 Commits

Author SHA1 Message Date
Mark Otto
169d2a4a78 Merge branch 'master' into v4 2015-06-18 23:56:43 -07:00
Chris Rebert
f09e796429 Merge pull request #16567 from justincron/master
Fixed typo in hide-text.less
[skip sauce]
[skip validator]
2015-06-01 16:55:00 -07:00
Justin Cron
565037a914 Fixed typo 2015-06-01 13:17:32 -07:00
Mark Otto
c5babda02f Merge pull request #16215 from zacechola/list_group_buttons
Adds button styles to `.list-group-item`
2015-05-13 21:35:39 -07:00
Kevin Kirsche
5907347382 [Closes #16460] Fix .pagination-sm line height
[Closes #16460] Fix .pagination-sm line height by adding `@line-height-small` to `.pagingation-sm`.
2015-05-13 16:30:40 -04:00
Zac Echola
407e8dc9d8 Merge branch 'master' of https://github.com/twbs/bootstrap into list_group_buttons 2015-04-28 09:45:16 -05:00
Thomas P. Horton
c319d610e2 Round results from gutter division to prevent decimal margins and padding 2015-04-23 20:06:54 -07:00
Chris Rebert
5359cb8054 Reset text/font properties more thoroughly for tooltips+popovers; fixes #15925
[skip sauce]
2015-04-08 00:52:10 -07:00
Zac Echola
e46c998316 Adds button styles to .list-group-item
Includes buttons with anchor sytles and modifies buttons to match width
and text alignment.
2015-04-02 14:07:53 -05:00
Mark Otto
c82cae9a48 nuke leftover less 2015-03-30 17:22:10 -07:00
Mark Otto
58082cd83e Merge branch 'master' into v4
Conflicts:
	.gitignore
	Gruntfile.js
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.js
	dist/js/bootstrap.min.js
	docs/_includes/components/navbar.html
	docs/_includes/components/progress-bars.html
	docs/_includes/css/grid.html
	docs/_includes/css/overview.html
	docs/_includes/customizer-variables.html
	docs/_includes/getting-started/accessibility.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/getting-started/community.html
	docs/_includes/getting-started/disabling-responsiveness.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/examples.html
	docs/_includes/getting-started/license.html
	docs/_includes/getting-started/third-party-support.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/popovers.html
	docs/_includes/js/scrollspy.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/js/transitions.html
	docs/_includes/nav/javascript.html
	docs/_includes/nav/main.html
	docs/about.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/src/customizer.js
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/js/bootstrap.js
	docs/dist/js/bootstrap.min.js
	docs/migration.html
	js/affix.js
	js/alert.js
	js/button.js
	js/carousel.js
	js/collapse.js
	js/dropdown.js
	js/modal.js
	js/popover.js
	js/scrollspy.js
	js/tab.js
	js/tests/unit/affix.js
	js/tests/unit/button.js
	js/tests/unit/carousel.js
	js/tests/unit/modal.js
	js/tests/unit/tooltip.js
	js/tests/visual/modal.html
	js/tooltip.js
	less/component-animations.less
	less/jumbotron.less
	less/mixins/background-variant.less
	less/mixins/buttons.less
	less/mixins/responsive-visibility.less
	less/mixins/text-emphasis.less
	less/navbar.less
	less/navs.less
	less/scaffolding.less
	less/tooltip.less
	less/utilities.less
	less/variables.less
	package.json
	scss/_buttons.scss
	scss/_forms.scss
	scss/_modal.scss
2015-03-29 00:08:54 -07:00
Mark Otto
b5fefefd49 Match all other responsive utilities and use important on the display: table 2015-03-28 20:34:06 -07:00
Patrick H. Lauke
59bbb65e5f Merge pull request #16154 from patrickhlauke/focus-active-disambiguation
Darker style focus/hover on active buttons
2015-03-28 00:40:34 +00:00
Serhan Apaydın
85837639ee Make .bg-variant adjust :focus color in addition to :hover color 2015-03-26 11:45:17 +02:00
Serhan Apaydın
ba2d556455 Make .text-emphasis-variant adjust :focus color in addition to :hover color
Closes #16047 by merging a tweaked version of it.
2015-03-25 22:08:36 -07:00
Patrick H. Lauke
068675c72c Darker style focus/hover on active buttons
Currently, hovering with mouse or setting focus on a button which is
active has same styling as on a non-active button. This results in
problems for keyboard users, who set focus on a toggle and activate it,
but cannot visually see that their action had any effect. Ditto for
mouse users hovering over a toggle and clicking it. This adds an
explicit additional style for focus/hover on active buttons.
Note that this does not address issues of browser focus remaining on a
button after a mouse click (e.g. #13971), as this will likely require
extra JavaScript to fix.
2015-03-25 22:52:49 +00:00
Chris Rebert
75ec7393ec Add summary of #11526 to explanatory Less comment
[skip sauce]
[skip validator]
2014-12-22 17:24:37 -08:00
Mark Otto
27df020852 convert to scss 2014-12-02 14:02:35 -08:00
Mark Otto
15d98dc6b7 disable shadows on buttons for now 2014-11-25 17:47:32 -08:00
Mark Otto
86af1f39ab Merge branch 'master' into derp
Conflicts:
	Gruntfile.js
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/components/button-groups.html
	docs/_includes/components/jumbotron.html
	docs/_includes/components/media.html
	docs/_includes/components/navs.html
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/js/carousel.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/getting-started.html
	docs/_includes/nav/javascript.html
	docs/_layouts/default.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/assets/js/raw-files.min.js
	docs/browser-bugs.html
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/examples/justified-nav/index.html
	less/_forms.less
	less/_tooltip.less
	less/navs.less
	less/theme.less
2014-11-09 22:02:53 -08:00
Bass Jobsen
b8dbb545ac Update grid-framework.less
The `when (@index = 1)` guards are not needed cause the mixins already only match on arity.
2014-10-30 01:20:35 +01:00
Mark Otto
2beb2e9fcf rename media query mixins to .media-* 2014-09-17 21:57:51 -07:00
mrmrs
c6a69e09fe Add partial for media query mixins. 2014-09-17 21:52:07 -07:00
Mark Otto
9f2aeafe85 Merge branch 'master' into derp
Conflicts:
	Gruntfile.js
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/fonts/glyphicons-halflings-regular.svg
	docs/_includes/components/badges.html
	docs/_includes/components/input-groups.html
	docs/_includes/components/pagination.html
	docs/_includes/css/forms.html
	docs/_includes/footer.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/getting-started/grunt.html
	docs/_includes/home-nav.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/modal.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/getting-started.html
	docs/_includes/nav/javascript.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/browser-bugs.html
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/fonts/glyphicons-halflings-regular.svg
	fonts/glyphicons-halflings-regular.svg
	less/_button-group.less
	less/_jumbotron.less
	less/_variables.less
	less/mixins/vendor-prefixes.less
	less/panels.less
	less/thumbnails.less
	package.json
2014-09-17 15:21:31 -07:00
Mark Otto
9f5660c3e3 Fixes #14545: Avoid strange formatting on vendor prefixing for placeholder 2014-09-06 21:25:33 -07:00
vsn4ik
a03d269287 Less: Remove empty lines and blanks. 2014-08-26 02:24:09 +04:00
Mark Otto
a63c066e3d rearrange a few things; drop compiled theme file 2014-07-11 22:46:10 -07:00
Mark Otto
02fe0ecc31 Drop deprecated code from Less files 2014-07-09 13:54:32 -07:00
Mark Otto
54537b500e Refactor: drop all custom .progress-bar styles and replace with <progress> element 2014-07-09 01:39:34 -07:00
Mark Otto
f380ca21e2 Use .box-shadow() mixin so we can enable/disable them 2014-07-08 21:19:14 -07:00
Mark Otto
ff4ff3bd06 Drop: .opacity() mixin because we no longer support IE8 2014-07-08 19:22:19 -07:00
Mark Otto
c825629ffe Nuke all IE8 fallbacks and comments and hacks 2014-07-08 19:20:45 -07:00
Mark Otto
f6367bc0e4 Implement the new border-radius guard: only round things if global @enable-rounded == true 2014-07-08 16:25:01 -07:00
Mark Otto
527eccaa9f Drop: Panels completely, as they'll be replaced 2014-07-08 03:56:47 -07:00
Mark Otto
77bccf8998 Update grid mixins section of the docs 2014-07-08 03:43:44 -07:00
Mark Otto
c3b0870ec0 Overhaul semantic grid mixins
- Drops all the `.make-**-column` mixins for a single set to be used
within (or outside) media queries.
- Renames `.container-fixed` to `.make-container` for consistency.
- Updates built-in grid system to use new setup.

See http://jsbin.com/qiqet/2/ for an example of it in action.
2014-07-08 03:38:23 -07:00
Mark Otto
d7b38d8c4a Drop: all vendor prefix mixins because autoprefixer 2014-07-08 02:04:48 -07:00
Mark Otto
c769d7c21f Part 1 for fixing #13996: Revert the width: 100% \9; IE hack for SVG img-responsive 2014-07-07 16:59:59 -07:00
Mark Otto
9ed9eb97ee Follow up to #13907: Add .focus styles for buttons 2014-07-07 00:56:06 -07:00
Mark Otto
b4958aba69 merge in and resolve conflicts 2014-07-02 22:54:56 -07:00
Bas Bosman
ae793ad749 Use full deprecation version 2014-06-19 11:09:35 +02:00
Mark Otto
a012ba465d lol words 2014-06-18 23:21:44 -07:00
Mark Otto
99f176e7ec rewrite striped and active to deprecate the parent selectors, change the docs 2014-06-18 22:35:05 -07:00
Mark Otto
783b2268c2 change skew(x,y) to skewX skewY because mdn told me so 2014-06-18 21:26:53 -07:00
Mark Otto
46e8a5817d fixes #10073: add width: 100%; for ie10 and below to size svg.img-responsive correctly 2014-06-18 17:34:09 -07:00
Mark Otto
4fd4681221 Merge pull request #13687 from smmoosavi/patch-1
Color Contrast for panel heading
2014-06-10 22:49:23 -07:00
Bas Bosman
c6c8093085 Fix gutter variable 2014-06-10 16:46:04 +02:00
Mark Otto
e06970948b Fixes #13616: Add custom gutter support to containers 2014-06-10 00:24:23 -07:00
Mark Otto
8d9ef8f0a1 Addresses part of #13643: Correct webkit-linear-gradient syntax in horizontal gradients 2014-06-08 23:02:16 -07:00
سید مرتضی موسوی
67a332c97b fix variables in panels.less 2014-05-27 17:09:47 +04:30