diff --git a/coffee/vex.coffee b/coffee/vex.coffee index 94d0020..3000f4d 100644 --- a/coffee/vex.coffee +++ b/coffee/vex.coffee @@ -24,7 +24,6 @@ vexFactory = ($) -> baseClassNames: vex: 'vex' content: 'vex-content' - contentWrap: 'vex-content-wrap' overlay: 'vex-overlay' close: 'vex-close' closing: 'vex-closing' @@ -40,8 +39,6 @@ vexFactory = ($) -> css: {} overlayClassName: '' overlayCSS: {} - contentWrapClassName: '' - contentWrapCSS: {} contentClassName: '' contentCSS: {} closeClassName: '' @@ -69,26 +66,12 @@ vexFactory = ($) -> .css(options.overlayCSS) .data(vex: options) - options.$vex.append options.$vexOverlay - - # Content Wrapper to allow better long modal scrolling - - options.$vexContentWrap = $('
') - .addClass(vex.baseClassNames.contentWrap) - .addClass(options.contentWrapClassName) - .css(options.contentWrapCSS) - .data(vex: options) - - # Handling clicks on overlay or wrapper - if options.overlayClosesOnClick options.$vexOverlay.bind 'click.vex', (e) -> return unless e.target is @ vex.close $(@).data().vex.id - options.$vexContentWrap.bind 'click.vex', (e) -> - return unless e.target is @ - vex.close $(@).data().vex.id + options.$vex.append options.$vexOverlay # Content @@ -99,7 +82,7 @@ vexFactory = ($) -> .append(options.content) .data(vex: options) - options.$vex.append options.$vexContentWrap.append options.$vexContent + options.$vex.append options.$vexContent # Close button @@ -125,10 +108,6 @@ vexFactory = ($) -> vex.setupBodyPadding options.$vex - # Set up overlay margin. We do not want it to cover the scrollbar - - vex.setupOverlayPosition options - # Call afterOpen callback and trigger vexOpen event options.afterOpen options.$vexContent, options if options.afterOpen @@ -210,11 +189,6 @@ vexFactory = ($) -> .bind('vexOpen.vex', -> $('body').css('padding-right', vex.getScrollbarWidth())) .bind('vexAfterClose.vex', -> $('body').css('padding-right', 0) unless vex.getAllVexes().length) - setupOverlayPosition: (options) -> - $('body') - .bind('vexOpen.vex', -> options.$vexOverlay.css('right', vex.getScrollbarWidth())) - .bind('vexAfterClose.vex', -> options.$vexOverlay.css('right', 0) unless vex.getAllVexes().length) - hideLoading: -> $('.vex-loading-spinner').remove() diff --git a/css/vex-theme-default.css b/css/vex-theme-default.css index 512d82b..479af2c 100644 --- a/css/vex-theme-default.css +++ b/css/vex-theme-default.css @@ -264,7 +264,12 @@ box-shadow: inset 0 0 0 300px transparent; } } -/* line 15, ../sass/vex-theme-default.sass */ +/* line 13, ../sass/vex-theme-default.sass */ +.vex.vex-theme-default { + padding-top: 160px; + padding-bottom: 160px; +} +/* line 17, ../sass/vex-theme-default.sass */ .vex.vex-theme-default.vex-closing .vex-content { animation: vex-flyout 0.5s; -webkit-animation: vex-flyout 0.5s; @@ -273,12 +278,7 @@ -o-animation: vex-flyout 0.5s; -webkit-backface-visibility: hidden; } -/* line 18, ../sass/vex-theme-default.sass */ -.vex.vex-theme-default .vex-content-wrap { - padding-top: 160px; - padding-bottom: 160px; -} -/* line 22, ../sass/vex-theme-default.sass */ +/* line 20, ../sass/vex-theme-default.sass */ .vex.vex-theme-default .vex-content { animation: vex-flyin 0.5s; -webkit-animation: vex-flyin 0.5s; @@ -287,7 +287,7 @@ -o-animation: vex-flyin 0.5s; -webkit-backface-visibility: hidden; } -/* line 25, ../sass/vex-theme-default.sass */ +/* line 23, ../sass/vex-theme-default.sass */ .vex.vex-theme-default .vex-content { -moz-border-radius: 5px; -webkit-border-radius: 5px; @@ -303,11 +303,11 @@ font-size: 1.1em; line-height: 1.5em; } -/* line 38, ../sass/vex-theme-default.sass */ +/* line 36, ../sass/vex-theme-default.sass */ .vex.vex-theme-default .vex-content h1, .vex.vex-theme-default .vex-content h2, .vex.vex-theme-default .vex-content h3, .vex.vex-theme-default .vex-content h4, .vex.vex-theme-default .vex-content h5, .vex.vex-theme-default .vex-content h6, .vex.vex-theme-default .vex-content p, .vex.vex-theme-default .vex-content ul, .vex.vex-theme-default .vex-content li { color: inherit; } -/* line 41, ../sass/vex-theme-default.sass */ +/* line 39, ../sass/vex-theme-default.sass */ .vex.vex-theme-default .vex-close { -moz-border-radius: 5px; -webkit-border-radius: 5px; @@ -317,7 +317,7 @@ right: 0; cursor: pointer; } -/* line 48, ../sass/vex-theme-default.sass */ +/* line 46, ../sass/vex-theme-default.sass */ .vex.vex-theme-default .vex-close:before { -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -335,20 +335,20 @@ color: #bbb; background: transparent; } -/* line 63, ../sass/vex-theme-default.sass */ +/* line 61, ../sass/vex-theme-default.sass */ .vex.vex-theme-default .vex-close:hover:before, .vex.vex-theme-default .vex-close:active:before { color: #777; background: #e0e0e0; } -/* line 69, ../sass/vex-theme-default.sass */ +/* line 67, ../sass/vex-theme-default.sass */ .vex.vex-theme-default .vex-dialog-form .vex-dialog-message { margin-bottom: 0.5em; } -/* line 72, ../sass/vex-theme-default.sass */ +/* line 70, ../sass/vex-theme-default.sass */ .vex.vex-theme-default .vex-dialog-form .vex-dialog-input { margin-bottom: 1em; } -/* line 75, ../sass/vex-theme-default.sass */ +/* line 73, ../sass/vex-theme-default.sass */ .vex.vex-theme-default .vex-dialog-form .vex-dialog-input textarea, .vex.vex-theme-default .vex-dialog-form .vex-dialog-input input[type="date"], .vex.vex-theme-default .vex-dialog-form .vex-dialog-input input[type="datetime"], .vex.vex-theme-default .vex-dialog-form .vex-dialog-input input[type="datetime-local"], .vex.vex-theme-default .vex-dialog-form .vex-dialog-input input[type="email"], .vex.vex-theme-default .vex-dialog-form .vex-dialog-input input[type="month"], .vex.vex-theme-default .vex-dialog-form .vex-dialog-input input[type="number"], .vex.vex-theme-default .vex-dialog-form .vex-dialog-input input[type="password"], .vex.vex-theme-default .vex-dialog-form .vex-dialog-input input[type="search"], .vex.vex-theme-default .vex-dialog-form .vex-dialog-input input[type="tel"], .vex.vex-theme-default .vex-dialog-form .vex-dialog-input input[type="text"], .vex.vex-theme-default .vex-dialog-form .vex-dialog-input input[type="time"], .vex.vex-theme-default .vex-dialog-form .vex-dialog-input input[type="url"], .vex.vex-theme-default .vex-dialog-form .vex-dialog-input input[type="week"] { -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -363,14 +363,14 @@ min-height: 2.5em; margin: 0 0 0.25em; } -/* line 87, ../sass/vex-theme-default.sass */ +/* line 85, ../sass/vex-theme-default.sass */ .vex.vex-theme-default .vex-dialog-form .vex-dialog-input textarea:focus, .vex.vex-theme-default .vex-dialog-form .vex-dialog-input input[type="date"]:focus, .vex.vex-theme-default .vex-dialog-form .vex-dialog-input input[type="datetime"]:focus, .vex.vex-theme-default .vex-dialog-form .vex-dialog-input input[type="datetime-local"]:focus, .vex.vex-theme-default .vex-dialog-form .vex-dialog-input input[type="email"]:focus, .vex.vex-theme-default .vex-dialog-form .vex-dialog-input input[type="month"]:focus, .vex.vex-theme-default .vex-dialog-form .vex-dialog-input input[type="number"]:focus, .vex.vex-theme-default .vex-dialog-form .vex-dialog-input input[type="password"]:focus, .vex.vex-theme-default .vex-dialog-form .vex-dialog-input input[type="search"]:focus, .vex.vex-theme-default .vex-dialog-form .vex-dialog-input input[type="tel"]:focus, .vex.vex-theme-default .vex-dialog-form .vex-dialog-input input[type="text"]:focus, .vex.vex-theme-default .vex-dialog-form .vex-dialog-input input[type="time"]:focus, .vex.vex-theme-default .vex-dialog-form .vex-dialog-input input[type="url"]:focus, .vex.vex-theme-default .vex-dialog-form .vex-dialog-input input[type="week"]:focus { -moz-box-shadow: inset 0 0 0 2px #8dbdf1; -webkit-box-shadow: inset 0 0 0 2px #8dbdf1; box-shadow: inset 0 0 0 2px #8dbdf1; outline: none; } -/* line 91, ../sass/vex-theme-default.sass */ +/* line 89, ../sass/vex-theme-default.sass */ .vex.vex-theme-default .vex-dialog-form .vex-dialog-buttons { *zoom: 1; } @@ -380,7 +380,7 @@ display: table; clear: both; } -/* line 94, ../sass/vex-theme-default.sass */ +/* line 92, ../sass/vex-theme-default.sass */ .vex.vex-theme-default .vex-dialog-button { -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -395,11 +395,11 @@ line-height: 1em; padding: 0.75em 2em; } -/* line 106, ../sass/vex-theme-default.sass */ +/* line 104, ../sass/vex-theme-default.sass */ .vex.vex-theme-default .vex-dialog-button.vex-last { margin-left: 0; } -/* line 109, ../sass/vex-theme-default.sass */ +/* line 107, ../sass/vex-theme-default.sass */ .vex.vex-theme-default .vex-dialog-button:focus { animation: vex-pulse 1.1s infinite; -webkit-animation: vex-pulse 1.1s infinite; @@ -410,7 +410,7 @@ outline: none; } @media (max-width: 568px) { - /* line 109, ../sass/vex-theme-default.sass */ + /* line 107, ../sass/vex-theme-default.sass */ .vex.vex-theme-default .vex-dialog-button:focus { animation: none; -webkit-animation: none; @@ -420,18 +420,18 @@ -webkit-backface-visibility: hidden; } } -/* line 118, ../sass/vex-theme-default.sass */ +/* line 116, ../sass/vex-theme-default.sass */ .vex.vex-theme-default .vex-dialog-button.vex-dialog-button-primary { background: #3288e6; color: #fff; } -/* line 122, ../sass/vex-theme-default.sass */ +/* line 120, ../sass/vex-theme-default.sass */ .vex.vex-theme-default .vex-dialog-button.vex-dialog-button-secondary { background: #e0e0e0; color: #777; } -/* line 126, ../sass/vex-theme-default.sass */ +/* line 124, ../sass/vex-theme-default.sass */ .vex-loading-spinner.vex-theme-default { -moz-box-shadow: 0 0 0 0.5em #f0f0f0, 0 0 1px 0.5em rgba(0, 0, 0, 0.3); -webkit-box-shadow: 0 0 0 0.5em #f0f0f0, 0 0 1px 0.5em rgba(0, 0, 0, 0.3); diff --git a/css/vex-theme-flat-attack.css b/css/vex-theme-flat-attack.css index 25e75ba..60e8df2 100644 --- a/css/vex-theme-flat-attack.css +++ b/css/vex-theme-flat-attack.css @@ -186,9 +186,11 @@ -moz-perspective-origin: 50% 150px; -webkit-perspective-origin: 50% 150px; perspective-origin: 50% 150px; + padding-top: 100px; + padding-bottom: 100px; font-size: 1.5em; } -/* line 36, ../sass/vex-theme-flat-attack.sass */ +/* line 38, ../sass/vex-theme-flat-attack.sass */ .vex.vex-theme-flat-attack.vex-closing .vex-content { animation: vex-flipout-horizontal 0.5s; -webkit-animation: vex-flipout-horizontal 0.5s; @@ -197,12 +199,7 @@ -o-animation: vex-flipout-horizontal 0.5s; -webkit-backface-visibility: hidden; } -/* line 39, ../sass/vex-theme-flat-attack.sass */ -.vex.vex-theme-flat-attack .vex-content-wrap { - padding-top: 100px; - padding-bottom: 100px; -} -/* line 43, ../sass/vex-theme-flat-attack.sass */ +/* line 41, ../sass/vex-theme-flat-attack.sass */ .vex.vex-theme-flat-attack .vex-content { -webkit-transform-style: preserve-3d; -moz-transform-style: preserve-3d; @@ -214,7 +211,7 @@ -o-animation: vex-flipin-horizontal 0.5s; -webkit-backface-visibility: hidden; } -/* line 47, ../sass/vex-theme-flat-attack.sass */ +/* line 45, ../sass/vex-theme-flat-attack.sass */ .vex.vex-theme-flat-attack .vex-content { font-family: "Helvetica Neue", sans-serif; font-weight: 200; @@ -227,18 +224,18 @@ max-width: 100%; width: 600px; } -/* line 59, ../sass/vex-theme-flat-attack.sass */ +/* line 57, ../sass/vex-theme-flat-attack.sass */ .vex.vex-theme-flat-attack .vex-content h1, .vex.vex-theme-flat-attack .vex-content h2, .vex.vex-theme-flat-attack .vex-content h3, .vex.vex-theme-flat-attack .vex-content h4, .vex.vex-theme-flat-attack .vex-content h5, .vex.vex-theme-flat-attack .vex-content h6, .vex.vex-theme-flat-attack .vex-content p, .vex.vex-theme-flat-attack .vex-content ul, .vex.vex-theme-flat-attack .vex-content li { color: inherit; } -/* line 62, ../sass/vex-theme-flat-attack.sass */ +/* line 60, ../sass/vex-theme-flat-attack.sass */ .vex.vex-theme-flat-attack .vex-close { position: absolute; top: 0; right: 0; cursor: pointer; } -/* line 68, ../sass/vex-theme-flat-attack.sass */ +/* line 66, ../sass/vex-theme-flat-attack.sass */ .vex.vex-theme-flat-attack .vex-close:before { font-family: "Helvetica Neue", sans-serif; font-weight: 100; @@ -256,15 +253,15 @@ color: #fff; background: #666; } -/* line 87, ../sass/vex-theme-flat-attack.sass */ +/* line 85, ../sass/vex-theme-flat-attack.sass */ .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-message { margin-bottom: 0.5em; } -/* line 90, ../sass/vex-theme-flat-attack.sass */ +/* line 88, ../sass/vex-theme-flat-attack.sass */ .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-input { margin-bottom: 0.5em; } -/* line 93, ../sass/vex-theme-flat-attack.sass */ +/* line 91, ../sass/vex-theme-flat-attack.sass */ .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-input textarea, .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-input input[type="date"], .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-input input[type="datetime"], .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-input input[type="datetime-local"], .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-input input[type="email"], .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-input input[type="month"], .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-input input[type="number"], .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-input input[type="password"], .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-input input[type="search"], .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-input input[type="tel"], .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-input input[type="text"], .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-input input[type="time"], .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-input input[type="url"], .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-input input[type="week"] { -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -279,14 +276,14 @@ min-height: 2.5em; margin: 0 0 0.25em; } -/* line 105, ../sass/vex-theme-flat-attack.sass */ +/* line 103, ../sass/vex-theme-flat-attack.sass */ .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-input textarea:focus, .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-input input[type="date"]:focus, .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-input input[type="datetime"]:focus, .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-input input[type="datetime-local"]:focus, .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-input input[type="email"]:focus, .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-input input[type="month"]:focus, .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-input input[type="number"]:focus, .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-input input[type="password"]:focus, .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-input input[type="search"]:focus, .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-input input[type="tel"]:focus, .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-input input[type="text"]:focus, .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-input input[type="time"]:focus, .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-input input[type="url"]:focus, .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-input input[type="week"]:focus { -moz-box-shadow: inset 0 0 0 2px #666; -webkit-box-shadow: inset 0 0 0 2px #666; box-shadow: inset 0 0 0 2px #666; outline: none; } -/* line 109, ../sass/vex-theme-flat-attack.sass */ +/* line 107, ../sass/vex-theme-flat-attack.sass */ .vex.vex-theme-flat-attack .vex-dialog-form .vex-dialog-buttons { *zoom: 1; padding-top: 1em; @@ -300,7 +297,7 @@ display: table; clear: both; } -/* line 116, ../sass/vex-theme-flat-attack.sass */ +/* line 114, ../sass/vex-theme-flat-attack.sass */ .vex.vex-theme-flat-attack .vex-dialog-button { -moz-border-radius: 0; -webkit-border-radius: 0; @@ -316,31 +313,31 @@ line-height: 1em; font-family: inherit; } -/* line 129, ../sass/vex-theme-flat-attack.sass */ +/* line 127, ../sass/vex-theme-flat-attack.sass */ .vex.vex-theme-flat-attack .vex-dialog-button.vex-last { margin-left: 0; } -/* line 132, ../sass/vex-theme-flat-attack.sass */ +/* line 130, ../sass/vex-theme-flat-attack.sass */ .vex.vex-theme-flat-attack .vex-dialog-button:focus { outline: none; } -/* line 135, ../sass/vex-theme-flat-attack.sass */ +/* line 133, ../sass/vex-theme-flat-attack.sass */ .vex.vex-theme-flat-attack .vex-dialog-button.vex-dialog-button-primary { background: #666; color: #fff; } -/* line 139, ../sass/vex-theme-flat-attack.sass */ +/* line 137, ../sass/vex-theme-flat-attack.sass */ .vex.vex-theme-flat-attack .vex-dialog-button.vex-dialog-button-primary:focus { -moz-box-shadow: inset 0 3px rgba(0, 0, 0, 0.2); -webkit-box-shadow: inset 0 3px rgba(0, 0, 0, 0.2); box-shadow: inset 0 3px rgba(0, 0, 0, 0.2); } -/* line 142, ../sass/vex-theme-flat-attack.sass */ +/* line 140, ../sass/vex-theme-flat-attack.sass */ .vex.vex-theme-flat-attack .vex-dialog-button.vex-dialog-button-secondary { background: #fff; color: #ccc; } -/* line 146, ../sass/vex-theme-flat-attack.sass */ +/* line 144, ../sass/vex-theme-flat-attack.sass */ .vex.vex-theme-flat-attack .vex-dialog-button.vex-dialog-button-secondary:focus { -moz-box-shadow: inset 0 3px #aaa; -webkit-box-shadow: inset 0 3px #aaa; @@ -348,7 +345,7 @@ background: #eee; color: #777; } -/* line 151, ../sass/vex-theme-flat-attack.sass */ +/* line 149, ../sass/vex-theme-flat-attack.sass */ .vex.vex-theme-flat-attack .vex-dialog-button.vex-dialog-button-secondary:hover, .vex.vex-theme-flat-attack .vex-dialog-button.vex-dialog-button-secondary:active { color: #777; } @@ -409,7 +406,7 @@ background: #477FA5; } -/* line 168, ../sass/vex-theme-flat-attack.sass */ +/* line 166, ../sass/vex-theme-flat-attack.sass */ .vex-loading-spinner.vex-theme-flat-attack { height: 4em; width: 4em; diff --git a/css/vex-theme-os.css b/css/vex-theme-os.css index 3a0b99c..4f27a7a 100644 --- a/css/vex-theme-os.css +++ b/css/vex-theme-os.css @@ -264,7 +264,12 @@ box-shadow: inset 0 0 0 300px transparent; } } -/* line 14, ../sass/vex-theme-os.sass */ +/* line 13, ../sass/vex-theme-os.sass */ +.vex.vex-theme-os { + padding-top: 160px; + padding-bottom: 160px; +} +/* line 17, ../sass/vex-theme-os.sass */ .vex.vex-theme-os.vex-closing .vex-content { animation: vex-flyout 0.5s; -webkit-animation: vex-flyout 0.5s; @@ -273,12 +278,7 @@ -o-animation: vex-flyout 0.5s; -webkit-backface-visibility: hidden; } -/* line 17, ../sass/vex-theme-os.sass */ -.vex.vex-theme-os .vex-content-wrap { - padding-top: 160px; - padding-bottom: 160px; -} -/* line 21, ../sass/vex-theme-os.sass */ +/* line 20, ../sass/vex-theme-os.sass */ .vex.vex-theme-os .vex-content { animation: vex-flyin 0.5s; -webkit-animation: vex-flyin 0.5s; @@ -287,7 +287,7 @@ -o-animation: vex-flyin 0.5s; -webkit-backface-visibility: hidden; } -/* line 24, ../sass/vex-theme-os.sass */ +/* line 23, ../sass/vex-theme-os.sass */ .vex.vex-theme-os .vex-content { -moz-border-radius: 5px; -webkit-border-radius: 5px; @@ -301,17 +301,17 @@ color: #444; padding: 1em; position: relative; - font-size: 1.1em; - line-height: 1.5em; margin: 0 auto; max-width: 100%; width: 450px; + font-size: 1.1em; + line-height: 1.5em; } -/* line 39, ../sass/vex-theme-os.sass */ +/* line 38, ../sass/vex-theme-os.sass */ .vex.vex-theme-os .vex-content h1, .vex.vex-theme-os .vex-content h2, .vex.vex-theme-os .vex-content h3, .vex.vex-theme-os .vex-content h4, .vex.vex-theme-os .vex-content h5, .vex.vex-theme-os .vex-content h6, .vex.vex-theme-os .vex-content p, .vex.vex-theme-os .vex-content ul, .vex.vex-theme-os .vex-content li { color: inherit; } -/* line 42, ../sass/vex-theme-os.sass */ +/* line 41, ../sass/vex-theme-os.sass */ .vex.vex-theme-os .vex-close { -moz-border-radius: 0 5px 0 0; -webkit-border-radius: 0; @@ -321,7 +321,7 @@ right: 0; cursor: pointer; } -/* line 49, ../sass/vex-theme-os.sass */ +/* line 48, ../sass/vex-theme-os.sass */ .vex.vex-theme-os .vex-close:before { -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -339,20 +339,20 @@ color: #bbb; background: transparent; } -/* line 64, ../sass/vex-theme-os.sass */ +/* line 63, ../sass/vex-theme-os.sass */ .vex.vex-theme-os .vex-close:hover:before, .vex.vex-theme-os .vex-close:active:before { color: #777; background: #e0e0e0; } -/* line 70, ../sass/vex-theme-os.sass */ +/* line 69, ../sass/vex-theme-os.sass */ .vex.vex-theme-os .vex-dialog-form .vex-dialog-message { margin-bottom: 0.5em; } -/* line 73, ../sass/vex-theme-os.sass */ +/* line 72, ../sass/vex-theme-os.sass */ .vex.vex-theme-os .vex-dialog-form .vex-dialog-input { margin-bottom: 1em; } -/* line 76, ../sass/vex-theme-os.sass */ +/* line 75, ../sass/vex-theme-os.sass */ .vex.vex-theme-os .vex-dialog-form .vex-dialog-input textarea, .vex.vex-theme-os .vex-dialog-form .vex-dialog-input input[type="date"], .vex.vex-theme-os .vex-dialog-form .vex-dialog-input input[type="datetime"], .vex.vex-theme-os .vex-dialog-form .vex-dialog-input input[type="datetime-local"], .vex.vex-theme-os .vex-dialog-form .vex-dialog-input input[type="email"], .vex.vex-theme-os .vex-dialog-form .vex-dialog-input input[type="month"], .vex.vex-theme-os .vex-dialog-form .vex-dialog-input input[type="number"], .vex.vex-theme-os .vex-dialog-form .vex-dialog-input input[type="password"], .vex.vex-theme-os .vex-dialog-form .vex-dialog-input input[type="search"], .vex.vex-theme-os .vex-dialog-form .vex-dialog-input input[type="tel"], .vex.vex-theme-os .vex-dialog-form .vex-dialog-input input[type="text"], .vex.vex-theme-os .vex-dialog-form .vex-dialog-input input[type="time"], .vex.vex-theme-os .vex-dialog-form .vex-dialog-input input[type="url"], .vex.vex-theme-os .vex-dialog-form .vex-dialog-input input[type="week"] { -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -367,14 +367,14 @@ min-height: 2.5em; margin: 0 0 0.25em; } -/* line 88, ../sass/vex-theme-os.sass */ +/* line 87, ../sass/vex-theme-os.sass */ .vex.vex-theme-os .vex-dialog-form .vex-dialog-input textarea:focus, .vex.vex-theme-os .vex-dialog-form .vex-dialog-input input[type="date"]:focus, .vex.vex-theme-os .vex-dialog-form .vex-dialog-input input[type="datetime"]:focus, .vex.vex-theme-os .vex-dialog-form .vex-dialog-input input[type="datetime-local"]:focus, .vex.vex-theme-os .vex-dialog-form .vex-dialog-input input[type="email"]:focus, .vex.vex-theme-os .vex-dialog-form .vex-dialog-input input[type="month"]:focus, .vex.vex-theme-os .vex-dialog-form .vex-dialog-input input[type="number"]:focus, .vex.vex-theme-os .vex-dialog-form .vex-dialog-input input[type="password"]:focus, .vex.vex-theme-os .vex-dialog-form .vex-dialog-input input[type="search"]:focus, .vex.vex-theme-os .vex-dialog-form .vex-dialog-input input[type="tel"]:focus, .vex.vex-theme-os .vex-dialog-form .vex-dialog-input input[type="text"]:focus, .vex.vex-theme-os .vex-dialog-form .vex-dialog-input input[type="time"]:focus, .vex.vex-theme-os .vex-dialog-form .vex-dialog-input input[type="url"]:focus, .vex.vex-theme-os .vex-dialog-form .vex-dialog-input input[type="week"]:focus { -moz-box-shadow: inset 0 0 0 1px #3288e6; -webkit-box-shadow: inset 0 0 0 1px #3288e6; box-shadow: inset 0 0 0 1px #3288e6; outline: none; } -/* line 92, ../sass/vex-theme-os.sass */ +/* line 91, ../sass/vex-theme-os.sass */ .vex.vex-theme-os .vex-dialog-form .vex-dialog-buttons { *zoom: 1; } @@ -384,7 +384,7 @@ display: table; clear: both; } -/* line 95, ../sass/vex-theme-os.sass */ +/* line 94, ../sass/vex-theme-os.sass */ .vex.vex-theme-os .vex-dialog-button { -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -399,11 +399,11 @@ line-height: 1em; padding: 0.75em 2em; } -/* line 107, ../sass/vex-theme-os.sass */ +/* line 106, ../sass/vex-theme-os.sass */ .vex.vex-theme-os .vex-dialog-button.vex-last { margin-left: 0; } -/* line 110, ../sass/vex-theme-os.sass */ +/* line 109, ../sass/vex-theme-os.sass */ .vex.vex-theme-os .vex-dialog-button:focus { animation: vex-pulse 1.1s infinite; -webkit-animation: vex-pulse 1.1s infinite; @@ -414,7 +414,7 @@ outline: none; } @media (max-width: 568px) { - /* line 110, ../sass/vex-theme-os.sass */ + /* line 109, ../sass/vex-theme-os.sass */ .vex.vex-theme-os .vex-dialog-button:focus { animation: none; -webkit-animation: none; @@ -424,18 +424,18 @@ -webkit-backface-visibility: hidden; } } -/* line 119, ../sass/vex-theme-os.sass */ +/* line 118, ../sass/vex-theme-os.sass */ .vex.vex-theme-os .vex-dialog-button.vex-dialog-button-primary { background: #3288e6; color: #fff; } -/* line 123, ../sass/vex-theme-os.sass */ +/* line 122, ../sass/vex-theme-os.sass */ .vex.vex-theme-os .vex-dialog-button.vex-dialog-button-secondary { background: #e0e0e0; color: #777; } -/* line 127, ../sass/vex-theme-os.sass */ +/* line 126, ../sass/vex-theme-os.sass */ .vex-loading-spinner.vex-theme-os { -moz-box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 0 0.5em rgba(0, 0, 0, 0.2); -webkit-box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 0 0.5em rgba(0, 0, 0, 0.2); diff --git a/css/vex-theme-wireframe.css b/css/vex-theme-wireframe.css index 5eefeb4..9f52503 100644 --- a/css/vex-theme-wireframe.css +++ b/css/vex-theme-wireframe.css @@ -84,16 +84,16 @@ box-shadow: inset 0 0 0 300px transparent; } } -/* line 11, ../sass/vex-theme-wireframe.sass */ -.vex.vex-theme-wireframe .vex-overlay { - background: rgba(255, 255, 255, 0.4); -} -/* line 14, ../sass/vex-theme-wireframe.sass */ -.vex.vex-theme-wireframe .vex-content-wrap { +/* line 9, ../sass/vex-theme-wireframe.sass */ +.vex.vex-theme-wireframe { padding-top: 160px; padding-bottom: 160px; } -/* line 18, ../sass/vex-theme-wireframe.sass */ +/* line 13, ../sass/vex-theme-wireframe.sass */ +.vex.vex-theme-wireframe .vex-overlay { + background: rgba(255, 255, 255, 0.4); +} +/* line 16, ../sass/vex-theme-wireframe.sass */ .vex.vex-theme-wireframe .vex-content { font-family: "Helvetica Neue", sans-serif; background: #fff; @@ -107,18 +107,18 @@ font-size: 1.1em; line-height: 1.5em; } -/* line 31, ../sass/vex-theme-wireframe.sass */ +/* line 29, ../sass/vex-theme-wireframe.sass */ .vex.vex-theme-wireframe .vex-content h1, .vex.vex-theme-wireframe .vex-content h2, .vex.vex-theme-wireframe .vex-content h3, .vex.vex-theme-wireframe .vex-content h4, .vex.vex-theme-wireframe .vex-content h5, .vex.vex-theme-wireframe .vex-content h6, .vex.vex-theme-wireframe .vex-content p, .vex.vex-theme-wireframe .vex-content ul, .vex.vex-theme-wireframe .vex-content li { color: inherit; } -/* line 34, ../sass/vex-theme-wireframe.sass */ +/* line 32, ../sass/vex-theme-wireframe.sass */ .vex.vex-theme-wireframe .vex-close { position: absolute; top: 0; right: 0; cursor: pointer; } -/* line 40, ../sass/vex-theme-wireframe.sass */ +/* line 38, ../sass/vex-theme-wireframe.sass */ .vex.vex-theme-wireframe .vex-close:before { position: absolute; content: "×"; @@ -132,19 +132,19 @@ right: 3px; color: #000; } -/* line 53, ../sass/vex-theme-wireframe.sass */ +/* line 51, ../sass/vex-theme-wireframe.sass */ .vex.vex-theme-wireframe .vex-close:hover:before, .vex.vex-theme-wireframe .vex-close:active:before { color: #000; } -/* line 58, ../sass/vex-theme-wireframe.sass */ +/* line 56, ../sass/vex-theme-wireframe.sass */ .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-message { margin-bottom: 0.5em; } -/* line 61, ../sass/vex-theme-wireframe.sass */ +/* line 59, ../sass/vex-theme-wireframe.sass */ .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-input { margin-bottom: 1em; } -/* line 64, ../sass/vex-theme-wireframe.sass */ +/* line 62, ../sass/vex-theme-wireframe.sass */ .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-input textarea, .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-input input[type="date"], .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-input input[type="datetime"], .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-input input[type="datetime-local"], .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-input input[type="email"], .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-input input[type="month"], .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-input input[type="number"], .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-input input[type="password"], .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-input input[type="search"], .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-input input[type="tel"], .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-input input[type="text"], .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-input input[type="time"], .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-input input[type="url"], .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-input input[type="week"] { background: #fff; width: 100%; @@ -156,12 +156,12 @@ margin: 0 0 0.25em; border: 2px solid #000; } -/* line 75, ../sass/vex-theme-wireframe.sass */ +/* line 73, ../sass/vex-theme-wireframe.sass */ .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-input textarea:focus, .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-input input[type="date"]:focus, .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-input input[type="datetime"]:focus, .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-input input[type="datetime-local"]:focus, .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-input input[type="email"]:focus, .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-input input[type="month"]:focus, .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-input input[type="number"]:focus, .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-input input[type="password"]:focus, .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-input input[type="search"]:focus, .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-input input[type="tel"]:focus, .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-input input[type="text"]:focus, .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-input input[type="time"]:focus, .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-input input[type="url"]:focus, .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-input input[type="week"]:focus { border-style: dashed; outline: none; } -/* line 79, ../sass/vex-theme-wireframe.sass */ +/* line 77, ../sass/vex-theme-wireframe.sass */ .vex.vex-theme-wireframe .vex-dialog-form .vex-dialog-buttons { *zoom: 1; } @@ -171,7 +171,7 @@ display: table; clear: both; } -/* line 82, ../sass/vex-theme-wireframe.sass */ +/* line 80, ../sass/vex-theme-wireframe.sass */ .vex.vex-theme-wireframe .vex-dialog-button { -moz-border-radius: 0; -webkit-border-radius: 0; @@ -186,11 +186,11 @@ line-height: 1em; padding: 0.75em 2em; } -/* line 94, ../sass/vex-theme-wireframe.sass */ +/* line 92, ../sass/vex-theme-wireframe.sass */ .vex.vex-theme-wireframe .vex-dialog-button.vex-last { margin-left: 0; } -/* line 97, ../sass/vex-theme-wireframe.sass */ +/* line 95, ../sass/vex-theme-wireframe.sass */ .vex.vex-theme-wireframe .vex-dialog-button:focus { animation: vex-pulse 1.1s infinite; -webkit-animation: vex-pulse 1.1s infinite; @@ -201,7 +201,7 @@ outline: none; } @media (max-width: 568px) { - /* line 97, ../sass/vex-theme-wireframe.sass */ + /* line 95, ../sass/vex-theme-wireframe.sass */ .vex.vex-theme-wireframe .vex-dialog-button:focus { animation: none; -webkit-animation: none; @@ -211,20 +211,20 @@ -webkit-backface-visibility: hidden; } } -/* line 106, ../sass/vex-theme-wireframe.sass */ +/* line 104, ../sass/vex-theme-wireframe.sass */ .vex.vex-theme-wireframe .vex-dialog-button.vex-dialog-button-primary { background: #000; color: #fff; border: 2px solid transparent; } -/* line 111, ../sass/vex-theme-wireframe.sass */ +/* line 109, ../sass/vex-theme-wireframe.sass */ .vex.vex-theme-wireframe .vex-dialog-button.vex-dialog-button-secondary { background: #fff; color: #000; border: 2px solid #000; } -/* line 116, ../sass/vex-theme-wireframe.sass */ +/* line 114, ../sass/vex-theme-wireframe.sass */ .vex-loading-spinner.vex-theme-wireframe { height: 2.5em; width: 2.5em; diff --git a/css/vex.css b/css/vex.css index 3331fa7..c118b41 100644 --- a/css/vex.css +++ b/css/vex.css @@ -220,11 +220,6 @@ } /* line 49, ../sass/vex.sass */ -.vex-content-wrap { - position: relative; -} - -/* line 52, ../sass/vex.sass */ .vex-content { animation: vex-fadein 0.5s; -webkit-animation: vex-fadein 0.5s; @@ -234,7 +229,7 @@ -webkit-backface-visibility: hidden; background: #fff; } -/* line 56, ../sass/vex.sass */ +/* line 53, ../sass/vex.sass */ .vex.vex-closing .vex-content { animation: vex-fadeout 0.5s; -webkit-animation: vex-fadeout 0.5s; @@ -244,18 +239,18 @@ -webkit-backface-visibility: hidden; } -/* line 59, ../sass/vex.sass */ +/* line 56, ../sass/vex.sass */ .vex-close:before { font-family: Arial, sans-serif; content: "×"; } -/* line 63, ../sass/vex.sass */ +/* line 60, ../sass/vex.sass */ .vex-dialog-form { margin: 0; } -/* line 66, ../sass/vex.sass */ +/* line 63, ../sass/vex.sass */ .vex-dialog-button { text-rendering: optimizeLegibility; -moz-appearance: none; @@ -264,7 +259,7 @@ -webkit-tap-highlight-color: transparent; } -/* line 72, ../sass/vex.sass */ +/* line 69, ../sass/vex.sass */ .vex-loading-spinner { animation: vex-rotation 0.7s linear infinite; -webkit-animation: vex-rotation 0.7s linear infinite; @@ -287,7 +282,7 @@ background: #fff; } -/* line 88, ../sass/vex.sass */ +/* line 85, ../sass/vex.sass */ body.vex-open { overflow: hidden; } diff --git a/js/build-test.html b/js/build-test.html index 2338e5d..9f48b4b 100644 --- a/js/build-test.html +++ b/js/build-test.html @@ -1,13 +1,11 @@ - + - + -Test + \ No newline at end of file diff --git a/js/vex.combined.min.js b/js/vex.combined.min.js index 5f9da14..7e6349c 100644 --- a/js/vex.combined.min.js +++ b/js/vex.combined.min.js @@ -1,2 +1,2 @@ /*! vex.js, vex.dialog.js 2.3.0 */ -(function(){var a;a=function(a){var b,c;return b=!1,a(function(){var d;return d=(document.body||document.documentElement).style,b=void 0!==d.animation||void 0!==d.WebkitAnimation||void 0!==d.MozAnimation||void 0!==d.MsAnimation||void 0!==d.OAnimation,a(window).bind("keyup.vex",function(a){return 27===a.keyCode?c.closeByEscape():void 0})}),c={globalID:1,animationEndEvent:"animationend webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend",baseClassNames:{vex:"vex",content:"vex-content",contentWrap:"vex-content-wrap",overlay:"vex-overlay",close:"vex-close",closing:"vex-closing",open:"vex-open"},defaultOptions:{content:"",showCloseButton:!0,escapeButtonCloses:!0,overlayClosesOnClick:!0,appendLocation:"body",className:"",css:{},overlayClassName:"",overlayCSS:{},contentWrapClassName:"",contentWrapCSS:{},contentClassName:"",contentCSS:{},closeClassName:"",closeCSS:{}},open:function(b){return b=a.extend({},c.defaultOptions,b),b.id=c.globalID,c.globalID+=1,b.$vex=a("
").addClass(c.baseClassNames.vex).addClass(b.className).css(b.css).data({vex:b}),b.$vexOverlay=a("
").addClass(c.baseClassNames.overlay).addClass(b.overlayClassName).css(b.overlayCSS).data({vex:b}),b.$vex.append(b.$vexOverlay),b.$vexContentWrap=a("
").addClass(c.baseClassNames.contentWrap).addClass(b.contentWrapClassName).css(b.contentWrapCSS).data({vex:b}),b.overlayClosesOnClick&&(b.$vexOverlay.bind("click.vex",function(b){return b.target===this?c.close(a(this).data().vex.id):void 0}),b.$vexContentWrap.bind("click.vex",function(b){return b.target===this?c.close(a(this).data().vex.id):void 0})),b.$vexContent=a("
").addClass(c.baseClassNames.content).addClass(b.contentClassName).css(b.contentCSS).append(b.content).data({vex:b}),b.$vex.append(b.$vexContentWrap.append(b.$vexContent)),b.showCloseButton&&(b.$closeButton=a("
").addClass(c.baseClassNames.close).addClass(b.closeClassName).css(b.closeCSS).data({vex:b}).bind("click.vex",function(){return c.close(a(this).data().vex.id)}),b.$vexContent.append(b.$closeButton)),a(b.appendLocation).append(b.$vex),c.setupBodyClassName(b.$vex),c.setupBodyPadding(b.$vex),c.setupOverlayPosition(b),b.afterOpen&&b.afterOpen(b.$vexContent,b),setTimeout(function(){return b.$vexContent.trigger("vexOpen",b)},0),b.$vexContent},getSelectorFromBaseClass:function(a){return"."+a.split(" ").join(".")},getAllVexes:function(){return a("."+c.baseClassNames.vex+':not(".'+c.baseClassNames.closing+'") '+c.getSelectorFromBaseClass(c.baseClassNames.content))},getVexByID:function(b){return c.getAllVexes().filter(function(){return a(this).data().vex.id===b})},close:function(a){var b;if(!a){if(b=c.getAllVexes().last(),!b.length)return!1;a=b.data().vex.id}return c.closeByID(a)},closeAll:function(){var b;return b=c.getAllVexes().map(function(){return a(this).data().vex.id}).toArray(),(null!=b?b.length:void 0)?(a.each(b.reverse(),function(a,b){return c.closeByID(b)}),!0):!1},closeByID:function(d){var e,f,g,h,i;return f=c.getVexByID(d),f.length?(e=f.data().vex.$vex,i=a.extend({},f.data().vex),g=function(){return i.beforeClose?i.beforeClose(f,i):void 0},h=function(){return f.trigger("vexClose",i),e.remove(),a("body").trigger("vexAfterClose",i),i.afterClose?i.afterClose(f,i):void 0},b?(g(),e.unbind(c.animationEndEvent).bind(c.animationEndEvent,function(){return h()}).addClass(c.baseClassNames.closing)):(g(),h()),!0):void 0},closeByEscape:function(){var b,d,e;return e=c.getAllVexes().map(function(){return a(this).data().vex.id}).toArray(),(null!=e?e.length:void 0)?(d=Math.max.apply(Math,e),b=c.getVexByID(d),b.data().vex.escapeButtonCloses!==!0?!1:c.closeByID(d)):!1},setupBodyClassName:function(){return a("body").bind("vexOpen.vex",function(){return a("body").addClass(c.baseClassNames.open)}).bind("vexAfterClose.vex",function(){return c.getAllVexes().length?void 0:a("body").removeClass(c.baseClassNames.open)})},setupBodyPadding:function(){return a("body").bind("vexOpen.vex",function(){return a("body").css("padding-right",c.getScrollbarWidth())}).bind("vexAfterClose.vex",function(){return c.getAllVexes().length?void 0:a("body").css("padding-right",0)})},setupOverlayPosition:function(b){return a("body").bind("vexOpen.vex",function(){return b.$vexOverlay.css("right",c.getScrollbarWidth())}).bind("vexAfterClose.vex",function(){return c.getAllVexes().length?void 0:b.$vexOverlay.css("right",0)})},hideLoading:function(){return a(".vex-loading-spinner").remove()},showLoading:function(){return c.hideLoading(),a("body").append('')},getScrollbarWidth:function(){var b,c;return b=a('
').appendTo("body"),c=b[0].offsetWidth-b[0].clientWidth,b.remove(),c}}},"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof exports?module.exports=a(require("jquery")):window.vex=a(jQuery)}).call(this),function(){var a;a=function(a,b){var c,d;return null==b?a.error("Vex is required to use vex.dialog"):(c=function(b){var c;return c={},a.each(b.serializeArray(),function(){return c[this.name]?(c[this.name].push||(c[this.name]=[c[this.name]]),c[this.name].push(this.value||"")):c[this.name]=this.value||""}),c},d={},d.buttons={YES:{text:"OK",type:"submit",className:"vex-dialog-button-primary"},NO:{text:"Cancel",type:"button",className:"vex-dialog-button-secondary",click:function(a){return a.data().vex.value=!1,b.close(a.data().vex.id)}}},d.defaultOptions={callback:function(){},afterOpen:function(){},message:"Message",input:'',value:!1,buttons:[d.buttons.YES,d.buttons.NO],showCloseButton:!1,onSubmit:function(e){var f,g;return f=a(this),g=f.parent(),e.preventDefault(),e.stopPropagation(),g.data().vex.value=d.getFormValueOnSubmit(c(f)),b.close(g.data().vex.id)},focusFirstInput:!0},d.defaultAlertOptions={message:"Alert",buttons:[d.buttons.YES]},d.defaultConfirmOptions={message:"Confirm"},d.open=function(c){var e;return c=a.extend({},b.defaultOptions,d.defaultOptions,c),c.content=d.buildDialogForm(c),c.beforeClose=function(a){return c.callback(a.data().vex.value)},e=b.open(c),c.focusFirstInput&&e.find('button[type="submit"], button[type="button"], input[type="submit"], input[type="button"], textarea, input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="email"], input[type="month"], input[type="number"], input[type="password"], input[type="search"], input[type="tel"], input[type="text"], input[type="time"], input[type="url"], input[type="week"]').first().focus(),e},d.alert=function(b){return"string"==typeof b&&(b={message:b}),b=a.extend({},d.defaultAlertOptions,b),d.open(b)},d.confirm=function(b){return"string"==typeof b?a.error("dialog.confirm(options) requires options.callback."):(b=a.extend({},d.defaultConfirmOptions,b),d.open(b))},d.prompt=function(b){var c;return"string"==typeof b?a.error("dialog.prompt(options) requires options.callback."):(c={message:'",input:''},b=a.extend({},c,b),d.open(b))},d.buildDialogForm=function(b){var c,e,f;return c=a('
'),f=a('
'),e=a('
'),c.append(f.append(b.message)).append(e.append(b.input)).append(d.buttonsToDOM(b.buttons)).bind("submit.vex",b.onSubmit),c},d.getFormValueOnSubmit=function(a){return a.vex||""===a.vex?"_vex-empty-value"===a.vex?!0:a.vex:a},d.buttonsToDOM=function(c){var d;return d=a('
'),a.each(c,function(e,f){var g;return g=a('').text(f.text).addClass(f.className+" vex-dialog-button "+(0===e?"vex-first ":"")+(e===c.length-1?"vex-last ":"")).bind("click.vex",function(c){return f.click?f.click(a(this).parents(b.getSelectorFromBaseClass(b.baseClassNames.content)),c):void 0}),g.appendTo(d)}),d},d)},"function"==typeof define&&define.amd?define(["jquery","vex"],a):"object"==typeof exports?module.exports=a(require("jquery"),require("./vex.js")):window.vex.dialog=a(window.jQuery,window.vex)}.call(this); \ No newline at end of file +(function(){var a;a=function(a){var b,c;return b=!1,a(function(){var d;return d=(document.body||document.documentElement).style,b=void 0!==d.animation||void 0!==d.WebkitAnimation||void 0!==d.MozAnimation||void 0!==d.MsAnimation||void 0!==d.OAnimation,a(window).bind("keyup.vex",function(a){return 27===a.keyCode?c.closeByEscape():void 0})}),c={globalID:1,animationEndEvent:"animationend webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend",baseClassNames:{vex:"vex",content:"vex-content",overlay:"vex-overlay",close:"vex-close",closing:"vex-closing",open:"vex-open"},defaultOptions:{content:"",showCloseButton:!0,escapeButtonCloses:!0,overlayClosesOnClick:!0,appendLocation:"body",className:"",css:{},overlayClassName:"",overlayCSS:{},contentClassName:"",contentCSS:{},closeClassName:"",closeCSS:{}},open:function(b){return b=a.extend({},c.defaultOptions,b),b.id=c.globalID,c.globalID+=1,b.$vex=a("
").addClass(c.baseClassNames.vex).addClass(b.className).css(b.css).data({vex:b}),b.$vexOverlay=a("
").addClass(c.baseClassNames.overlay).addClass(b.overlayClassName).css(b.overlayCSS).data({vex:b}),b.overlayClosesOnClick&&b.$vexOverlay.bind("click.vex",function(b){return b.target===this?c.close(a(this).data().vex.id):void 0}),b.$vex.append(b.$vexOverlay),b.$vexContent=a("
").addClass(c.baseClassNames.content).addClass(b.contentClassName).css(b.contentCSS).append(b.content).data({vex:b}),b.$vex.append(b.$vexContent),b.showCloseButton&&(b.$closeButton=a("
").addClass(c.baseClassNames.close).addClass(b.closeClassName).css(b.closeCSS).data({vex:b}).bind("click.vex",function(){return c.close(a(this).data().vex.id)}),b.$vexContent.append(b.$closeButton)),a(b.appendLocation).append(b.$vex),c.setupBodyClassName(b.$vex),c.setupBodyPadding(b.$vex),b.afterOpen&&b.afterOpen(b.$vexContent,b),setTimeout(function(){return b.$vexContent.trigger("vexOpen",b)},0),b.$vexContent},getSelectorFromBaseClass:function(a){return"."+a.split(" ").join(".")},getAllVexes:function(){return a("."+c.baseClassNames.vex+':not(".'+c.baseClassNames.closing+'") '+c.getSelectorFromBaseClass(c.baseClassNames.content))},getVexByID:function(b){return c.getAllVexes().filter(function(){return a(this).data().vex.id===b})},close:function(a){var b;if(!a){if(b=c.getAllVexes().last(),!b.length)return!1;a=b.data().vex.id}return c.closeByID(a)},closeAll:function(){var b;return b=c.getAllVexes().map(function(){return a(this).data().vex.id}).toArray(),(null!=b?b.length:void 0)?(a.each(b.reverse(),function(a,b){return c.closeByID(b)}),!0):!1},closeByID:function(d){var e,f,g,h,i;return f=c.getVexByID(d),f.length?(e=f.data().vex.$vex,i=a.extend({},f.data().vex),g=function(){return i.beforeClose?i.beforeClose(f,i):void 0},h=function(){return f.trigger("vexClose",i),e.remove(),a("body").trigger("vexAfterClose",i),i.afterClose?i.afterClose(f,i):void 0},b?(g(),e.unbind(c.animationEndEvent).bind(c.animationEndEvent,function(){return h()}).addClass(c.baseClassNames.closing)):(g(),h()),!0):void 0},closeByEscape:function(){var b,d,e;return e=c.getAllVexes().map(function(){return a(this).data().vex.id}).toArray(),(null!=e?e.length:void 0)?(d=Math.max.apply(Math,e),b=c.getVexByID(d),b.data().vex.escapeButtonCloses!==!0?!1:c.closeByID(d)):!1},setupBodyClassName:function(){return a("body").bind("vexOpen.vex",function(){return a("body").addClass(c.baseClassNames.open)}).bind("vexAfterClose.vex",function(){return c.getAllVexes().length?void 0:a("body").removeClass(c.baseClassNames.open)})},setupBodyPadding:function(){return a("body").bind("vexOpen.vex",function(){return a("body").css("padding-right",c.getScrollbarWidth())}).bind("vexAfterClose.vex",function(){return c.getAllVexes().length?void 0:a("body").css("padding-right",0)})},hideLoading:function(){return a(".vex-loading-spinner").remove()},showLoading:function(){return c.hideLoading(),a("body").append('')},getScrollbarWidth:function(){var b,c;return b=a('
').appendTo("body"),c=b[0].offsetWidth-b[0].clientWidth,b.remove(),c}}},"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof exports?module.exports=a(require("jquery")):window.vex=a(jQuery)}).call(this),function(){var a;a=function(a,b){var c,d;return null==b?a.error("Vex is required to use vex.dialog"):(c=function(b){var c;return c={},a.each(b.serializeArray(),function(){return c[this.name]?(c[this.name].push||(c[this.name]=[c[this.name]]),c[this.name].push(this.value||"")):c[this.name]=this.value||""}),c},d={},d.buttons={YES:{text:"OK",type:"submit",className:"vex-dialog-button-primary"},NO:{text:"Cancel",type:"button",className:"vex-dialog-button-secondary",click:function(a){return a.data().vex.value=!1,b.close(a.data().vex.id)}}},d.defaultOptions={callback:function(){},afterOpen:function(){},message:"Message",input:'',value:!1,buttons:[d.buttons.YES,d.buttons.NO],showCloseButton:!1,onSubmit:function(e){var f,g;return f=a(this),g=f.parent(),e.preventDefault(),e.stopPropagation(),g.data().vex.value=d.getFormValueOnSubmit(c(f)),b.close(g.data().vex.id)},focusFirstInput:!0},d.defaultAlertOptions={message:"Alert",buttons:[d.buttons.YES]},d.defaultConfirmOptions={message:"Confirm"},d.open=function(c){var e;return c=a.extend({},b.defaultOptions,d.defaultOptions,c),c.content=d.buildDialogForm(c),c.beforeClose=function(a){return c.callback(a.data().vex.value)},e=b.open(c),c.focusFirstInput&&e.find('button[type="submit"], button[type="button"], input[type="submit"], input[type="button"], textarea, input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="email"], input[type="month"], input[type="number"], input[type="password"], input[type="search"], input[type="tel"], input[type="text"], input[type="time"], input[type="url"], input[type="week"]').first().focus(),e},d.alert=function(b){return"string"==typeof b&&(b={message:b}),b=a.extend({},d.defaultAlertOptions,b),d.open(b)},d.confirm=function(b){return"string"==typeof b?a.error("dialog.confirm(options) requires options.callback."):(b=a.extend({},d.defaultConfirmOptions,b),d.open(b))},d.prompt=function(b){var c;return"string"==typeof b?a.error("dialog.prompt(options) requires options.callback."):(c={message:'",input:''},b=a.extend({},c,b),d.open(b))},d.buildDialogForm=function(b){var c,e,f;return c=a(''),f=a('
'),e=a('
'),c.append(f.append(b.message)).append(e.append(b.input)).append(d.buttonsToDOM(b.buttons)).bind("submit.vex",b.onSubmit),c},d.getFormValueOnSubmit=function(a){return a.vex||""===a.vex?"_vex-empty-value"===a.vex?!0:a.vex:a},d.buttonsToDOM=function(c){var d;return d=a('
'),a.each(c,function(e,f){var g;return g=a('').text(f.text).addClass(f.className+" vex-dialog-button "+(0===e?"vex-first ":"")+(e===c.length-1?"vex-last ":"")).bind("click.vex",function(c){return f.click?f.click(a(this).parents(b.getSelectorFromBaseClass(b.baseClassNames.content)),c):void 0}),g.appendTo(d)}),d},d)},"function"==typeof define&&define.amd?define(["jquery","vex"],a):"object"==typeof exports?module.exports=a(require("jquery"),require("./vex.js")):window.vex.dialog=a(window.jQuery,window.vex)}.call(this); \ No newline at end of file diff --git a/js/vex.js b/js/vex.js index 98bd676..f3448d6 100644 --- a/js/vex.js +++ b/js/vex.js @@ -20,7 +20,6 @@ baseClassNames: { vex: 'vex', content: 'vex-content', - contentWrap: 'vex-content-wrap', overlay: 'vex-overlay', close: 'vex-close', closing: 'vex-closing', @@ -36,8 +35,6 @@ css: {}, overlayClassName: '', overlayCSS: {}, - contentWrapClassName: '', - contentWrapCSS: {}, contentClassName: '', contentCSS: {}, closeClassName: '', @@ -53,10 +50,6 @@ options.$vexOverlay = $('
').addClass(vex.baseClassNames.overlay).addClass(options.overlayClassName).css(options.overlayCSS).data({ vex: options }); - options.$vex.append(options.$vexOverlay); - options.$vexContentWrap = $('
').addClass(vex.baseClassNames.contentWrap).addClass(options.contentWrapClassName).css(options.contentWrapCSS).data({ - vex: options - }); if (options.overlayClosesOnClick) { options.$vexOverlay.bind('click.vex', function(e) { if (e.target !== this) { @@ -64,17 +57,12 @@ } return vex.close($(this).data().vex.id); }); - options.$vexContentWrap.bind('click.vex', function(e) { - if (e.target !== this) { - return; - } - return vex.close($(this).data().vex.id); - }); } + options.$vex.append(options.$vexOverlay); options.$vexContent = $('
').addClass(vex.baseClassNames.content).addClass(options.contentClassName).css(options.contentCSS).append(options.content).data({ vex: options }); - options.$vex.append(options.$vexContentWrap.append(options.$vexContent)); + options.$vex.append(options.$vexContent); if (options.showCloseButton) { options.$closeButton = $('
').addClass(vex.baseClassNames.close).addClass(options.closeClassName).css(options.closeCSS).data({ vex: options @@ -86,7 +74,6 @@ $(options.appendLocation).append(options.$vex); vex.setupBodyClassName(options.$vex); vex.setupBodyPadding(options.$vex); - vex.setupOverlayPosition(options); if (options.afterOpen) { options.afterOpen(options.$vexContent, options); } @@ -195,15 +182,6 @@ } }); }, - setupOverlayPosition: function(options) { - return $('body').bind('vexOpen.vex', function() { - return options.$vexOverlay.css('right', vex.getScrollbarWidth()); - }).bind('vexAfterClose.vex', function() { - if (!vex.getAllVexes().length) { - return options.$vexOverlay.css('right', 0); - } - }); - }, hideLoading: function() { return $('.vex-loading-spinner').remove(); }, diff --git a/js/vex.min.js b/js/vex.min.js index 01f67a0..881cc8e 100644 --- a/js/vex.min.js +++ b/js/vex.min.js @@ -1,2 +1,2 @@ /*! vex.js 2.3.0 */ -(function(){var a;a=function(a){var b,c;return b=!1,a(function(){var d;return d=(document.body||document.documentElement).style,b=void 0!==d.animation||void 0!==d.WebkitAnimation||void 0!==d.MozAnimation||void 0!==d.MsAnimation||void 0!==d.OAnimation,a(window).bind("keyup.vex",function(a){return 27===a.keyCode?c.closeByEscape():void 0})}),c={globalID:1,animationEndEvent:"animationend webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend",baseClassNames:{vex:"vex",content:"vex-content",contentWrap:"vex-content-wrap",overlay:"vex-overlay",close:"vex-close",closing:"vex-closing",open:"vex-open"},defaultOptions:{content:"",showCloseButton:!0,escapeButtonCloses:!0,overlayClosesOnClick:!0,appendLocation:"body",className:"",css:{},overlayClassName:"",overlayCSS:{},contentWrapClassName:"",contentWrapCSS:{},contentClassName:"",contentCSS:{},closeClassName:"",closeCSS:{}},open:function(b){return b=a.extend({},c.defaultOptions,b),b.id=c.globalID,c.globalID+=1,b.$vex=a("
").addClass(c.baseClassNames.vex).addClass(b.className).css(b.css).data({vex:b}),b.$vexOverlay=a("
").addClass(c.baseClassNames.overlay).addClass(b.overlayClassName).css(b.overlayCSS).data({vex:b}),b.$vex.append(b.$vexOverlay),b.$vexContentWrap=a("
").addClass(c.baseClassNames.contentWrap).addClass(b.contentWrapClassName).css(b.contentWrapCSS).data({vex:b}),b.overlayClosesOnClick&&(b.$vexOverlay.bind("click.vex",function(b){return b.target===this?c.close(a(this).data().vex.id):void 0}),b.$vexContentWrap.bind("click.vex",function(b){return b.target===this?c.close(a(this).data().vex.id):void 0})),b.$vexContent=a("
").addClass(c.baseClassNames.content).addClass(b.contentClassName).css(b.contentCSS).append(b.content).data({vex:b}),b.$vex.append(b.$vexContentWrap.append(b.$vexContent)),b.showCloseButton&&(b.$closeButton=a("
").addClass(c.baseClassNames.close).addClass(b.closeClassName).css(b.closeCSS).data({vex:b}).bind("click.vex",function(){return c.close(a(this).data().vex.id)}),b.$vexContent.append(b.$closeButton)),a(b.appendLocation).append(b.$vex),c.setupBodyClassName(b.$vex),c.setupBodyPadding(b.$vex),c.setupOverlayPosition(b),b.afterOpen&&b.afterOpen(b.$vexContent,b),setTimeout(function(){return b.$vexContent.trigger("vexOpen",b)},0),b.$vexContent},getSelectorFromBaseClass:function(a){return"."+a.split(" ").join(".")},getAllVexes:function(){return a("."+c.baseClassNames.vex+':not(".'+c.baseClassNames.closing+'") '+c.getSelectorFromBaseClass(c.baseClassNames.content))},getVexByID:function(b){return c.getAllVexes().filter(function(){return a(this).data().vex.id===b})},close:function(a){var b;if(!a){if(b=c.getAllVexes().last(),!b.length)return!1;a=b.data().vex.id}return c.closeByID(a)},closeAll:function(){var b;return b=c.getAllVexes().map(function(){return a(this).data().vex.id}).toArray(),(null!=b?b.length:void 0)?(a.each(b.reverse(),function(a,b){return c.closeByID(b)}),!0):!1},closeByID:function(d){var e,f,g,h,i;return f=c.getVexByID(d),f.length?(e=f.data().vex.$vex,i=a.extend({},f.data().vex),g=function(){return i.beforeClose?i.beforeClose(f,i):void 0},h=function(){return f.trigger("vexClose",i),e.remove(),a("body").trigger("vexAfterClose",i),i.afterClose?i.afterClose(f,i):void 0},b?(g(),e.unbind(c.animationEndEvent).bind(c.animationEndEvent,function(){return h()}).addClass(c.baseClassNames.closing)):(g(),h()),!0):void 0},closeByEscape:function(){var b,d,e;return e=c.getAllVexes().map(function(){return a(this).data().vex.id}).toArray(),(null!=e?e.length:void 0)?(d=Math.max.apply(Math,e),b=c.getVexByID(d),b.data().vex.escapeButtonCloses!==!0?!1:c.closeByID(d)):!1},setupBodyClassName:function(){return a("body").bind("vexOpen.vex",function(){return a("body").addClass(c.baseClassNames.open)}).bind("vexAfterClose.vex",function(){return c.getAllVexes().length?void 0:a("body").removeClass(c.baseClassNames.open)})},setupBodyPadding:function(){return a("body").bind("vexOpen.vex",function(){return a("body").css("padding-right",c.getScrollbarWidth())}).bind("vexAfterClose.vex",function(){return c.getAllVexes().length?void 0:a("body").css("padding-right",0)})},setupOverlayPosition:function(b){return a("body").bind("vexOpen.vex",function(){return b.$vexOverlay.css("right",c.getScrollbarWidth())}).bind("vexAfterClose.vex",function(){return c.getAllVexes().length?void 0:b.$vexOverlay.css("right",0)})},hideLoading:function(){return a(".vex-loading-spinner").remove()},showLoading:function(){return c.hideLoading(),a("body").append('')},getScrollbarWidth:function(){var b,c;return b=a('
').appendTo("body"),c=b[0].offsetWidth-b[0].clientWidth,b.remove(),c}}},"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof exports?module.exports=a(require("jquery")):window.vex=a(jQuery)}).call(this); \ No newline at end of file +(function(){var a;a=function(a){var b,c;return b=!1,a(function(){var d;return d=(document.body||document.documentElement).style,b=void 0!==d.animation||void 0!==d.WebkitAnimation||void 0!==d.MozAnimation||void 0!==d.MsAnimation||void 0!==d.OAnimation,a(window).bind("keyup.vex",function(a){return 27===a.keyCode?c.closeByEscape():void 0})}),c={globalID:1,animationEndEvent:"animationend webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend",baseClassNames:{vex:"vex",content:"vex-content",overlay:"vex-overlay",close:"vex-close",closing:"vex-closing",open:"vex-open"},defaultOptions:{content:"",showCloseButton:!0,escapeButtonCloses:!0,overlayClosesOnClick:!0,appendLocation:"body",className:"",css:{},overlayClassName:"",overlayCSS:{},contentClassName:"",contentCSS:{},closeClassName:"",closeCSS:{}},open:function(b){return b=a.extend({},c.defaultOptions,b),b.id=c.globalID,c.globalID+=1,b.$vex=a("
").addClass(c.baseClassNames.vex).addClass(b.className).css(b.css).data({vex:b}),b.$vexOverlay=a("
").addClass(c.baseClassNames.overlay).addClass(b.overlayClassName).css(b.overlayCSS).data({vex:b}),b.overlayClosesOnClick&&b.$vexOverlay.bind("click.vex",function(b){return b.target===this?c.close(a(this).data().vex.id):void 0}),b.$vex.append(b.$vexOverlay),b.$vexContent=a("
").addClass(c.baseClassNames.content).addClass(b.contentClassName).css(b.contentCSS).append(b.content).data({vex:b}),b.$vex.append(b.$vexContent),b.showCloseButton&&(b.$closeButton=a("
").addClass(c.baseClassNames.close).addClass(b.closeClassName).css(b.closeCSS).data({vex:b}).bind("click.vex",function(){return c.close(a(this).data().vex.id)}),b.$vexContent.append(b.$closeButton)),a(b.appendLocation).append(b.$vex),c.setupBodyClassName(b.$vex),c.setupBodyPadding(b.$vex),b.afterOpen&&b.afterOpen(b.$vexContent,b),setTimeout(function(){return b.$vexContent.trigger("vexOpen",b)},0),b.$vexContent},getSelectorFromBaseClass:function(a){return"."+a.split(" ").join(".")},getAllVexes:function(){return a("."+c.baseClassNames.vex+':not(".'+c.baseClassNames.closing+'") '+c.getSelectorFromBaseClass(c.baseClassNames.content))},getVexByID:function(b){return c.getAllVexes().filter(function(){return a(this).data().vex.id===b})},close:function(a){var b;if(!a){if(b=c.getAllVexes().last(),!b.length)return!1;a=b.data().vex.id}return c.closeByID(a)},closeAll:function(){var b;return b=c.getAllVexes().map(function(){return a(this).data().vex.id}).toArray(),(null!=b?b.length:void 0)?(a.each(b.reverse(),function(a,b){return c.closeByID(b)}),!0):!1},closeByID:function(d){var e,f,g,h,i;return f=c.getVexByID(d),f.length?(e=f.data().vex.$vex,i=a.extend({},f.data().vex),g=function(){return i.beforeClose?i.beforeClose(f,i):void 0},h=function(){return f.trigger("vexClose",i),e.remove(),a("body").trigger("vexAfterClose",i),i.afterClose?i.afterClose(f,i):void 0},b?(g(),e.unbind(c.animationEndEvent).bind(c.animationEndEvent,function(){return h()}).addClass(c.baseClassNames.closing)):(g(),h()),!0):void 0},closeByEscape:function(){var b,d,e;return e=c.getAllVexes().map(function(){return a(this).data().vex.id}).toArray(),(null!=e?e.length:void 0)?(d=Math.max.apply(Math,e),b=c.getVexByID(d),b.data().vex.escapeButtonCloses!==!0?!1:c.closeByID(d)):!1},setupBodyClassName:function(){return a("body").bind("vexOpen.vex",function(){return a("body").addClass(c.baseClassNames.open)}).bind("vexAfterClose.vex",function(){return c.getAllVexes().length?void 0:a("body").removeClass(c.baseClassNames.open)})},setupBodyPadding:function(){return a("body").bind("vexOpen.vex",function(){return a("body").css("padding-right",c.getScrollbarWidth())}).bind("vexAfterClose.vex",function(){return c.getAllVexes().length?void 0:a("body").css("padding-right",0)})},hideLoading:function(){return a(".vex-loading-spinner").remove()},showLoading:function(){return c.hideLoading(),a("body").append('')},getScrollbarWidth:function(){var b,c;return b=a('
').appendTo("body"),c=b[0].offsetWidth-b[0].clientWidth,b.remove(),c}}},"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof exports?module.exports=a(require("jquery")):window.vex=a(jQuery)}).call(this); \ No newline at end of file diff --git a/sass/vex-theme-default.sass b/sass/vex-theme-default.sass index fe88286..5d059bb 100644 --- a/sass/vex-theme-default.sass +++ b/sass/vex-theme-default.sass @@ -8,14 +8,12 @@ $blue: #3288e6 .vex.vex-theme-default + padding-top: 160px + padding-bottom: 160px &.vex-closing .vex-content +vex-animation(vex-flyout .5s) - .vex-content-wrap - padding-top: 160px - padding-bottom: 160px - .vex-content +vex-animation(vex-flyin .5s) diff --git a/sass/vex-theme-flat-attack.sass b/sass/vex-theme-flat-attack.sass index adb5cae..9560ec8 100644 --- a/sass/vex-theme-flat-attack.sass +++ b/sass/vex-theme-flat-attack.sass @@ -28,15 +28,13 @@ $blue: #477FA5 .vex.vex-theme-flat-attack +perspective(1300px) +perspective-origin(50% 150px) + padding-top: 100px + padding-bottom: 100px font-size: 1.5em &.vex-closing .vex-content +vex-animation(vex-flipout-horizontal .5s) - .vex-content-wrap - padding-top: 100px - padding-bottom: 100px - .vex-content +vex-preserve-3d +vex-animation(vex-flipin-horizontal .5s) diff --git a/sass/vex-theme-os.sass b/sass/vex-theme-os.sass index 803ba93..bdbdfbd 100644 --- a/sass/vex-theme-os.sass +++ b/sass/vex-theme-os.sass @@ -8,13 +8,12 @@ $blue: #3288e6 .vex.vex-theme-os + padding-top: 160px + padding-bottom: 160px + &.vex-closing .vex-content +vex-animation(vex-flyout .5s) - .vex-content-wrap - padding-top: 160px - padding-bottom: 160px - .vex-content +vex-animation(vex-flyin .5s) @@ -27,11 +26,11 @@ $blue: #3288e6 color: #444 padding: 1em position: relative - font-size: 1.1em - line-height: 1.5em margin: 0 auto max-width: 100% width: 450px + font-size: 1.1em + line-height: 1.5em h1, h2, h3, h4, h5, h6, p, ul, li color: inherit diff --git a/sass/vex-theme-wireframe.sass b/sass/vex-theme-wireframe.sass index 04a9dd0..4430d73 100644 --- a/sass/vex-theme-wireframe.sass +++ b/sass/vex-theme-wireframe.sass @@ -4,14 +4,12 @@ +keyframes-vex-pulse .vex.vex-theme-wireframe + padding-top: 160px + padding-bottom: 160px .vex-overlay background: rgba(255, 255, 255, .4) - .vex-content-wrap - padding-top: 160px - padding-bottom: 160px - .vex-content font-family: "Helvetica Neue", sans-serif background: #fff diff --git a/sass/vex.sass b/sass/vex.sass index 24204f5..a4a5711 100644 --- a/sass/vex.sass +++ b/sass/vex.sass @@ -44,9 +44,6 @@ .vex.vex-closing & +vex-animation(vex-fadeout .5s) -.vex-content-wrap - position: relative - .vex-content +vex-animation(vex-fadein .5s) background: #fff