0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-13 01:08:58 +01:00
Commit Graph

90 Commits

Author SHA1 Message Date
Mark Otto
612d287a07 Fixes #18550: really remove that reference 2016-02-06 20:46:11 -08:00
Mark Otto
d7d0e186bd Merge branch 'v4-dev' into v4-split-buttons 2016-02-06 20:33:26 -08:00
Mark Otto
64b88bd707 remove comment 2016-02-06 20:28:36 -08:00
Mark Otto
ba37c37615 Redo line-height globally
- Rename -height to -height-base to match other vars
- Drop use of -height across the board and rely on it to be inherited
- Adjust padding of .dropdown-header to account for different line-height of h6 heading element (this needs refactoring for variables and rems also)
2016-02-03 19:45:13 -08:00
Mark Otto
3a2f0456bf Merge pull request #18883 from twbs/zindex-dropdown-backdrop
Use proper variable for .dropdown-backdrop's z-index
2016-01-17 15:25:58 -08:00
Chris Rebert
58f7e602ae Extract $dropdown-box-shadow variable 2016-01-16 20:23:37 -08:00
Chris Rebert
27a7fff0fb Use proper variable for .dropdown-backdrop's z-index 2016-01-13 16:21:52 -08:00
Mark Otto
f6ad665c26 Switch up some split button stuff
- New vars
- New function for stripping units so we can combine rems and ems in math functions
- Add new classes for sizing and spacing around the split dropdown toggle so that the caret isn't misaligned
2016-01-08 13:23:24 -08:00
Mark Otto
c68019e5d0 Merge pull request #18257 from twbs/border-width-vars
Add more border width variables
2015-11-29 19:52:22 -08:00
Chris Rebert
a23cf74340 _dropdown.scss: Revise comments; fixes #18363
[skip sauce]
2015-11-27 20:12:37 -08:00
Chris Rebert
2ea8950b26 Add $dropdown-border-width; refs #18150 2015-11-14 22:40:43 -08:00
Chris Rebert
76f7056321 $dropdown-border => $dropdown-border-color 2015-11-14 22:28:45 -08:00
Chris Rebert
6d591edcb7 .dropdown-menu: Swap color and font-size property order to make SCSS Lint happy 2015-11-13 00:21:43 -08:00
Chris Rebert
98ec749117 Swap margin-right and margin-left ordering in .dropdown-toggle::after to make SCSS Lint happy
[ci skip]
2015-11-13 00:19:19 -08:00
Mark Otto
f25d709025 Merge pull request #18061 from mathisonian/patch-1
remove bro from comment
2015-11-12 23:37:02 -08:00
Mark Otto
c1af4aa227 Merge pull request #17277 from kkirsche/patch-5
v4 — Use the body color for dropdown menu text in navbars
2015-11-12 22:17:02 -08:00
Mark Otto
8d46755f99 Merge pull request #17137 from kkirsche/patch-10
v4: Dropdown caret is not horizontally alligned
2015-11-12 21:32:22 -08:00
Matthew Conlen
94043ac71c remove bro from comment 2015-10-26 13:40:08 -04:00
Kevin Kirsche
57943ed8ee Use the body color for dropdown menu text
Fix #17276
2015-09-01 21:23:43 -07:00
Felipe
67995d034e PropertySortOrder
Properties should be ordered border-top, border-bottom
2015-08-24 16:44:55 -05:00
Kevin Kirsche
d51f0a4f81 Use double colons for psuedo elements
Fix #17052
2015-08-24 13:22:10 -04:00
Mark Otto
19deadda95 shorter 2015-08-23 23:00:47 -07:00
Mark Otto
02069152a2 Merge pull request #17147 from kkirsche/patch-14
v4 - Dropup caret direction incorrect
2015-08-23 22:59:43 -07:00
Kevin Kirsche
e707a45b1f v4 - Dropup caret direction incorrect
Fix #17144
2015-08-23 08:12:56 -04:00
Mark Otto
a5bfbe0fca fix remaining scss lint errors 2015-08-23 01:12:00 -07:00
Kevin Kirsche
b093f010df v4: Dropdown caret is not horizontally alligned
Fix #17135
2015-08-20 11:29:23 -04:00
Mark Otto
c3373df95f clean out comments that aren't all that helpful 2015-08-17 18:33:34 -07:00
Mark Otto
29b4031db5 allow <button> elements as .dropdown-item's 2015-08-17 18:18:37 -07:00
Mark Otto
1d222a596e un-nest .dropdown-divider 2015-08-17 11:21:10 -07:00
Mark Otto
e558f490dd Rewrite dropdowns
- Remove nested > selectors for dropdown items
- Update docs examples to use all the new markup
2015-08-17 11:19:14 -07:00
Mark Otto
121615ceba dropdown fixes and dropdown docs tweaks 2015-08-10 16:31:28 -07:00
Mark Otto
ed42fc9b76 line-height-base to line-height var 2015-06-22 23:24:32 -07:00
Mark Otto
0ca9b21c34 drop the base (hahaha), no but seriously drop the -base from our vars since it's cleaner 2015-06-22 18:53:04 -07:00
Mark Otto
09886480e0 remove commented out code for auto aligning navbar dropdown menus 2015-04-18 11:17:42 -07:00
Chris Rebert
8e374bd010 put all :hover styles within @media (hover: hover) 2015-01-22 11:37:37 -08:00
Mark Otto
325748ff68 Merge branch 'master' into v4
Conflicts:
	_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
	dist/js/bootstrap.min.js
	docs/_includes/components/thumbnails.html
	docs/_includes/css/forms.html
	docs/_includes/css/grid.html
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/template.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/assets/css/docs.min.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.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/dist/js/bootstrap.js
	docs/dist/js/bootstrap.min.js
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/non-responsive/index.html
	docs/examples/theme/index.html
	grunt/configBridge.json
	less/alerts.less
	less/badges.less
	less/jumbotron.less
	less/panels.less
	less/tables.less
	less/theme.less
	less/variables.less
	package.json
	scss/_button-group.scss
	scss/_buttons.scss
	scss/_forms.scss
2015-01-19 14:48:12 -08:00
Chris Rebert
cbb3b1ff9a Kill scss/mixins/_media-queries.scss
replaced media-xs => media-breakpoint-down(xs)
replaced media-sm => media-breakpoint-up(sm)
replaced media-sm-max => media-breakpoint-only(sm)
replaced media-md => media-breakpoint-up(md)
replaced media-md-max => media-breakpoint-only(md)
replaced media-lg => media-breakpoint-up(lg)
2015-01-06 17:47:13 -08:00
Chris Rebert
8250f41948 rm trailing whitespace 2014-12-19 18:35:58 -08:00
Mark Otto
fef873a840 fix all validation, turn off some settings, add sort order 2014-12-11 12:05:29 -08:00
Mark Otto
27df020852 convert to scss 2014-12-02 14:02:35 -08:00