diff --git a/fabfile.py b/fabfile.py index 2896b9d..a57facb 100644 --- a/fabfile.py +++ b/fabfile.py @@ -19,8 +19,9 @@ def deploy(): with virtualenv(): run('git pull') # Get source run('pip install -r requirements.txt') # install deps in virtualenv - run('python manage.py collectstatic --noinput') # Collect static + run('python manage.py collectstatic --noinput -i node_modules -i bower_components') # Collect static run('python manage.py migrate') # Run DB migrations # Reload gunicorn - sudo('/etc/init.d/gunicorn reload', shell=False) + sudo('/usr/bin/supervisorctl pid lister.neuf.no | xargs kill -HUP', shell=False) + diff --git a/mailadmin/static/mailadmin/app/scripts/main.js b/mailadmin/static/mailadmin/app/scripts/main.js index 8c007ed..a45d70b 100644 --- a/mailadmin/static/mailadmin/app/scripts/main.js +++ b/mailadmin/static/mailadmin/app/scripts/main.js @@ -94,7 +94,8 @@ text: text, type: type, delay: 3000, - animate_speed: 'fast' + animate_speed: 'fast', + styling: 'bootstrap3' }); } function updateNumEmails(event) { diff --git a/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss b/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss index 3f6b7a7..c745a45 100644 --- a/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss +++ b/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss @@ -1,56 +1,112 @@ /* Author : Hunter Perrin -Version : 2.0.1 +Version : 3.0.0 Link : http://sciactive.com/pnotify/ */ /* -- Notice */ .ui-pnotify { -top: 25px; -right: 25px; -position: absolute; -height: auto; -/* Ensures notices are above everything */ -z-index: 9999; + top: 36px; + right: 36px; + position: absolute; + height: auto; + z-index: 2; } -/* Hides position: fixed from IE6 */ -html > body > .ui-pnotify { -position: fixed; +body > .ui-pnotify { + /* Notices in the body context should be fixed to the viewport. */ + position: fixed; + /* Ensures notices are above everything */ + z-index: 100040; +} +.ui-pnotify-modal-overlay { + background-color: rgba(0, 0, 0, .4); + top: 0; + left: 0; + position: absolute; + height: 100%; + width: 100%; + z-index: 1; +} +body > .ui-pnotify-modal-overlay { + position: fixed; + z-index: 100039; +} +.ui-pnotify.ui-pnotify-in { + display: block !important; +} +.ui-pnotify.ui-pnotify-move { + transition: left .5s ease, top .5s ease, right .5s ease, bottom .5s ease; +} +.ui-pnotify.ui-pnotify-fade-slow { + transition: opacity .6s linear; + opacity: 0; +} +.ui-pnotify.ui-pnotify-fade-slow.ui-pnotify.ui-pnotify-move { + transition: opacity .6s linear, left .5s ease, top .5s ease, right .5s ease, bottom .5s ease; +} +.ui-pnotify.ui-pnotify-fade-normal { + transition: opacity .4s linear; + opacity: 0; +} +.ui-pnotify.ui-pnotify-fade-normal.ui-pnotify.ui-pnotify-move { + transition: opacity .4s linear, left .5s ease, top .5s ease, right .5s ease, bottom .5s ease; +} +.ui-pnotify.ui-pnotify-fade-fast { + transition: opacity .2s linear; + opacity: 0; +} +.ui-pnotify.ui-pnotify-fade-fast.ui-pnotify.ui-pnotify-move { + transition: opacity .2s linear, left .5s ease, top .5s ease, right .5s ease, bottom .5s ease; +} +.ui-pnotify.ui-pnotify-fade-in { + opacity: 1; } .ui-pnotify .ui-pnotify-shadow { --webkit-box-shadow: 0px 2px 10px rgba(50, 50, 50, 0.5); --moz-box-shadow: 0px 2px 10px rgba(50, 50, 50, 0.5); -box-shadow: 0px 2px 10px rgba(50, 50, 50, 0.5); + -webkit-box-shadow: 0px 6px 28px 0px rgba(0,0,0,0.1); + -moz-box-shadow: 0px 6px 28px 0px rgba(0,0,0,0.1); + box-shadow: 0px 6px 28px 0px rgba(0,0,0,0.1); } .ui-pnotify-container { -background-position: 0 0; -padding: .8em; -height: 100%; -margin: 0; + background-position: 0 0; + padding: .8em; + height: 100%; + margin: 0; } -.ui-pnotify-sharp { --webkit-border-radius: 0; --moz-border-radius: 0; -border-radius: 0; +.ui-pnotify-container:after { + content: " "; /* Older browser do not support empty content */ + visibility: hidden; + display: block; + height: 0; + clear: both; +} +.ui-pnotify-container.ui-pnotify-sharp { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .ui-pnotify-title { -display: block; -margin-bottom: .4em; -margin-top: 0; + display: block; + margin-bottom: .4em; + margin-top: 0; } .ui-pnotify-text { -display: block; + display: block; } .ui-pnotify-icon, .ui-pnotify-icon span { -display: block; -float: left; -margin-right: .2em; + display: block; + float: left; + margin-right: .2em; } /* Alternate stack initial positioning. */ .ui-pnotify.stack-topleft, .ui-pnotify.stack-bottomleft { -left: 25px; -right: auto; + left: 25px; + right: auto; } .ui-pnotify.stack-bottomright, .ui-pnotify.stack-bottomleft { -bottom: 25px; -top: auto; + bottom: 25px; + top: auto; +} +.ui-pnotify.stack-modal { + left: 50%; + right: auto; + margin-left: -150px; } diff --git a/mailadmin/static/mailadmin/dist/scripts/main.js b/mailadmin/static/mailadmin/dist/scripts/main.js index 8c007ed..a45d70b 100644 --- a/mailadmin/static/mailadmin/dist/scripts/main.js +++ b/mailadmin/static/mailadmin/dist/scripts/main.js @@ -94,7 +94,8 @@ text: text, type: type, delay: 3000, - animate_speed: 'fast' + animate_speed: 'fast', + styling: 'bootstrap3' }); } function updateNumEmails(event) { diff --git a/mailadmin/static/mailadmin/dist/scripts/vendor.js b/mailadmin/static/mailadmin/dist/scripts/vendor.js index a645ffc..2cc184d 100644 --- a/mailadmin/static/mailadmin/dist/scripts/vendor.js +++ b/mailadmin/static/mailadmin/dist/scripts/vendor.js @@ -14553,6 +14553,38 @@ Za.fn=Ia.prototype;var Xd=bb(1,"add"),Yd=bb(-1,"subtract");a.defaultFormat="YYYY }(jQuery); +/* +PNotify 3.0.0 sciactive.com/pnotify/ +(C) 2015 Hunter Perrin; Google, Inc. +license Apache-2.0 +*/ +(function(b,k){"function"===typeof define&&define.amd?define("pnotify",["jquery"],function(q){return k(q,b)}):"object"===typeof exports&&"undefined"!==typeof module?module.exports=k(require("jquery"),global||b):b.PNotify=k(b.jQuery,b)})(this,function(b,k){var q=function(l){var k={dir1:"down",dir2:"left",push:"bottom",spacing1:36,spacing2:36,context:b("body"),modal:!1},g,h,n=b(l),r=function(){h=b("body");d.prototype.options.stack.context=h;n=b(l);n.bind("resize",function(){g&&clearTimeout(g);g=setTimeout(function(){d.positionAll(!0)}, +10)})},s=function(c){var a=b("
",{"class":"ui-pnotify-modal-overlay"});a.prependTo(c.context);c.overlay_close&&a.click(function(){d.removeStack(c)});return a},d=function(c){this.parseOptions(c);this.init()};b.extend(d.prototype,{version:"3.0.0",options:{title:!1,title_escape:!1,text:!1,text_escape:!1,styling:"brighttheme",addclass:"",cornerclass:"",auto_display:!0,width:"300px",min_height:"16px",type:"notice",icon:!0,animation:"fade",animate_speed:"normal",shadow:!0,hide:!0,delay:8E3,mouse_reset:!0, +remove:!0,insert_brs:!0,destroy:!0,stack:k},modules:{},runModules:function(c,a){var p,b;for(b in this.modules)p="object"===typeof a&&b in a?a[b]:a,"function"===typeof this.modules[b][c]&&(this.modules[b].notice=this,this.modules[b].options="object"===typeof this.options[b]?this.options[b]:{},this.modules[b][c](this,"object"===typeof this.options[b]?this.options[b]:{},p))},state:"initializing",timer:null,animTimer:null,styles:null,elem:null,container:null,title_container:null,text_container:null,animating:!1, +timerHide:!1,init:function(){var c=this;this.modules={};b.extend(!0,this.modules,d.prototype.modules);this.styles="object"===typeof this.options.styling?this.options.styling:d.styling[this.options.styling];this.elem=b("
",{"class":"ui-pnotify "+this.options.addclass,css:{display:"none"},"aria-live":"assertive","aria-role":"alertdialog",mouseenter:function(a){if(c.options.mouse_reset&&"out"===c.animating){if(!c.timerHide)return;c.cancelRemove()}c.options.hide&&c.options.mouse_reset&&c.cancelRemove()}, +mouseleave:function(a){c.options.hide&&c.options.mouse_reset&&"out"!==c.animating&&c.queueRemove();d.positionAll()}});"fade"===this.options.animation&&this.elem.addClass("ui-pnotify-fade-"+this.options.animate_speed);this.container=b("
",{"class":this.styles.container+" ui-pnotify-container "+("error"===this.options.type?this.styles.error:"info"===this.options.type?this.styles.info:"success"===this.options.type?this.styles.success:this.styles.notice),role:"alert"}).appendTo(this.elem);""!== +this.options.cornerclass&&this.container.removeClass("ui-corner-all").addClass(this.options.cornerclass);this.options.shadow&&this.container.addClass("ui-pnotify-shadow");!1!==this.options.icon&&b("
",{"class":"ui-pnotify-icon"}).append(b("",{"class":!0===this.options.icon?"error"===this.options.type?this.styles.error_icon:"info"===this.options.type?this.styles.info_icon:"success"===this.options.type?this.styles.success_icon:this.styles.notice_icon:this.options.icon})).prependTo(this.container); +this.title_container=b("

