From 352532cd63a2d8e03ba7db806aa3bd110c023532 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 7 Oct 2013 14:39:11 -0500 Subject: Half fix for #9855: Don't fuck with margins for open modal dialog on account of Lion non-scrollbars and inconsistencies elsewhere --- less/modals.less | 8 -------- 1 file changed, 8 deletions(-) (limited to 'less/modals.less') diff --git a/less/modals.less b/less/modals.less index 4f2cf9468..776073d57 100644 --- a/less/modals.less +++ b/less/modals.less @@ -10,14 +10,6 @@ // Kill the scroll on the body .modal-open { overflow: hidden; - - - // Account for hiding of scrollbar - body&, - .navbar-fixed-top, - .navbar-fixed-bottom { - margin-right: 15px - } } // Container that the modal scrolls within -- cgit v1.2.3 From 5aa4c5cb0c1b8bed3a4bb6b6a867f48b4a59f2fb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 20:04:10 -0700 Subject: fixes #11139: add position: relative; to .modal-dialog so that z-index takes effect --- less/modals.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less/modals.less') diff --git a/less/modals.less b/less/modals.less index 776073d57..99cf76469 100644 --- a/less/modals.less +++ b/less/modals.less @@ -34,6 +34,7 @@ // Shell div to position the modal with bottom padding .modal-dialog { + position: relative; margin-left: auto; margin-right: auto; width: auto; -- cgit v1.2.3 From bf9f39270c7c6d50b0355a0b1a5e470c0820af07 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 29 Nov 2013 22:03:49 -0800 Subject: Fixes #11425: Use margin instead of padding on .modal-dialog to enable click-thru to .modal-backdrop --- less/modals.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'less/modals.less') diff --git a/less/modals.less b/less/modals.less index 99cf76469..c9feb7f18 100644 --- a/less/modals.less +++ b/less/modals.less @@ -38,7 +38,7 @@ margin-left: auto; margin-right: auto; width: auto; - padding: 10px; + margin: 10px; z-index: (@zindex-modal-background + 10); } @@ -122,8 +122,8 @@ .modal-dialog { width: 600px; - padding-top: 30px; - padding-bottom: 30px; + margin-top: 30px; + margin-bottom: 30px; } .modal-content { .box-shadow(0 5px 15px rgba(0,0,0,.5)); -- cgit v1.2.3 From a52e528d2771e0f150682532b06c0f29fa6b0ad6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 11:56:06 -0800 Subject: Fix up new margins on modals by not setting auto until screen-sm-min --- less/modals.less | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'less/modals.less') diff --git a/less/modals.less b/less/modals.less index c9feb7f18..e65dbf7f1 100644 --- a/less/modals.less +++ b/less/modals.less @@ -35,8 +35,6 @@ // Shell div to position the modal with bottom padding .modal-dialog { position: relative; - margin-left: auto; - margin-right: auto; width: auto; margin: 10px; z-index: (@zindex-modal-background + 10); @@ -122,8 +120,7 @@ .modal-dialog { width: 600px; - margin-top: 30px; - margin-bottom: 30px; + margin: 30px auto; } .modal-content { .box-shadow(0 5px 15px rgba(0,0,0,.5)); -- cgit v1.2.3 From 0016c17f9307bc71fc96d8d4680a9c861f137cae Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Dec 2013 23:18:28 -0800 Subject: Switch to `&:extend(.clearfix all)` for clearfix mixin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original discussion: https://github.com/less/less.js/issues/1437#issuecomment-21383639. Since we’re switching to `grunt-contrib-less`, we can take advantage of newer LESS features than what RECESS supported. Included in that is the ability to `:extend`, and not only that, but `:extend(.mixin-name all)`. By doing so, we remove duplicate CSS for all our elements that were being clearfix-ed. Fixes #8947, #8968, #8991, #9257, #9268, #9291, #9430, #9604, #9686, #9929, #10731, #10793, #11305, #11498, #11533, #11570, #11604, #11652. (dem issues, tho) --- less/modals.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less/modals.less') diff --git a/less/modals.less b/less/modals.less index e65dbf7f1..292b5bd9c 100644 --- a/less/modals.less +++ b/less/modals.less @@ -98,7 +98,7 @@ padding: (@modal-inner-padding - 1) @modal-inner-padding @modal-inner-padding; text-align: right; // right align buttons border-top: 1px solid @modal-footer-border-color; - .clearfix(); // clear it in case folks use .pull-* classes on buttons + &:extend(.clearfix all); // clear it in case folks use .pull-* classes on buttons // Properly space out buttons .btn + .btn { -- cgit v1.2.3 From b7bf212995b63d303281023e02777963b265b976 Mon Sep 17 00:00:00 2001 From: Tobias Lindig Date: Fri, 13 Dec 2013 12:24:20 +0100 Subject: use @zindex-modal for .modal and @zindex-modal-background for .modal-backdrop. removed z-index for .modal-dialog, it was not necessary because the parent element (.modal) already has a z-index. --- less/modals.less | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'less/modals.less') diff --git a/less/modals.less b/less/modals.less index 292b5bd9c..717c7b355 100644 --- a/less/modals.less +++ b/less/modals.less @@ -22,7 +22,7 @@ right: 0; bottom: 0; left: 0; - z-index: @zindex-modal-background; + z-index: @zindex-modal; // When fading in the modal, animate it to slide down &.fade .modal-dialog { @@ -37,7 +37,6 @@ position: relative; width: auto; margin: 10px; - z-index: (@zindex-modal-background + 10); } // Actual modal @@ -60,7 +59,7 @@ right: 0; bottom: 0; left: 0; - z-index: (@zindex-modal-background - 10); + z-index: @zindex-modal-background; background-color: @modal-backdrop-bg; // Fade for backdrop &.fade { .opacity(0); } -- cgit v1.2.3