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

53 Commits

Author SHA1 Message Date
Martijn Cuppens
7bd1bc2431 Allow multiple ways of padding declaration for modal header (#26976)
* #26967: Allow multiple ways of padding declaration for modal header
* #26976: split vertical and horizontal modal padding
2018-09-18 21:33:31 -07:00
ysds
5266669d34 Remove extra line break 2018-08-28 02:22:46 +03:00
Mark Otto
df3993a600 Round corners on modal footer
Matches the method used for the modal header. Fixes #26955.
2018-08-25 18:49:09 +03:00
Martijn Cuppens
57661dff6d Tweak modal transform (#27005) 2018-08-13 10:00:53 +03:00
Mark Otto
fb2de04374 Merge branch 'v4-dev' into malkomich-v4-dev 2018-07-24 17:25:12 -07:00
Mohammad Younes
6cca02f163 fix .modal-dialog-centered on IE10/11 2018-07-20 19:04:23 -05:00
Joshua David
c04d60b88f Fix modal overflow style nesting (#26742)
Nest `.modal` styling directly under `.modal-open`
to avoid issues when bootstrap is nested.
2018-07-20 18:55:16 -05:00
Mark Otto
5ad1049622 Merge branch 'v4-dev' of https://github.com/malkomich/bootstrap into malkomich-v4-dev 2018-07-07 16:16:43 -07:00
Adam Kolinski
49d0a4e99c Adding a variable to handle the change of a modals border-radius. (#25691) 2018-03-03 13:06:54 -08:00
Andres Galante
b29e3f2a4c lets the centered modal have any height (#24803) 2017-11-24 14:28:58 -08:00
Mark Otto
b1623c4429
Add .modal-dialog-centered for optional vertically centered modal (#24510)
* Add .modal-dialog-centered for optional vertically cenetered modal

Fixes #23638

* adds modal-dialog-centered class to docs and removes margin to avoid generating a vertical scrolling

* mention limitations

* fix aria attr

* Add `width: 100%` to the .modal-content for the centered version. Adding it here to avoid adding another selector by limiting it to the centered modal modifier.
2017-10-29 15:14:10 -07:00
XhmikosR
52d99a887e Refactor a few selectors. (#24404)
1. move a couple of them before the more specific ones.
2. change nesting to be under the same parent selector
3. use the ampersand more
2017-10-23 00:17:28 +03:00
XhmikosR
7b766e1ad5 Switch to stylelint. (#23572) 2017-10-02 20:34:56 -07:00
Andres Galante
b26eabf2a3 adds a border radius to modal headers (#23799) 2017-10-02 18:59:50 -07:00
Andres Galante
3624025a3b extends the click area of the close btn on modals (#23783) 2017-10-01 09:42:24 +03:00
Patrick H. Lauke
6ca451ebf8 Add pointer-events declarations
make outer `.modal-dialog` pass through events for custom click
handling, counteract it for the actual `.modal-content`
2017-08-22 10:54:12 -07:00
Mark Otto
365c9753f8 Ensure alignment of modal dismiss when no .modal-title is present 2017-08-10 22:45:48 -07:00
Patrick Yeo
5e651615a3 (#22414) Renamed for consistency $modal-dialog-sm-up-margin-y, $modal-content-xs-box-shadow, $modal-content-sm-up-box-shadow, to $modal-dialog-margin-y-sm-up, $modal-content-box-shadow-xs, $modal-content-box-shadow-sm-up, respectively 2017-06-13 08:45:11 -07:00
Juan Carlos González Cabrero
95dffb3279 Add new extra large size for modal containers 2017-01-28 18:26:55 +01:00
Mark Otto
7d05c222f8 linting 2016-12-25 15:28:44 -08:00
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