",{"class":"ui-pnotify-title"}).appendTo(this.container);!1===this.options.title?this.title_container.hide():this.options.title_escape?this.title_container.text(this.options.title):this.title_container.html(this.options.title);this.text_container=b("
",{"class":"ui-pnotify-text","aria-role":"alert"}).appendTo(this.container);!1===this.options.text?this.text_container.hide():this.options.text_escape?this.text_container.text(this.options.text):this.text_container.html(this.options.insert_brs? +String(this.options.text).replace(/\n/g,"
"):this.options.text);"string"===typeof this.options.width&&this.elem.css("width",this.options.width);"string"===typeof this.options.min_height&&this.container.css("min-height",this.options.min_height);d.notices="top"===this.options.stack.push?b.merge([this],d.notices):b.merge(d.notices,[this]);"top"===this.options.stack.push&&this.queuePosition(!1,1);this.options.stack.animation=!1;this.runModules("init");this.options.auto_display&&this.open();return this}, +update:function(c){var a=this.options;this.parseOptions(a,c);this.elem.removeClass("ui-pnotify-fade-slow ui-pnotify-fade-normal ui-pnotify-fade-fast");"fade"===this.options.animation&&this.elem.addClass("ui-pnotify-fade-"+this.options.animate_speed);this.options.cornerclass!==a.cornerclass&&this.container.removeClass("ui-corner-all "+a.cornerclass).addClass(this.options.cornerclass);this.options.shadow!==a.shadow&&(this.options.shadow?this.container.addClass("ui-pnotify-shadow"):this.container.removeClass("ui-pnotify-shadow")); +!1===this.options.addclass?this.elem.removeClass(a.addclass):this.options.addclass!==a.addclass&&this.elem.removeClass(a.addclass).addClass(this.options.addclass);!1===this.options.title?this.title_container.slideUp("fast"):this.options.title!==a.title&&(this.options.title_escape?this.title_container.text(this.options.title):this.title_container.html(this.options.title),!1===a.title&&this.title_container.slideDown(200));!1===this.options.text?this.text_container.slideUp("fast"):this.options.text!== +a.text&&(this.options.text_escape?this.text_container.text(this.options.text):this.text_container.html(this.options.insert_brs?String(this.options.text).replace(/\n/g,"
"):this.options.text),!1===a.text&&this.text_container.slideDown(200));this.options.type!==a.type&&this.container.removeClass(this.styles.error+" "+this.styles.notice+" "+this.styles.success+" "+this.styles.info).addClass("error"===this.options.type?this.styles.error:"info"===this.options.type?this.styles.info:"success"===this.options.type? +this.styles.success:this.styles.notice);if(this.options.icon!==a.icon||!0===this.options.icon&&this.options.type!==a.type)this.container.find("div.ui-pnotify-icon").remove(),!1!==this.options.icon&&b("
",{"class":"ui-pnotify-icon"}).append(b("",{"class":!0===this.options.icon?"error"===this.options.type?this.styles.error_icon:"info"===this.options.type?this.styles.info_icon:"success"===this.options.type?this.styles.success_icon:this.styles.notice_icon:this.options.icon})).prependTo(this.container); +this.options.width!==a.width&&this.elem.animate({width:this.options.width});this.options.min_height!==a.min_height&&this.container.animate({minHeight:this.options.min_height});this.options.hide?a.hide||this.queueRemove():this.cancelRemove();this.queuePosition(!0);this.runModules("update",a);return this},open:function(){this.state="opening";this.runModules("beforeOpen");var c=this;this.elem.parent().length||this.elem.appendTo(this.options.stack.context?this.options.stack.context:h);"top"!==this.options.stack.push&& +this.position(!0);this.animateIn(function(){c.queuePosition(!0);c.options.hide&&c.queueRemove();c.state="open";c.runModules("afterOpen")});return this},remove:function(c){this.state="closing";this.timerHide=!!c;this.runModules("beforeClose");var a=this;this.timer&&(l.clearTimeout(this.timer),this.timer=null);this.animateOut(function(){a.state="closed";a.runModules("afterClose");a.queuePosition(!0);a.options.remove&&a.elem.detach();a.runModules("beforeDestroy");if(a.options.destroy&&null!==d.notices){var c= +b.inArray(a,d.notices);-1!==c&&d.notices.splice(c,1)}a.runModules("afterDestroy")});return this},get:function(){return this.elem},parseOptions:function(c,a){this.options=b.extend(!0,{},d.prototype.options);this.options.stack=d.prototype.options.stack;for(var p=[c,a],m,f=0;f(a.context.is(h)?n.height():a.context.prop("scrollHeight"))||"up"===a.dir1&&a.nextpos1+b.height()> +(a.context.is(h)?n.height():a.context.prop("scrollHeight"))||"left"===a.dir1&&a.nextpos1+b.width()>(a.context.is(h)?n.width():a.context.prop("scrollWidth"))||"right"===a.dir1&&a.nextpos1+b.width()>(a.context.is(h)?n.width():a.context.prop("scrollWidth")))a.nextpos1=a.firstpos1,a.nextpos2+=a.addpos2+("undefined"===typeof a.spacing2?25:a.spacing2),a.addpos2=0;"number"===typeof a.nextpos2&&(a.animation?b.css(e,a.nextpos2+"px"):(b.removeClass("ui-pnotify-move"),b.css(e,a.nextpos2+"px"),b.css(e),b.addClass("ui-pnotify-move"))); +switch(a.dir2){case "down":case "up":b.outerHeight(!0)>a.addpos2&&(a.addpos2=b.height());break;case "left":case "right":b.outerWidth(!0)>a.addpos2&&(a.addpos2=b.width())}"number"===typeof a.nextpos1&&(a.animation?b.css(f,a.nextpos1+"px"):(b.removeClass("ui-pnotify-move"),b.css(f,a.nextpos1+"px"),b.css(f),b.addClass("ui-pnotify-move")));switch(a.dir1){case "down":case "up":a.nextpos1+=b.height()+("undefined"===typeof a.spacing1?25:a.spacing1);break;case "left":case "right":a.nextpos1+=b.width()+("undefined"=== +typeof a.spacing1?25:a.spacing1)}}return this}},queuePosition:function(b,a){g&&clearTimeout(g);a||(a=10);g=setTimeout(function(){d.positionAll(b)},a);return this},cancelRemove:function(){this.timer&&l.clearTimeout(this.timer);this.animTimer&&l.clearTimeout(this.animTimer);"closing"===this.state&&(this.state="open",this.animating=!1,this.elem.addClass("ui-pnotify-in"),"fade"===this.options.animation&&this.elem.addClass("ui-pnotify-fade-in"));return this},queueRemove:function(){var b=this;this.cancelRemove(); +this.timer=l.setTimeout(function(){b.remove(!0)},isNaN(this.options.delay)?0:this.options.delay);return this}});b.extend(d,{notices:[],reload:q,removeAll:function(){b.each(d.notices,function(){this.remove&&this.remove(!1)})},removeStack:function(c){b.each(d.notices,function(){this.remove&&this.options.stack===c&&this.remove(!1)})},positionAll:function(c){g&&clearTimeout(g);g=null;if(d.notices&&d.notices.length)b.each(d.notices,function(){var a=this.options.stack;a&&(a.overlay&&a.overlay.hide(),a.nextpos1= +a.firstpos1,a.nextpos2=a.firstpos2,a.addpos2=0,a.animation=c)}),b.each(d.notices,function(){this.position()});else{var a=d.prototype.options.stack;a&&(delete a.nextpos1,delete a.nextpos2)}},styling:{brighttheme:{container:"brighttheme",notice:"brighttheme-notice",notice_icon:"brighttheme-icon-notice",info:"brighttheme-info",info_icon:"brighttheme-icon-info",success:"brighttheme-success",success_icon:"brighttheme-icon-success",error:"brighttheme-error",error_icon:"brighttheme-icon-error"},jqueryui:{container:"ui-widget ui-widget-content ui-corner-all", +notice:"ui-state-highlight",notice_icon:"ui-icon ui-icon-info",info:"",info_icon:"ui-icon ui-icon-info",success:"ui-state-default",success_icon:"ui-icon ui-icon-circle-check",error:"ui-state-error",error_icon:"ui-icon ui-icon-alert"},bootstrap3:{container:"alert",notice:"alert-warning",notice_icon:"glyphicon glyphicon-exclamation-sign",info:"alert-info",info_icon:"glyphicon glyphicon-info-sign",success:"alert-success",success_icon:"glyphicon glyphicon-ok-sign",error:"alert-danger",error_icon:"glyphicon glyphicon-warning-sign"}}}); +d.styling.fontawesome=b.extend({},d.styling.bootstrap3);b.extend(d.styling.fontawesome,{notice_icon:"fa fa-exclamation-circle",info_icon:"fa fa-info",success_icon:"fa fa-check",error_icon:"fa fa-warning"});l.document.body?r():b(r);return d};return q(k)}); + /*! query-string Parse and stringify URL query strings diff --git a/mailadmin/static/mailadmin/dist/styles/main.css b/mailadmin/static/mailadmin/dist/styles/main.css index 49a0060..6ec6447 100644 --- a/mailadmin/static/mailadmin/dist/styles/main.css +++ b/mailadmin/static/mailadmin/dist/styles/main.css @@ -7188,66 +7188,136 @@ button.close { /* Author : Hunter Perrin -Version : 2.0.1 +Version : 3.0.0 Link : http://sciactive.com/pnotify/ */ /* -- Notice */ /* line 7, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ .ui-pnotify { - top: 25px; - right: 25px; + top: 36px; + right: 36px; position: absolute; height: auto; + z-index: 2; } + +/* line 14, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ +body > .ui-pnotify { + /* Notices in the body context should be fixed to the viewport. */ + position: fixed; /* Ensures notices are above everything */ - z-index: 9999; } + z-index: 100040; } -/* Hides position: fixed from IE6 */ -/* line 16, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ -html > body > .ui-pnotify { - position: fixed; } +/* line 20, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ +.ui-pnotify-modal-overlay { + background-color: rgba(0, 0, 0, 0.4); + top: 0; + left: 0; + position: absolute; + height: 100%; + width: 100%; + z-index: 1; } -/* line 19, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ +/* line 29, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ +body > .ui-pnotify-modal-overlay { + position: fixed; + z-index: 100039; } + +/* line 33, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ +.ui-pnotify.ui-pnotify-in { + display: block !important; } + +/* line 36, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ +.ui-pnotify.ui-pnotify-move { + transition: left .5s ease, top .5s ease, right .5s ease, bottom .5s ease; } + +/* line 39, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ +.ui-pnotify.ui-pnotify-fade-slow { + transition: opacity .6s linear; + opacity: 0; } + +/* line 43, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ +.ui-pnotify.ui-pnotify-fade-slow.ui-pnotify.ui-pnotify-move { + transition: opacity .6s linear, left .5s ease, top .5s ease, right .5s ease, bottom .5s ease; } + +/* line 46, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ +.ui-pnotify.ui-pnotify-fade-normal { + transition: opacity .4s linear; + opacity: 0; } + +/* line 50, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ +.ui-pnotify.ui-pnotify-fade-normal.ui-pnotify.ui-pnotify-move { + transition: opacity .4s linear, left .5s ease, top .5s ease, right .5s ease, bottom .5s ease; } + +/* line 53, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ +.ui-pnotify.ui-pnotify-fade-fast { + transition: opacity .2s linear; + opacity: 0; } + +/* line 57, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ +.ui-pnotify.ui-pnotify-fade-fast.ui-pnotify.ui-pnotify-move { + transition: opacity .2s linear, left .5s ease, top .5s ease, right .5s ease, bottom .5s ease; } + +/* line 60, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ +.ui-pnotify.ui-pnotify-fade-in { + opacity: 1; } + +/* line 63, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ .ui-pnotify .ui-pnotify-shadow { - box-shadow: 0px 2px 10px rgba(50, 50, 50, 0.5); } + box-shadow: 0px 6px 28px 0px rgba(0, 0, 0, 0.1); } -/* line 24, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ +/* line 68, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ .ui-pnotify-container { background-position: 0 0; padding: .8em; height: 100%; margin: 0; } -/* line 30, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ -.ui-pnotify-sharp { +/* line 74, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ +.ui-pnotify-container:after { + content: " "; + /* Older browser do not support empty content */ + visibility: hidden; + display: block; + height: 0; + clear: both; } + +/* line 81, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ +.ui-pnotify-container.ui-pnotify-sharp { border-radius: 0; } -/* line 35, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ +/* line 86, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ .ui-pnotify-title { display: block; margin-bottom: .4em; margin-top: 0; } -/* line 40, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ +/* line 91, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ .ui-pnotify-text { display: block; } -/* line 43, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ +/* line 94, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ .ui-pnotify-icon, .ui-pnotify-icon span { display: block; float: left; margin-right: .2em; } /* Alternate stack initial positioning. */ -/* line 49, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ +/* line 100, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ .ui-pnotify.stack-topleft, .ui-pnotify.stack-bottomleft { left: 25px; right: auto; } -/* line 53, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ +/* line 104, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ .ui-pnotify.stack-bottomright, .ui-pnotify.stack-bottomleft { bottom: 25px; top: auto; } +/* line 108, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_pnotify.core.scss */ +.ui-pnotify.stack-modal { + left: 50%; + right: auto; + margin-left: -150px; } + /* line 1, /home/nikolark/dev/mailadmin/mailadmin/static/mailadmin/app/styles/_animations.scss */ .spin { animation: spin .8s infinite linear; } diff --git a/mailadmin/static/mailadmin/gulpfile.js b/mailadmin/static/mailadmin/gulpfile.js index 373689f..321f78b 100644 --- a/mailadmin/static/mailadmin/gulpfile.js +++ b/mailadmin/static/mailadmin/gulpfile.js @@ -34,7 +34,7 @@ gulp.task('vendorscripts', function() { 'bower_components/bootstrap-sass/assets/javascripts/bootstrap/alert.js', 'bower_components/bootstrap-sass/assets/javascripts/bootstrap/dropdown.js', 'bower_components/bootstrap-sass/assets/javascripts/bootstrap/collapse.js', - 'bower_components/pnotify/pnotify.core.js', + 'bower_components/pnotify/dist/pnotify.js', 'bower_components/query-string/query-string.js' ]; return gulp.src(vendorScripts)