Commit Graph

33 Commits

Author SHA1 Message Date
Mark Otto eb19def798 flex the footer and include some margin magic
- we need to set margin for space between footer buttons as flexbox doesn't render HTML spaces like inline-block does

- flexbox doesn't have collapsing margins or anything, so we hack it with some :not(:first-child) and :not(:last-child) action
2016-12-25 15:28:44 -08:00
Mark Otto 33746dc63e flex the modal header so we can remove custom styles
updates the dom order in our docs to match (floated content comes first, but no need for that in flexbox)
2016-12-25 15:28:44 -08:00
Mark Otto e7f8ca08b0 No need to override a margin-top that never was set; only specify margin-bottom override 2016-12-25 15:28:44 -08:00
Mark Otto 31b9d93ffd Enable flex on the .modal-content, ensure .modal-body stretches the height (if needed) 2016-12-25 15:28:44 -08:00
Mark Otto 8eeb71c91c Merge branch 'fix-20982' of https://github.com/Starsam80/bootstrap into Starsam80-fix-20982 2016-12-19 21:44:03 -08:00
Jesse Mandel f3282b5656 Update _modal.scss (#21346)
pull->float comment
2016-12-19 20:34:27 -08:00
Tom Lutzenberger e1653edb95 Add variables for transitions (#21345)
* Add variables for transitions

* Add variables for transitions
2016-12-19 20:33:17 -08:00
Starsam80 bf39bb3ac3
Rename `.active` to `.show` 2016-12-07 21:20:15 -07:00
Starsam80 b226766b62 Remove lots of duplication + minor cleanup (#21238)
* Remove comment that duplicated some code
* Use transition mixin whenever possible
* Create a new function to reduce duplication
* Use the new `breakpoint-infix` method
2016-11-28 13:23:59 -08:00
Elliot Evans 7f05cb9e94 renamed modal-title-padding to modal-header-padding 2016-11-10 22:37:20 +00:00
Mark Otto 115a37db1a Change variable for modal backdrop zindex, rearrange to be ordered from lowest to highest 2016-10-27 09:31:38 -07:00
Starsam80 aa08274d24
Rename .in to .active to fix collapse 2016-10-26 17:24:46 -06:00
Chris Rebert 1ca6c9d7f1 Remove `-webkit-overflow-scrolling: touch` due to an iOS Safari bug (#20803)
See https://bugs.webkit.org/show_bug.cgi?id=158342
Fixes #17695
2016-10-03 21:36:46 -07:00
VarelloThemes 63129112bb replace some profanities (#20715) 2016-09-15 09:39:31 -07:00
Chris Rebert ef89acb974 Extract $modal-content-border-width variable
[skip sauce]
[skip validator]
2016-02-15 23:45:28 -08:00
Chris Rebert ece0775bee Extract $modal-{header,footer}-border-width variables
[skip sauce]
[skip validator]
2016-02-15 23:35:57 -08:00
Chris Rebert e1be284d0c Extract $modal-dialog-sm-up-margin-y variable
[skip sauce]
[skip validator]
2016-02-15 23:24:41 -08:00
Chris Rebert b35aa23453 Extract new $modal-dialog-margin variable
[skip sauce]
[skip validator]
2016-02-15 23:10:38 -08:00
Mark Otto 4b97596982 Fixes #18949: Remove extra margin overrides for buttons in .modal-footer 2016-02-08 22:34:38 -08:00
Mark Otto 6c2b0d2b76 Updat modal sizing
- Switch from width to max-width for all widths to avoid scaling outside viewport bounds
- Rejigger the media queries for a more logical breakpoint for the large and small modal sizes
- Avoids changing the width of the default modal (nullifying #17794 and fixing #17581)
2016-02-06 20:18:48 -08:00
Chris Rebert 802c1cb5fc Extract variables for .modal-content box-shadow
[skip sauce]
[skip validator]
2016-01-16 20:25:00 -08:00
Anders Sahlin ea4a79c689 Modals respect $enable-rounded setting
See issue: https://github.com/twbs/bootstrap/issues/18385
2016-01-11 14:02:14 +01:00
Mark Otto b2dccb15d7 fix majority of scss linter errors 2015-08-23 01:00:22 -07:00
Mark Otto c3373df95f clean out comments that aren't all that helpful 2015-08-17 18:33:34 -07:00
Mark Otto 699f307112 fix fat's broke js... jk it was my shitty css 2015-08-12 21:14:59 -07:00
Mark Otto 1ddc3f5e21 Merge branch 'master' into v4m 2015-08-04 22:29:45 -07:00
Mark Otto ac1ed746ef more comments and formatting clean up 2015-04-18 11:38:47 -07:00
Mark Otto ef0b88f6b3 fix order 2015-03-29 00:13:30 -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
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
Gleb Mazovetskiy 93f51eb0e9 Automate breakpoints
Breakpoints and container widths are now defined as maps.
2014-12-24 22:27:11 +02: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