From 245c3e0abf7acbb8dd4c61e5891887c5f1c6b2ac Mon Sep 17 00:00:00 2001 From: Jason Butz Date: Tue, 8 Jul 2014 13:40:58 -0400 Subject: [PATCH] Revert "Fix for Bootstrap 3.1+" --- docs/assets/css/bootstrap-lightbox.css | 40 ++++++++++++++-------- docs/assets/css/bootstrap-lightbox.min.css | 4 +-- less/bootstrap-lightbox.less | 5 ++- 3 files changed, 30 insertions(+), 19 deletions(-) diff --git a/docs/assets/css/bootstrap-lightbox.css b/docs/assets/css/bootstrap-lightbox.css index 05d8105..81f3f85 100644 --- a/docs/assets/css/bootstrap-lightbox.css +++ b/docs/assets/css/bootstrap-lightbox.css @@ -1,65 +1,77 @@ +/*! +* bootstrap-lightbox.css v0.7.0 +* Copyright 2014 Jason Butz +* http://www.apache.org/licenses/LICENSE-2.0.txt +*/ .lightbox-open { overflow: hidden; } + body.lightbox-open, .lightbox-open .navbar-fixed-top, .lightbox-open .navbar-fixed-bottom { margin-right: 15px; } -/* Fix for z-index for compatibility with Bootstrap 3.1+ */ -/* added by @mattlibera */ + .lightbox { position: fixed; top: 0; right: 0; bottom: 0; left: 0; - z-index: 1041; + z-index: 1040; display: none; overflow: auto; overflow-y: scroll; } + .lightbox .fade .lightbox-dialog { -webkit-transform: translate(0, -25%); - -ms-transform: translate(0, -25%); - transform: translate(0, -25%); + -ms-transform: translate(0, -25%); + transform: translate(0, -25%); -webkit-transition: -webkit-transform 0.3s ease-out; - -moz-transition: -moz-transform 0.3s ease-out; - -o-transition: -o-transform 0.3s ease-out; - transition: transform 0.3s ease-out; + -moz-transition: -moz-transform 0.3s ease-out; + -o-transition: -o-transform 0.3s ease-out; + transition: transform 0.3s ease-out; } + .lightbox .in .lightbox-dialog { -webkit-transform: translate(0, 0); - -ms-transform: translate(0, 0); - transform: translate(0, 0); + -ms-transform: translate(0, 0); + transform: translate(0, 0); } + .lightbox .lightbox-dialog { z-index: 1050; width: auto; /*padding: 10px;*/ + margin-right: auto; margin-left: auto; } + .lightbox .lightbox-dialog .lightbox-header { float: right; } + .lightbox .lightbox-dialog .lightbox-header .close { margin-top: -2px; } + .lightbox .lightbox-dialog .lightbox-content { position: relative; + display: inline-block; + padding: 10px; background-color: #ffffff; border: 1px solid #999999; border: 1px solid rgba(0, 0, 0, 0.2); border-radius: 6px; outline: none; -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); - box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); + box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); background-clip: padding-box; - /**/ - padding: 10px; - display: inline-block; } + .lightbox .lightbox-dialog .lightbox-content .lightbox-caption { position: absolute; right: 8px; diff --git a/docs/assets/css/bootstrap-lightbox.min.css b/docs/assets/css/bootstrap-lightbox.min.css index 7d6110a..d85382a 100644 --- a/docs/assets/css/bootstrap-lightbox.min.css +++ b/docs/assets/css/bootstrap-lightbox.min.css @@ -1,6 +1,6 @@ /*! -* bootstrap-lightbox.css v0.7.0 +* bootstrap-lightbox.css v0.7.0 * Copyright 2014 Jason Butz * http://www.apache.org/licenses/LICENSE-2.0.txt */ -.lightbox-open{overflow:hidden}.lightbox-open .navbar-fixed-bottom,.lightbox-open .navbar-fixed-top,body.lightbox-open{margin-right:15px}.lightbox{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1041;display:none;overflow:auto;overflow-y:scroll}.lightbox .fade .lightbox-dialog{-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);transform:translate(0,-25%);-webkit-transition:-webkit-transform .3s ease-out;-moz-transition:-moz-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out}.lightbox .in .lightbox-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);transform:translate(0,0)}.lightbox .lightbox-dialog{z-index:1050;width:auto;margin-right:auto;margin-left:auto}.lightbox .lightbox-dialog .lightbox-header{float:right}.lightbox .lightbox-dialog .lightbox-header .close{margin-top:-2px}.lightbox .lightbox-dialog .lightbox-content{position:relative;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5);background-clip:padding-box;padding:10px;display:inline-block}.lightbox .lightbox-dialog .lightbox-content .lightbox-caption{position:absolute;right:8px;bottom:8px;left:10px;padding:2%;font-size:14px;line-height:18px;color:#fff;text-align:center;text-shadow:0 -1px 0 #000;text-shadow:0 -1px 0 rgba(0,0,0,.3);background:#000;background:rgba(0,0,0,.6)} +.lightbox-open{overflow:hidden}body.lightbox-open,.lightbox-open .navbar-fixed-top,.lightbox-open .navbar-fixed-bottom{margin-right:15px}.lightbox{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;display:none;overflow:auto;overflow-y:scroll}.lightbox .fade .lightbox-dialog{-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);transform:translate(0,-25%);-webkit-transition:-webkit-transform .3s ease-out;-moz-transition:-moz-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out}.lightbox .in .lightbox-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);transform:translate(0,0)}.lightbox .lightbox-dialog{z-index:1050;width:auto;margin-right:auto;margin-left:auto}.lightbox .lightbox-dialog .lightbox-header{float:right}.lightbox .lightbox-dialog .lightbox-header .close{margin-top:-2px}.lightbox .lightbox-dialog .lightbox-content{position:relative;display:inline-block;padding:10px;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,0.5);box-shadow:0 3px 9px rgba(0,0,0,0.5);background-clip:padding-box}.lightbox .lightbox-dialog .lightbox-content .lightbox-caption{position:absolute;right:8px;bottom:8px;left:10px;padding:2%;font-size:14px;line-height:18px;color:white;text-align:center;text-shadow:0 -1px 0 #000;text-shadow:0 -1px 0 rgba(0,0,0,0.3);background:#000;background:rgba(0,0,0,0.6)} diff --git a/less/bootstrap-lightbox.less b/less/bootstrap-lightbox.less index 28a521f..2bb3023 100644 --- a/less/bootstrap-lightbox.less +++ b/less/bootstrap-lightbox.less @@ -9,15 +9,13 @@ body.lightbox-open, margin-right: 15px; } -/* Fix for z-index for compatibility with Bootstrap 3.1+ */ -/* added by @mattlibera */ .lightbox { position: fixed; top: 0; right: 0; bottom: 0; left: 0; - z-index: 1041; + z-index: 1040; display: none; overflow: auto; overflow-y: scroll; @@ -89,3 +87,4 @@ body.lightbox-open, +