diff --git a/_includes/footer.html b/_includes/footer.html
index 224d9b8..9049d48 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,5 +1,6 @@
{% include base_path %}
+{% if site.footer-follow %}
+{% endif %}
diff --git a/_includes/footer/custom.html b/_includes/footer/custom.html
index cce5904..381f299 100644
--- a/_includes/footer/custom.html
+++ b/_includes/footer/custom.html
@@ -1,3 +1,2 @@
-Sitemap
diff --git a/_pages/about.md b/_pages/about.md
index 9d21b44..543518e 100644
--- a/_pages/about.md
+++ b/_pages/about.md
@@ -3,22 +3,25 @@ layout: archive
permalink: /
# Page Title
-title: "About"
+title: ""
-excerpt: "About me"
+excerpt: "About Scott"
author_profile: true
redirect_from:
- /about/
- /about.html
---
-### About Scott Bateman.
+**I am an Associate Professor in Computer Science and I direct the [Human-Computer Interaction Lab](htps://hci.cs.unb.ca)**, at the [University of New Brunswick](https://www.unb.ca), in [Fredericton, Canada](https://en.wikipedia.org/wiki/Fredericton). My research focuses on enabling people to work and play together in new ways, so that we can learn from each other and lead healthier, happier lives. My group's work has included research into mixed reality, game design, computer supported cooperative work, novel interactions, visualization, and serious games for learning and health.
-Dr. Scott Bateman is the director of the Human-Computer Interaction Lab, where his research is motivated by designing and building technology that works best for people. His work focuses on novel input interactions, visual analytics, computer-based collaboration, and games for learning and health. He joined UNB in the summer of 2015, after 2.5 years as at the University of Prince Edward Island. He received a PhD and Master’s in Computer Science from the University of Saskatchewan, and has worked as a researcher with Microsoft Research, IBM Watson Research, the University of Calgary and the National College of Ireland. Dr. Bateman has been an Associate Editor for several leading international journals and conferences. A frequent collaborator with industry, the HCI Lab has ongoing collaborations with several companies, and has completed several industry R+D projects supported by NBIF, NSERC and NRC.
-
-### Research Interest.
+I joined UNB in 2015, after 2.5 years at the University of Prince Edward Island. I received a PhD and Master’s in Computer Science from the University of Saskatchewan, and have worked as a researcher with Microsoft Research, IBM Watson Research, the University of Calgary and the National College of Ireland.
+## Research Interest
- Human-Computer Interaction
-- Information Visualization and Visual Analytics
-- Computer Supported Collaboration
-- Games and Gamification
+- Mixed Reality
+- Games and Play
+- Computer Supported Cooperative Work
+- Serious Games
+
+## Work with me
+I am interested in working with students from a wide range of backgrounds, who share interests with me, and are highly motivated to learn about research. If you are interested in working with me or finding out more, then please see the [instructions on the HCI Lab's site](http://hcilab.github.io/join-us).
diff --git a/_pages/cv.md b/_pages/cv.md
index 8de0efd..21a0d03 100644
--- a/_pages/cv.md
+++ b/_pages/cv.md
@@ -9,14 +9,15 @@ redirect_from:
{% include base_path %}
-Education
-======
+# CV
+A complete CV can be downloaded [here](/files/ScottBatemanCV.pdf).
+
+## Education
* B.Sc. in Computer Science, University of Prince Edward Island, 2001
* M.Sc. in Computer Science, University of Saskatchewan, 2007
* Ph.D in Computer Science, University of Saskatchewan, 2012
-Work experience
-======
+## Work experience
* 2019-: Associate Professor
* University of New Brunswick
diff --git a/_pages/publications.md b/_pages/publications.md
index de7be72..0a07114 100644
--- a/_pages/publications.md
+++ b/_pages/publications.md
@@ -4,7 +4,7 @@ title: "Publications"
permalink: /publications/
author_profile: true
---
-
+# Publications
{% if author.googlescholar %}
You can also find my articles on my Google Scholar profile.
{% endif %}
diff --git a/_pages/teaching.md b/_pages/teaching.md
index 8830d5c..39106c2 100644
--- a/_pages/teaching.md
+++ b/_pages/teaching.md
@@ -1,18 +1,21 @@
---
layout: archive
title: "Teaching"
-permalink: /teaching
+permalink: /teaching/
author_profile: true
---
{% include base_path %}
+# Teaching
-Other his management of University of New Brunswick’s HCI Lab and reserach supervision, Dr. Bateman teaches courses in user interface development, user expereince design, HCI and research methods.
+## Current & Upcoming Teaching
+* CS3035 Building User Interfaces (Fall 2020)
+* CS6905 Mixed Reality (Fall 2020)
+* CS2053 Introduction to Game Development (Winter 2021)
+* CS4065/6065 Interactive Human-Centered Systems (Winter 2021)
-Current and Past Teaching
-======
+## Past Teaching
* CS1073 Introduction to Computer Programing I
* CS2053 Introduction to Game Development
* CS3035 Building User Interfaces
-* CS6065 Interactive Human-Centered System
-* CS6905 Mixed Reality
\ No newline at end of file
+* CS4065/6065 Interactive Human-Centered Systems
diff --git a/_sass/_archive.scss b/_sass/_archive.scss
index 223b371..64334d1 100644
--- a/_sass/_archive.scss
+++ b/_sass/_archive.scss
@@ -3,8 +3,8 @@
========================================================================== */
.archive {
- padding-top: 24px;
- margin-bottom: 2em;
+ padding-top: 0px;
+ margin-bottom: 0em;
@include breakpoint($medium) {
@include span(12 of 12);
@@ -53,7 +53,7 @@
.page__content {
.archive__item-title {
- margin-top: 1em;
+ margin-top: 0em;
border-bottom: none;
}
}
diff --git a/_sass/_base.scss b/_sass/_base.scss
index 30e47b5..236dca3 100644
--- a/_sass/_base.scss
+++ b/_sass/_base.scss
@@ -22,26 +22,22 @@ body {
}
h1, h2, h3, h4, h5, h6 {
- margin: 2em 0 0.5em;
+ margin: 0 0 0.5em 0;
line-height: 1.2;
font-family: $header-font-family;
font-weight: bold;
}
h1 {
- margin-top: 0;
font-size: $type-size-3;
}
h2 {
font-size: $type-size-4;
- margin-top: 0;
}
h3 {
font-size: $type-size-5;
- margin-top: 0;
- margin-bottom: 30px;
}
h4 {
@@ -62,6 +58,7 @@ small, .small {
p {
margin-bottom: 1.3em;
+ margin-top: 0;
}
u,
@@ -167,12 +164,16 @@ hr {
ul li,
ol li {
- margin-bottom: 0.5em;
+ margin-bottom: 0;
}
li ul,
li ol {
- margin-top: 0.5em;
+ margin-top: 0em;
+}
+ul{
+ margin-top: 0em;
+ margin-bottom: 2em;
}
/*
diff --git a/_sass/_footer.scss b/_sass/_footer.scss
index e7b1843..6c95e64 100644
--- a/_sass/_footer.scss
+++ b/_sass/_footer.scss
@@ -20,16 +20,16 @@
animation: intro 0.3s both;
-webkit-animation-delay: 0.45s;
animation-delay: 0.45s;
- background-color: $lighter-gray;
- border-top: 1px solid $light-gray;
+ background-color: #fff;
footer {
@include clearfix;
margin-left: auto;
margin-right: auto;
- margin-top: 2em;
+ margin-top: 1em;
max-width: 100%;
- padding: 0 1em 2em;
+ padding: 1em;
+ text-align: right;
@include breakpoint($x-large) {
max-width: $x-large;
diff --git a/_sass/_masthead.scss b/_sass/_masthead.scss
index d111255..41afd57 100644
--- a/_sass/_masthead.scss
+++ b/_sass/_masthead.scss
@@ -35,7 +35,6 @@
}
.masthead__menu {
-
ul {
margin: 0;
padding: 0;
@@ -48,6 +47,7 @@
display: block;
list-style-type: none;
white-space: nowrap;
+ text-transform: uppercase;
&--lg {
padding-right: 2em;
@@ -55,6 +55,5 @@
}
&--title {
- text-transform: uppercase;
}
}
diff --git a/_sass/_navigation.scss b/_sass/_navigation.scss
index f0fb539..f808fa1 100644
--- a/_sass/_navigation.scss
+++ b/_sass/_navigation.scss
@@ -437,4 +437,4 @@
display: block;
}
}
-}
\ No newline at end of file
+}
diff --git a/_sass/_page.scss b/_sass/_page.scss
index ae2ca79..2a1845c 100644
--- a/_sass/_page.scss
+++ b/_sass/_page.scss
@@ -5,8 +5,8 @@
#main {
@include container;
@include clearfix;
- padding-left: 1em;
- padding-right: 1em;
+ padding-left: 2em;
+ padding-right: 2em;
animation: intro 0.3s both;
animation-delay: 0.35s;
diff --git a/_sass/_sidebar.scss b/_sass/_sidebar.scss
index 1f67675..b9200c1 100644
--- a/_sass/_sidebar.scss
+++ b/_sass/_sidebar.scss
@@ -38,9 +38,15 @@
font-size: $type-size-5;
}
- p, li {
+ p {
font-family: $sans-serif;
font-size: $type-size-6;
+ font-style: italic;
+ line-height: 1.5;
+ }
+ li {
+ font-family: $sans-serif;
+ font-size: $type-size-7;
line-height: 1.5;
}
@@ -72,8 +78,8 @@
.author__avatar {
display: table-cell;
vertical-align: top;
- width: 36px;
- height: 36px;
+ width: 0px;
+ height: 0px;
@include breakpoint($large) {
display: block;
@@ -83,7 +89,6 @@
img {
max-width: 175px;
- border-radius: 50%;
@include breakpoint($large) {
padding: 5px;
@@ -121,7 +126,7 @@
.author__bio {
margin: 0;
- text-align: center;
+ text-align: left;
@include breakpoint($large) {
margin-top: 10px;
@@ -161,7 +166,7 @@
display: none;
position: absolute;
right: 0;
- margin-top: 15px;
+ margin-top: 0px;
padding: 10px;
list-style-type: none;
border: 1px solid $border-color;
@@ -219,13 +224,14 @@
display: flex;
white-space: break-spaces;
align-items: flex-start;
- margin-bottom: 16px;
+ margin-bottom: 0;
min-height: 28px;
}
img {
width: auto;
margin-right: 8px;
+ vertical-align: top;
}
p, a {
@@ -239,7 +245,7 @@
padding-top: 2px;
padding-bottom: 2px;
color: inherit;
- font-size: $type-size-5;
+ font-size: $type-size-7;
text-decoration: none;
&:hover {
diff --git a/_sass/_variables.scss b/_sass/_variables.scss
index f0fc400..cfa7b6b 100644
--- a/_sass/_variables.scss
+++ b/_sass/_variables.scss
@@ -38,9 +38,9 @@ $type-size-2 : 1.953rem; // ~31.248px
$type-size-3 : 1.563rem; // ~25.008px
$type-size-4 : 1.25rem; // ~20px
$type-size-5 : 1rem; // ~16px
-$type-size-6 : 0.875rem; // ~14px
-$type-size-7 : 0.6875rem; // ~11px
-$type-size-8 : 0.625rem; // ~10px
+$type-size-6 : 0.8rem; // ~14px
+$type-size-7 : 0.6rem; // ~11px
+$type-size-8 : 0.6rem; // ~10px
/*
diff --git a/assets/js/main.min.js b/assets/js/main.min.js
index e44be7f..6585a5c 100644
--- a/assets/js/main.min.js
+++ b/assets/js/main.min.js
@@ -2,4 +2,4 @@ function updateNav(){var e=$btn.hasClass("hidden")?$nav.width():$nav.width()-$bt
return 1===i&&0===r?function(e){return!!e.parentNode}:function(t,n,l){var u,c,d,f,p,h,m=o!==a?"nextSibling":"previousSibling",g=t.parentNode,v=s&&t.nodeName.toLowerCase(),y=!l&&!s,b=!1;if(g){if(o){for(;m;){for(f=t;f=f[m];)if(s?f.nodeName.toLowerCase()===v:1===f.nodeType)return!1;h=m="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?g.firstChild:g.lastChild],a&&y){for(f=g,d=f[F]||(f[F]={}),c=d[f.uniqueID]||(d[f.uniqueID]={}),u=c[e]||[],p=u[0]===$&&u[1],b=p&&u[2],f=p&&g.childNodes[p];f=++p&&f&&f[m]||(b=p=0)||h.pop();)if(1===f.nodeType&&++b&&f===t){c[e]=[$,p,b];break}}else if(y&&(f=t,d=f[F]||(f[F]={}),c=d[f.uniqueID]||(d[f.uniqueID]={}),u=c[e]||[],p=u[0]===$&&u[1],b=p),b===!1)for(;(f=++p&&f&&f[m]||(b=p=0)||h.pop())&&((s?f.nodeName.toLowerCase()!==v:1!==f.nodeType)||!++b||(y&&(d=f[F]||(f[F]={}),c=d[f.uniqueID]||(d[f.uniqueID]={}),c[e]=[$,b]),f!==t)););return b-=r,b===i||b%i===0&&b/i>=0}}},PSEUDO:function(e,n){var r,o=C.pseudos[e]||C.setFilters[e.toLowerCase()]||t.error("unsupported pseudo: "+e);return o[F]?o(n):o.length>1?(r=[e,e,"",n],C.setFilters.hasOwnProperty(e.toLowerCase())?i(function(e,t){for(var i,r=o(e,n),a=r.length;a--;)i=ee(e,r[a]),e[i]=!(t[i]=r[a])}):function(e){return o(e,0,r)}):o}},pseudos:{not:i(function(e){var t=[],n=[],r=S(e.replace(se,"$1"));return r[F]?i(function(e,t,n,i){for(var o,a=r(e,null,i,[]),s=e.length;s--;)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),t[0]=null,!n.pop()}}),has:i(function(e){return function(n){return t(e,n).length>0}}),contains:i(function(e){return e=e.replace(xe,we),function(t){return(t.textContent||t.innerText||T(t)).indexOf(e)>-1}}),lang:i(function(e){return fe.test(e||"")||t.error("unsupported lang: "+e),e=e.replace(xe,we).toLowerCase(),function(t){var n;do if(n=H?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===I},focus:function(e){return e===D.activeElement&&(!D.hasFocus||D.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!C.pseudos.empty(e)},header:function(e){return me.test(e.nodeName)},input:function(e){return he.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:u(function(){return[0]}),last:u(function(e,t){return[t-1]}),eq:u(function(e,t,n){return[0>n?n+t:n]}),even:u(function(e,t){for(var n=0;t>n;n+=2)e.push(n);return e}),odd:u(function(e,t){for(var n=1;t>n;n+=2)e.push(n);return e}),lt:u(function(e,t,n){for(var i=0>n?n+t:n;--i>=0;)e.push(i);return e}),gt:u(function(e,t,n){for(var i=0>n?n+t:n;++i2&&"ID"===(a=o[0]).type&&w.getById&&9===t.nodeType&&H&&C.relative[o[1].type]){if(t=(C.find.ID(a.matches[0].replace(xe,we),t)||[])[0],!t)return n;u&&(t=t.parentNode),e=e.slice(o.shift().value.length)}for(r=pe.needsContext.test(e)?0:o.length;r--&&(a=o[r],!C.relative[s=a.type]);)if((l=C.find[s])&&(i=l(a.matches[0].replace(xe,we),ye.test(o[0].type)&&c(t.parentNode)||t))){if(o.splice(r,1),e=i.length&&f(o),!e)return J.apply(n,i),n;break}}return(u||S(e,d))(i,t,!H,n,!t||ye.test(e)&&c(t.parentNode)||t),n},w.sortStable=F.split("").sort(Y).join("")===F,w.detectDuplicates=!!j,_(),w.sortDetached=r(function(e){return 1&e.compareDocumentPosition(D.createElement("div"))}),r(function(e){return e.innerHTML="","#"===e.firstChild.getAttribute("href")})||o("type|href|height|width",function(e,t,n){return n?void 0:e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),w.attributes&&r(function(e){return e.innerHTML="",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||o("value",function(e,t,n){return n||"input"!==e.nodeName.toLowerCase()?void 0:e.defaultValue}),r(function(e){return null==e.getAttribute("disabled")})||o(te,function(e,t,n){var i;return n?void 0:e[t]===!0?t.toLowerCase():(i=e.getAttributeNode(t))&&i.specified?i.value:null}),t}(e);pe.find=ye,pe.expr=ye.selectors,pe.expr[":"]=pe.expr.pseudos,pe.uniqueSort=pe.unique=ye.uniqueSort,pe.text=ye.getText,pe.isXMLDoc=ye.isXML,pe.contains=ye.contains;var be=function(e,t,n){for(var i=[],r=void 0!==n;(e=e[t])&&9!==e.nodeType;)if(1===e.nodeType){if(r&&pe(e).is(n))break;i.push(e)}return i},xe=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},we=pe.expr.match.needsContext,Ce=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,Te=/^.[^:#\[\.,]*$/;pe.filter=function(e,t,n){var i=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===i.nodeType?pe.find.matchesSelector(i,e)?[i]:[]:pe.find.matches(e,pe.grep(t,function(e){return 1===e.nodeType}))},pe.fn.extend({find:function(e){var t,n=[],i=this,r=i.length;if("string"!=typeof e)return this.pushStack(pe(e).filter(function(){for(t=0;r>t;t++)if(pe.contains(i[t],this))return!0}));for(t=0;r>t;t++)pe.find(e,i[t],n);return n=this.pushStack(r>1?pe.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},filter:function(e){return this.pushStack(i(this,e||[],!1))},not:function(e){return this.pushStack(i(this,e||[],!0))},is:function(e){return!!i(this,"string"==typeof e&&we.test(e)?pe(e):e||[],!1).length}});var ke,Ee=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,Se=pe.fn.init=function(e,t,n){var i,r;if(!e)return this;if(n=n||ke,"string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:Ee.exec(e),!i||!i[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(i[1]){if(t=t instanceof pe?t[0]:t,pe.merge(this,pe.parseHTML(i[1],t&&t.nodeType?t.ownerDocument||t:ie,!0)),Ce.test(i[1])&&pe.isPlainObject(t))for(i in t)pe.isFunction(this[i])?this[i](t[i]):this.attr(i,t[i]);return this}if(r=ie.getElementById(i[2]),r&&r.parentNode){if(r.id!==i[2])return ke.find(e);this.length=1,this[0]=r}return this.context=ie,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):pe.isFunction(e)?"undefined"!=typeof n.ready?n.ready(e):e(pe):(void 0!==e.selector&&(this.selector=e.selector,this.context=e.context),pe.makeArray(e,this))};Se.prototype=pe.fn,ke=pe(ie);var Ne=/^(?:parents|prev(?:Until|All))/,Le={children:!0,contents:!0,next:!0,prev:!0};pe.fn.extend({has:function(e){var t,n=pe(e,this),i=n.length;return this.filter(function(){for(t=0;i>t;t++)if(pe.contains(this,n[t]))return!0})},closest:function(e,t){for(var n,i=0,r=this.length,o=[],a=we.test(e)||"string"!=typeof e?pe(e,t||this.context):0;r>i;i++)for(n=this[i];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?a.index(n)>-1:1===n.nodeType&&pe.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(o.length>1?pe.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?pe.inArray(this[0],pe(e)):pe.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(pe.uniqueSort(pe.merge(this.get(),pe(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),pe.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return be(e,"parentNode")},parentsUntil:function(e,t,n){return be(e,"parentNode",n)},next:function(e){return r(e,"nextSibling")},prev:function(e){return r(e,"previousSibling")},nextAll:function(e){return be(e,"nextSibling")},prevAll:function(e){return be(e,"previousSibling")},nextUntil:function(e,t,n){return be(e,"nextSibling",n)},prevUntil:function(e,t,n){return be(e,"previousSibling",n)},siblings:function(e){return xe((e.parentNode||{}).firstChild,e)},children:function(e){return xe(e.firstChild)},contents:function(e){return pe.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:pe.merge([],e.childNodes)}},function(e,t){pe.fn[e]=function(n,i){var r=pe.map(this,t,n);return"Until"!==e.slice(-5)&&(i=n),i&&"string"==typeof i&&(r=pe.filter(i,r)),this.length>1&&(Le[e]||(r=pe.uniqueSort(r)),Ne.test(e)&&(r=r.reverse())),this.pushStack(r)}});var Ae=/\S+/g;pe.Callbacks=function(e){e="string"==typeof e?o(e):pe.extend({},e);var t,n,i,r,a=[],s=[],l=-1,u=function(){for(r=e.once,i=t=!0;s.length;l=-1)for(n=s.shift();++l-1;)a.splice(n,1),l>=n&&l--}),this},has:function(e){return e?pe.inArray(e,a)>-1:a.length>0},empty:function(){return a&&(a=[]),this},disable:function(){return r=s=[],a=n="",this},disabled:function(){return!a},lock:function(){return r=!0,n||c.disable(),this},locked:function(){return!!r},fireWith:function(e,n){return r||(n=n||[],n=[e,n.slice?n.slice():n],s.push(n),t||u()),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!i}};return c},pe.extend({Deferred:function(e){var t=[["resolve","done",pe.Callbacks("once memory"),"resolved"],["reject","fail",pe.Callbacks("once memory"),"rejected"],["notify","progress",pe.Callbacks("memory")]],n="pending",i={state:function(){return n},always:function(){return r.done(arguments).fail(arguments),this},then:function(){var e=arguments;return pe.Deferred(function(n){pe.each(t,function(t,o){var a=pe.isFunction(e[t])&&e[t];r[o[1]](function(){var e=a&&a.apply(this,arguments);e&&pe.isFunction(e.promise)?e.promise().progress(n.notify).done(n.resolve).fail(n.reject):n[o[0]+"With"](this===i?n.promise():this,a?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?pe.extend(e,i):i}},r={};return i.pipe=i.then,pe.each(t,function(e,o){var a=o[2],s=o[3];i[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),r[o[0]]=function(){return r[o[0]+"With"](this===r?i:this,arguments),this},r[o[0]+"With"]=a.fireWith}),i.promise(r),e&&e.call(r,r),r},when:function(e){var t,n,i,r=0,o=re.call(arguments),a=o.length,s=1!==a||e&&pe.isFunction(e.promise)?a:0,l=1===s?e:pe.Deferred(),u=function(e,n,i){return function(r){n[e]=this,i[e]=arguments.length>1?re.call(arguments):r,i===t?l.notifyWith(n,i):--s||l.resolveWith(n,i)}};if(a>1)for(t=new Array(a),n=new Array(a),i=new Array(a);a>r;r++)o[r]&&pe.isFunction(o[r].promise)?o[r].promise().progress(u(r,n,t)).done(u(r,i,o)).fail(l.reject):--s;return s||l.resolveWith(i,o),l.promise()}});var je;pe.fn.ready=function(e){return pe.ready.promise().done(e),this},pe.extend({isReady:!1,readyWait:1,holdReady:function(e){e?pe.readyWait++:pe.ready(!0)},ready:function(e){(e===!0?--pe.readyWait:pe.isReady)||(pe.isReady=!0,e!==!0&&--pe.readyWait>0||(je.resolveWith(ie,[pe]),pe.fn.triggerHandler&&(pe(ie).triggerHandler("ready"),pe(ie).off("ready"))))}}),pe.ready.promise=function(t){if(!je)if(je=pe.Deferred(),"complete"===ie.readyState||"loading"!==ie.readyState&&!ie.documentElement.doScroll)e.setTimeout(pe.ready);else if(ie.addEventListener)ie.addEventListener("DOMContentLoaded",s),e.addEventListener("load",s);else{ie.attachEvent("onreadystatechange",s),e.attachEvent("onload",s);var n=!1;try{n=null==e.frameElement&&ie.documentElement}catch(e){}n&&n.doScroll&&!function t(){if(!pe.isReady){try{n.doScroll("left")}catch(n){return e.setTimeout(t,50)}a(),pe.ready()}}()}return je.promise(t)},pe.ready.promise();var _e;for(_e in pe(de))break;de.ownFirst="0"===_e,de.inlineBlockNeedsLayout=!1,pe(function(){var e,t,n,i;n=ie.getElementsByTagName("body")[0],n&&n.style&&(t=ie.createElement("div"),i=ie.createElement("div"),i.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",n.appendChild(i).appendChild(t),"undefined"!=typeof t.style.zoom&&(t.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",de.inlineBlockNeedsLayout=e=3===t.offsetWidth,e&&(n.style.zoom=1)),n.removeChild(i))}),function(){var e=ie.createElement("div");de.deleteExpando=!0;try{delete e.test}catch(e){de.deleteExpando=!1}e=null}();var De=function(e){var t=pe.noData[(e.nodeName+" ").toLowerCase()],n=+e.nodeType||1;return(1===n||9===n)&&(!t||t!==!0&&e.getAttribute("classid")===t)},Ie=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,He=/([A-Z])/g;pe.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?pe.cache[e[pe.expando]]:e[pe.expando],!!e&&!u(e)},data:function(e,t,n){return c(e,t,n)},removeData:function(e,t){return d(e,t)},_data:function(e,t,n){return c(e,t,n,!0)},_removeData:function(e,t){return d(e,t,!0)}}),pe.fn.extend({data:function(e,t){var n,i,r,o=this[0],a=o&&o.attributes;if(void 0===e){if(this.length&&(r=pe.data(o),1===o.nodeType&&!pe._data(o,"parsedAttrs"))){for(n=a.length;n--;)a[n]&&(i=a[n].name,0===i.indexOf("data-")&&(i=pe.camelCase(i.slice(5)),l(o,i,r[i])));pe._data(o,"parsedAttrs",!0)}return r}return"object"==typeof e?this.each(function(){pe.data(this,e)}):arguments.length>1?this.each(function(){pe.data(this,e,t)}):o?l(o,e,pe.data(o,e)):void 0},removeData:function(e){return this.each(function(){pe.removeData(this,e)})}}),pe.extend({queue:function(e,t,n){var i;return e?(t=(t||"fx")+"queue",i=pe._data(e,t),n&&(!i||pe.isArray(n)?i=pe._data(e,t,pe.makeArray(n)):i.push(n)),i||[]):void 0},dequeue:function(e,t){t=t||"fx";var n=pe.queue(e,t),i=n.length,r=n.shift(),o=pe._queueHooks(e,t),a=function(){pe.dequeue(e,t)};"inprogress"===r&&(r=n.shift(),i--),r&&("fx"===t&&n.unshift("inprogress"),delete o.stop,r.call(e,a,o)),!i&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return pe._data(e,n)||pe._data(e,n,{empty:pe.Callbacks("once memory").add(function(){pe._removeData(e,t+"queue"),pe._removeData(e,n)})})}}),pe.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),arguments.lengths;s++)t(e[s],n,a?i:i.call(e[s],s,t(e[s],n)));return r?e:u?t.call(e):l?t(e[0],n):o},qe=/^(?:checkbox|radio)$/i,$e=/<([\w:-]+)/,ze=/^$|\/(?:java|ecma)script/i,Re=/^\s+/,We="abbr|article|aside|audio|bdi|canvas|data|datalist|details|dialog|figcaption|figure|footer|header|hgroup|main|mark|meter|nav|output|picture|progress|section|summary|template|time|video";!function(){var e=ie.createElement("div"),t=ie.createDocumentFragment(),n=ie.createElement("input");e.innerHTML="
- 
'):i.attr(r[1],n)}}else t.find(g+"-"+e).html(n)})},_getScrollbarSize:function(){if(void 0===t.scrollbarSize){var e=document.createElement("div");e.id="mfp-sbm",e.style.cssText="width: 99px; height: 99px; overflow: scroll; position: absolute; top: -9999px;",document.body.appendChild(e),t.scrollbarSize=e.offsetWidth-e.clientWidth,document.body.removeChild(e)}return t.scrollbarSize}},e.magnificPopup={instance:null,proto:x.prototype,modules:[],open:function(t,n){return N(),t=t?e.extend(!0,{},t):{},t.isObj=!0,t.index=n||0,this.instance.open(t)},close:function(){return e.magnificPopup.instance&&e.magnificPopup.instance.close()},registerModule:function(t,n){n.options&&(e.magnificPopup.defaults[t]=n.options),e.extend(this.proto,n.proto),this.modules.push(t)},defaults:{disableOn:0,key:null,midClick:!1,mainClass:"",preloader:!0,focus:"",closeOnContentClick:!1,closeOnBgClick:!0,closeBtnInside:!0,showCloseBtn:!0,enableEscapeKey:!0,modal:!1,alignTop:!1,removalDelay:0,prependTo:null,fixedContentPos:"auto",fixedBgPos:"auto",overflowY:"auto",closeMarkup:'',tClose:"Close (Esc)",tLoading:"Loading..."}},e.fn.magnificPopup=function(n){N();var i=e(this);if("string"==typeof n)if("open"===n){var r,o=w?i.data("magnificPopup"):i[0].magnificPopup,a=parseInt(arguments[1],10)||0;o.items?r=o.items[a]:(r=i,o.delegate&&(r=r.find(o.delegate)),r=r.eq(a)),t._openClick({mfpEl:r},i,o)}else t.isOpen&&t[n].apply(t,Array.prototype.slice.call(arguments,1));else n=e.extend(!0,{},n),w?i.data("magnificPopup",n):i[0].magnificPopup=n,t.addGroup(i,n);return i};var A,j,_,D="inline",I=function(){_&&(j.after(_.addClass(A)).detach(),_=null)};e.magnificPopup.registerModule(D,{options:{hiddenClass:"hide",markup:"",tNotFound:"Content not found"},proto:{initInline:function(){t.types.push(D),T(l+"."+D,function(){I()})},getInline:function(n,i){if(I(),n.src){var r=t.st.inline,o=e(n.src);if(o.length){var a=o[0].parentNode;a&&a.tagName&&(j||(A=r.hiddenClass,j=k(A),A="mfp-"+A),_=o.after(j).detach().removeClass(A)),t.updateStatus("ready")}else t.updateStatus("error",r.tNotFound),o=e("