Merge pull request #1013 from ZogStriP/replaced-lightbox-with-magnific-popup

replaced colorbox with magnific popup lightbox
This commit is contained in:
Sam 2013-06-11 16:58:59 -07:00
commit 334194ef82
5 changed files with 627 additions and 61 deletions

View file

@ -8,12 +8,13 @@
Discourse.Lightbox = {
apply: function($elem) {
var _this = this;
return $('a.lightbox', $elem).each(function(i, e) {
return $LAB.script("/javascripts/jquery.colorbox-min.js").wait(function() {
return $(e).colorbox();
$('a.lightbox', $elem).each(function(i, e) {
$LAB.script("/javascripts/jquery.magnific-popup-min.js").wait(function() {
$(e).magnificPopup({
type: 'image',
closeOnContentClick: true
});
});
});
}
}

View file

@ -1,50 +0,0 @@
/*
ColorBox Core Style:
The following CSS is consistent between example themes and should not be altered.
*/
#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;}
#cboxOverlay{position:fixed; width:100%; height:100%;}
#cboxMiddleLeft, #cboxBottomLeft{clear:left;}
#cboxContent{position:relative;}
#cboxLoadedContent{overflow:auto; -webkit-overflow-scrolling: touch;}
#cboxTitle{margin:0;}
#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;}
#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none;}
.cboxIframe{width:100%; height:100%; display:block; border:0;}
#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box; -moz-box-sizing:content-box; -webkit-box-sizing:content-box;}
/*
User Style:
Change the following styles to modify the appearance of ColorBox. They are
ordered & tabbed in a way that represents the nesting of the generated HTML.
*/
#cboxOverlay{background:#fff;}
#colorbox{outline:0;}
#cboxTopLeft{width:25px; height:25px; background:image-url("images/border1.png") no-repeat 0 0;}
#cboxTopCenter{height:25px; background:image-url("images/border1.png") repeat-x 0 -50px;}
#cboxTopRight{width:25px; height:25px; background:image-url("images/border1.png") no-repeat -25px 0;}
#cboxBottomLeft{width:25px; height:25px; background:image-url("images/border1.png") no-repeat 0 -25px;}
#cboxBottomCenter{height:25px; background:image-url("images/border1.png") repeat-x 0 -75px;}
#cboxBottomRight{width:25px; height:25px; background:image-url("images/border1.png") no-repeat -25px -25px;}
#cboxMiddleLeft{width:25px; background:image-url("images/border2.png") repeat-y 0 0;}
#cboxMiddleRight{width:25px; background:image-url("images/border2.png") repeat-y -25px 0;}
#cboxContent{background:#fff; overflow:hidden;}
.cboxIframe{background:#fff;}
#cboxError{padding:50px; border:1px solid #ccc;}
#cboxLoadedContent{margin-bottom:20px;}
#cboxTitle{position:absolute; bottom:0px; left:0; text-align:center; width:100%; color:#999;}
#cboxCurrent{position:absolute; bottom:0px; left:100px; color:#999;}
#cboxLoadingOverlay{background:#fff image-url("images/loading.gif") no-repeat 5px 5px;}
/* these elements are buttons, and may need to have additional styles reset to avoid unwanted base styles */
#cboxPrevious, #cboxNext, #cboxSlideshow, #cboxClose {border:0; padding:0; margin:0; overflow:visible; width:auto; background:none; }
/* avoid outlines on :active (mouseclick), but preserve outlines on :focus (tabbed navigating) */
#cboxPrevious:active, #cboxNext:active, #cboxSlideshow:active, #cboxClose:active {outline:0;}
#cboxSlideshow{position:absolute; bottom:0px; right:42px; color:#444;}
#cboxPrevious{position:absolute; bottom:0px; left:0; color:#444;}
#cboxNext{position:absolute; bottom:0px; left:63px; color:#444;}
#cboxClose{position:absolute; bottom:0; right:0; display:block; color:#444;}

View file

@ -0,0 +1,618 @@
/* Magnific Popup CSS */
////////////////////////
// Settings //
////////////////////////
// overlay
$overlay-color: #0b0b0b; // Color of overlay screen
$overlay-opacity: 0.8; // Opacity of overlay screen
$shadow: 0 0 8px rgba(0, 0, 0, 0.6); // Shadow on image or iframe
// spacing
$popup-padding-left: 8px; // Padding from left and from right side
$popup-padding-left-mobile: 6px; // Same as above, but is applied when width of window is less than 800px
$z-index-base: 1050; // Base z-index of popup
// controls
$include-arrows: true; // Include styles for nav arrows
$controls-opacity: 0.65; // Opacity of controls
$controls-color: #FFF; // Color of controls
$inner-close-icon-color: #333; // Color of close button when inside
$controls-text-color: #CCC; // Color of preloader and "1 of X" indicator
$controls-text-color-hover: #FFF; // Hover color of preloader and "1 of X" indicator
$IE7support: false; // Very basic IE7 support
// Iframe-type options
$include-iframe-type: false; // Enable Iframe-type popups
$iframe-padding-top: 40px; // Iframe padding top
$iframe-background: #000; // Background color of iframes
$iframe-max-width: 900px; // Maximum width of iframes
$iframe-ratio: 9/16; // Ratio of iframe (9/16 = widescreen, 3/4 = standard, etc.)
// Image-type options
$include-image-type: true; // Enable Image-type popups
$image-padding-top: 40px; // Image padding top
$image-padding-bottom: 40px; // Image padding bottom
$include-mobile-layout-for-image: true; // Removes paddings from top and bottom
// Image caption options
$caption-title-color: #F3F3F3; // Caption title color
$caption-subtitle-color: #BDBDBD; // Caption subtitle color
////////////////////////
//
// Contents:
//
// 1. Default Settings
// 2. General styles
// - Transluscent overlay
// - Containers, wrappers
// - Cursors
// - Helper classes
// 3. Appearance
// - Preloader & text that displays error messages
// - CSS reset for buttons
// - Close icon
// - "1 of X" counter
// - Navigation (left/right) arrows
// - Iframe content type styles
// - Image content type styles
// - Media query where size of arrows is reduced
// - IE7 support
//
////////////////////////
////////////////////////
// 1. Default Settings
////////////////////////
$overlay-color: #0b0b0b !default;
$overlay-opacity: 0.8 !default;
$shadow: 0 0 8px rgba(0, 0, 0, 0.6) !default; // shadow on image or iframe
$popup-padding-left: 8px !default; // Padding from left and from right side
$popup-padding-left-mobile: 6px !default; // Same as above, but is applied when width of window is less than 800px
$z-index-base: 500 !default; // Base z-index of popup
$include-arrows: true !default; // include styles for nav arrows
$controls-opacity: 0.65 !default;
$controls-color: #FFF !default;
$inner-close-icon-color: #333 !default;
$controls-text-color: #CCC !default; // Color of preloader and "1 of X" indicator
$controls-text-color-hover: #FFF !default;
$IE7support: true !default; // Very basic IE7 support
// Iframe-type options
$include-iframe-type: true !default;
$iframe-padding-top: 40px !default;
$iframe-background: #000 !default;
$iframe-max-width: 900px !default;
$iframe-ratio: 9/16 !default;
// Image-type options
$include-image-type: true !default;
$image-padding-top: 40px !default;
$image-padding-bottom: 40px !default;
$include-mobile-layout-for-image: true !default; // Removes paddings from top and bottom
// Image caption options
$caption-title-color: #F3F3F3 !default;
$caption-subtitle-color: #BDBDBD !default;
////////////////////////
// 2. General styles
////////////////////////
// Transluscent overlay
.mfp-bg {
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: $z-index-base + 2;
overflow: hidden;
position: fixed;
background: $overlay-color;
opacity: $overlay-opacity;
@if $IE7support {
filter: alpha(opacity=$overlay-opacity*100);
}
}
// Wrapper for popup
.mfp-wrap {
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: $z-index-base + 3;
position: fixed;
outline: none !important;
-webkit-backface-visibility: hidden; // fixes webkit bug that can cause "false" scrollbar
}
// Root container
.mfp-container {
height: 100%;
text-align: center;
position: absolute;
width: 100%;
height: 100%;
left: 0;
top: 0;
padding: 0 $popup-padding-left;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
// Vertical centerer helper
.mfp-container:before {
content: '';
display: inline-block;
height: 100%;
vertical-align: middle;
}
// Remove vertical centering when popup has class `mfp-align-top`
.mfp-align-top .mfp-container:before {
display: none;
}
// Popup content holder
.mfp-content {
position: relative;
display: inline-block;
vertical-align: middle;
margin: 0 auto;
text-align: left;
z-index: $z-index-base + 5;
}
.mfp-inline-holder .mfp-content,
.mfp-ajax-holder .mfp-content {
width: 100%;
cursor: auto;
}
// Cursors
.mfp-ajax-cur {
cursor: progress;
}
.mfp-zoom-out-cur,
.mfp-zoom-out-cur .mfp-image-holder .mfp-close {
cursor: -moz-zoom-out;
cursor: -webkit-zoom-out;
cursor: zoom-out;
}
.mfp-zoom {
cursor: pointer;
cursor: -webkit-zoom-in;
cursor: -moz-zoom-in;
cursor: zoom-in;
}
.mfp-auto-cursor .mfp-content {
cursor: auto;
}
.mfp-close,
.mfp-arrow,
.mfp-preloader,
.mfp-counter {
-webkit-user-select:none;
-moz-user-select: none;
user-select: none;
}
// Hide the image during the loading
.mfp-loading.mfp-figure {
display: none;
}
// Helper class that hides stuff
.mfp-hide {
display: none !important;
}
////////////////////////
// 3. Appearance
////////////////////////
// Preloader and text that displays error messages
.mfp-preloader {
color: $controls-text-color;
position: absolute;
top: 50%;
width: auto;
text-align: center;
margin-top: -0.8em;
left: 8px;
right: 8px;
z-index: $z-index-base + 4;
}
.mfp-preloader a {
color: $controls-text-color;
}
.mfp-preloader a:hover {
color: $controls-text-color-hover;
}
// Hide preloader when content successfully loaded
.mfp-s-ready .mfp-preloader {
display: none;
}
// Hide content when it was not loaded
.mfp-s-error .mfp-content {
display: none;
}
// CSS-reset for buttons
button.mfp-close,
button.mfp-arrow {
overflow: visible;
cursor: pointer;
background: transparent;
border: 0;
-webkit-appearance: none;
display: block;
padding: 0;
z-index: $z-index-base + 6;
}
button::-moz-focus-inner {
padding: 0;
border: 0
}
// Close icon
.mfp-close {
width: 44px;
height:44px;
line-height: 44px;
position: absolute;
right: 0;
top: 0;
text-decoration: none;
text-align: center;
opacity: $controls-opacity;
padding: 0 0 18px 10px;
color: $controls-color;
font-style: normal;
font-size: 28px;
font-family: Arial, Baskerville, monospace;
&:hover,
&:focus {
opacity: 1;
}
&:active {
top: 1px;
}
}
.mfp-close-btn-in .mfp-close {
color: $inner-close-icon-color;
}
.mfp-image-holder .mfp-close,
.mfp-iframe-holder .mfp-close {
color: $controls-color;
right: -6px;
text-align: right;
padding-right: 6px;
width: 100%;
}
// "1 of X" counter
.mfp-counter {
position: absolute;
top:0;
right: 0;
color: $controls-text-color;
font-size: 12px;
line-height: 18px;
}
// Navigation arrows
@if $include-arrows {
.mfp-arrow {
position: absolute;
top: 0;
opacity: $controls-opacity;
margin: 0;
top: 50%;
margin-top: -55px;
padding: 0;
width: 90px;
height: 110px;
-webkit-tap-highlight-color: rgba(0,0,0,0);
}
.mfp-arrow:active {
margin-top: -54px;
}
.mfp-arrow:hover,
.mfp-arrow:focus {
opacity: 1;
}
.mfp-arrow {
&:before,
&:after,
.mfp-b,
.mfp-a {
content: '';
display: block;
width: 0;
height: 0;
position: absolute;
left: 0;
top: 0;
margin-top: 35px;
margin-left: 35px;
border: solid transparent;
}
&:after,
.mfp-a {
opacity: $overlay-opacity;
border-top-width: 12px;
border-bottom-width: 12px;
top:8px;
}
&:before,
.mfp-b {
border-top-width: 20px;
border-bottom-width: 20px;
}
}
.mfp-arrow-left {
left: 0;
&:after,
.mfp-a {
border-right: 12px solid #000;
left: 5px;
}
&:before,
.mfp-b {
border-right: 20px solid #FFF;
}
}
.mfp-arrow-right {
right: 0;
&:after,
.mfp-a {
border-left: 12px solid #000;
left: 3px;
}
&:before,
.mfp-b {
border-left: 20px solid #FFF;
}
}
}
// Iframe content type
@if $include-iframe-type {
.mfp-iframe-holder {
padding-top: $iframe-padding-top;
padding-bottom: $iframe-padding-top;
}
.mfp-iframe-holder .mfp-content {
line-height: 0;
width: 100%;
max-width: $iframe-max-width;
}
.mfp-iframe-scaler {
width: 100%;
height: 0;
overflow: hidden;
padding-top: $iframe-ratio * 100%;
}
.mfp-iframe-scaler iframe {
position: absolute;
display: block;
top: 0;
left: 0;
width: 100%;
height: 100%;
box-shadow: $shadow;
background: $iframe-background;
}
.mfp-iframe-holder .mfp-close {
top: -40px;
}
}
// Image content type
@if $include-image-type {
/* Main image in popup */
img.mfp-img {
width: auto;
max-width: 100%;
height: auto;
display: block;
line-height: 0;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
padding: $image-padding-top 0 $image-padding-bottom;
margin: 0 auto;
}
/* The shadow behind the image */
.mfp-figure:after {
content: '';
position: absolute;
left: 0;
top: $image-padding-top;
bottom: $image-padding-bottom;
display: block;
right: 0;
width: auto;
height: auto;
z-index: -1;
box-shadow: $shadow;
}
.mfp-figure {
line-height: 0;
}
.mfp-bottom-bar {
margin-top: -36px;
position: absolute;
top: 100%;
left: 0;
width: 100%;
cursor: auto;
}
.mfp-title {
text-align: left;
line-height: 18px;
color: $caption-title-color;
word-break: break-word;
padding-right: 36px; // leave some space for counter at right side
}
.mfp-figure small {
color: $caption-subtitle-color;
display: block;
font-size: 12px;
line-height: 14px;
}
.mfp-image-holder .mfp-content {
max-width: 100%;
}
.mfp-gallery .mfp-image-holder .mfp-figure {
cursor: pointer;
}
@if $include-mobile-layout-for-image {
@media screen and (max-width: 800px) and (orientation:landscape), screen and (max-height: 300px) {
/**
* Remove all paddings around the image on small screen
*/
.mfp-img-mobile .mfp-image-holder {
padding-left: 0;
padding-right: 0;
}
.mfp-img-mobile img.mfp-img {
padding: 0;
}
/* The shadow behind the image */
.mfp-img-mobile .mfp-figure:after {
top: 0;
bottom: 0;
}
.mfp-img-mobile .mfp-bottom-bar {
background: rgba(0,0,0,0.6);
bottom: 0;
margin: 0;
top: auto;
padding: 3px 5px;
position: fixed;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
.mfp-img-mobile .mfp-bottom-bar:empty {
padding: 0;
}
.mfp-img-mobile .mfp-counter {
right: 5px;
top: 3px;
}
.mfp-img-mobile .mfp-close {
top: 0;
right: 0;
width: 35px;
height: 35px;
line-height: 35px;
background: rgba(0, 0, 0, 0.6);
position: fixed;
text-align: center;
padding: 0;
}
.mfp-img-mobile .mfp-figure small {
display: inline;
margin-left: 5px;
}
}
}
}
// Scale navigation arrows and reduce padding from sides
@media all and (max-width: 800px) {
.mfp-arrow {
-webkit-transform: scale(0.75);
transform: scale(0.75);
}
.mfp-arrow-left {
-webkit-transform-origin: 0;
transform-origin: 0;
}
.mfp-arrow-right {
-webkit-transform-origin: 100%;
transform-origin: 100%;
}
.mfp-container {
padding-left: $popup-padding-left-mobile;
padding-right: $popup-padding-left-mobile;
}
}
// IE7 support
// Styles that make popup look nicier in old IE
@if $IE7support {
.mfp-ie7 {
.mfp-img {
padding: 0;
}
.mfp-bottom-bar {
width: 600px;
left: 50%;
margin-left: -300px;
margin-top: 5px;
padding-bottom: 5px;
}
.mfp-container {
padding: 0;
}
.mfp-content {
padding-top: 44px;
}
.mfp-close {
top: 0;
right: 0;
padding-top: 0;
}
}
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long