diff options
42 files changed, 361 insertions, 376 deletions
diff --git a/sass/_plugin.scss b/sass/_plugin.scss deleted file mode 100644 index 746ffd0..0000000 --- a/sass/_plugin.scss +++ /dev/null @@ -1 +0,0 @@ -@import "plugin/fancybox";
\ No newline at end of file diff --git a/sass/_plugins.scss b/sass/_plugins.scss new file mode 100644 index 0000000..cf82d1c --- /dev/null +++ b/sass/_plugins.scss @@ -0,0 +1 @@ +@import "plugins/fancybox";
\ No newline at end of file diff --git a/sass/base/_color.scss b/sass/base/_color.scss index 7dbee46..ec6ed3b 100644 --- a/sass/base/_color.scss +++ b/sass/base/_color.scss @@ -1,7 +1,7 @@ -$background: #eee; -$main: #258fb8; -$gray01: #666; -$gray02: #999; -$gray03: #ccc; -$gray04: #ddd; -$gray05: #fff;
\ No newline at end of file +$color-background: #eee; +$color-main: #258fb8; +$color-gray01: #666; +$color-gray02: #999; +$color-gray03: #ccc; +$color-gray04: #ddd; +$color-gray05: #fff;
\ No newline at end of file diff --git a/sass/base/_font.scss b/sass/base/_font.scss index 7f61fb6..ac8b2ae 100644 --- a/sass/base/_font.scss +++ b/sass/base/_font.scss @@ -1,4 +1,2 @@ -$default: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; -$monospace: Menlo, Monaco, "Andale Mono", "lucida console", "Courier New", monospace; - -$meta-size: 0.9em;
\ No newline at end of file +$font-default: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, sans-serif; +$font-mono: Menlo, Monaco, "Andale Mono", "lucida console", "Courier New", monospace;
\ No newline at end of file diff --git a/sass/base/_layout.scss b/sass/base/_layout.scss index b50dcbb..22e5804 100644 --- a/sass/base/_layout.scss +++ b/sass/base/_layout.scss @@ -5,11 +5,11 @@ $max-width: 1000px; padding: 0; } body{ - font-family: $default; + font-family: $font-default; font-weight: 300; font-size: 14px; - background: $background; - color: $gray01; + background: $color-background; + color: $color-gray01; @media screen and (max-width: 1040px){ margin: 0 20px; } @@ -29,15 +29,15 @@ h3{ a{ text-decoration: none; outline-width: 0; - color: $main; + color: $color-main; } -.left{ +.alignleft{ float: left; } -.right{ +.alignright{ float: right; } -.clear{ +.clearfix{ @include pie-clearfix; } .inner{ diff --git a/sass/base/_utilities.scss b/sass/base/_utilities.scss index 1a3ed2f..63aae7a 100644 --- a/sass/base/_utilities.scss +++ b/sass/base/_utilities.scss @@ -9,7 +9,7 @@ -o-user-select: $select; user-select: $select; } -@mixin border-shadow($top: $gray05, $bottom: $gray04){ +@mixin border-shadow($top: $color-gray05, $bottom: $color-gray04){ border-top: 1px solid $top; border-bottom: 1px solid $bottom; } diff --git a/sass/parts/_archive.scss b/sass/parts/_archive.scss index 6b5ee75..1a2009c 100644 --- a/sass/parts/_archive.scss +++ b/sass/parts/_archive.scss @@ -1,24 +1,15 @@ -section.archive{ +.archives{ position: relative; - &:first-of-type{ - border-top: 1px solid $gray05; - article.archive{ - border-top: none; - } - h1.archive-title{ - border-top: none; - &:before{ - border-top: none; - } - } - } &:last-of-type{ - border-bottom: 1px solid $gray04; - article.archive{ - border-bottom: none; + &:before{ + content: ""; + position: absolute; + bottom: 0; + width: 200px; + border-top: 1px solid $color-gray04; } } - h1.archive-title{ + .year{ line-height: 35px; width: 200px; position: absolute; @@ -30,30 +21,27 @@ section.archive{ position: absolute; top: -2px; width: 100%; - border-top: 1px solid $gray04; + border-top: 1px solid $color-gray04; } @media screen and (max-width: 600px){ position: relative; width: 100%; - & + article.archive{ - border-top: none; - h1{ - padding-top: 15px; - } - } } } - article.archive{ + article{ margin-left: 200px; @media screen and (max-width: 600px){ margin-left: 0; - padding: 15px 0; + &:first-of-type{ + border-top: none; + padding-top: 30px; + } } - h1{ + .title{ margin-bottom: 0; } .meta{ - color: $gray02; + color: $color-gray02; line-height: 2; margin-top: 15px; @media screen and (max-width: 600px){ @@ -65,10 +53,10 @@ section.archive{ @include inline-block; } a{ - color: $gray02; + color: $color-gray02; @include transition(0.3s); &:hover{ - color: $gray01; + color: $color-gray01; } } .date{ diff --git a/sass/parts/_article.scss b/sass/parts/_article.scss index ba14807..91f6273 100644 --- a/sass/parts/_article.scss +++ b/sass/parts/_article.scss @@ -1,6 +1,6 @@ article{ - border-bottom: 1px solid $gray04; - border-top: 1px solid $gray05; + border-bottom: 1px solid $color-gray04; + border-top: 1px solid $color-gray05; padding: 30px 0; position: relative; @media screen and (max-width: 800px){ @@ -14,10 +14,10 @@ article{ line-height: 35px; margin-bottom: 20px; a{ - color: $gray01; + color: $color-gray01; } } - .entry{ + .entry-content{ line-height: 2; text-align: justify; a{ @@ -51,13 +51,13 @@ article{ } h2{ font-weight: 300; - border-bottom: 1px solid $gray04; + border-bottom: 1px solid $color-gray04; position: relative; &:before{ content: ""; position: absolute; bottom: -2px; - border-bottom: 1px solid $gray05; + border-bottom: 1px solid $color-gray05; width: 100%; } } @@ -66,8 +66,8 @@ article{ height: auto; } blockquote{ - background: $gray04; - border-left: 5px solid $gray03; + background: $color-gray04; + border-left: 5px solid $color-gray03; padding: 15px 20px; margin-top: 10px; & > p:first-of-type{ @@ -78,12 +78,12 @@ article{ border: none; } table{ - background: $gray04; - border: 1px solid $gray03; + background: $color-gray04; + border: 1px solid $color-gray03; border-spacing: 0; margin-top: 10px; th{ - background: $gray03; + background: $color-gray03; padding: 0 15px; } td{ @@ -98,8 +98,8 @@ article{ .caption{ background: image-url('caption.png') 0 4px no-repeat; display: block; - font-size: $meta-size; - color: $gray02; + font-size: 0.9em; + color: $color-gray02; padding-left: 25px; } .video-container{ @@ -114,6 +114,7 @@ article{ left: 0; width: 100%; height: 100%; + margin-top: 0; } } } diff --git a/sass/parts/_footer.scss b/sass/parts/_footer.scss index 74f5e41..6d47846 100644 --- a/sass/parts/_footer.scss +++ b/sass/parts/_footer.scss @@ -1,6 +1,6 @@ footer{ padding: 15px 0; - border-top: 1px solid $gray05; + border-top: 1px solid $color-gray05; text-align: center; - font-size: $meta-size; + font-size: 0.9em; }
\ No newline at end of file diff --git a/sass/parts/_header.scss b/sass/parts/_header.scss index b22b1e0..41cd977 100644 --- a/sass/parts/_header.scss +++ b/sass/parts/_header.scss @@ -1,38 +1,42 @@ -header{ - height: 30px; +$header-height: 30px; + +#header{ + height: $header-height; padding: 30px 0; - border-bottom: 1px solid $gray04; - line-height: 30px; + border-bottom: 1px solid $color-gray04; + line-height: $header-height; @media screen and (max-width: 1040px){ height: auto; position: relative; padding-bottom: 10px; - >.right{ + >.alignright{ position: absolute; top: 30px; right: 0; } } a{ - color: $gray01; - @include transition(0.3s); + color: $color-gray01; + @include transition(color 0.3s); &:hover{ - color: $main; + color: $color-main; } } h1{ + float: left; font-weight: 300; font-size: 30px; @media screen and (max-width: 1040px){ - float: none !important; + float: none; } } - nav{ + .menu{ + float: left; margin-left: 30px; @media screen and (max-width: 1040px){ + float: none; margin-left: 0; margin-top: 15px; - float: none !important; } >ul{ @media screen and (max-width: 600px){ @@ -50,7 +54,7 @@ header{ } &:hover{ >a{ - color: $main; + color: $color-main; } } >a{ @@ -59,7 +63,6 @@ header{ background: image-url('detail.png') right center no-repeat; @media screen and (max-width: 1040px){ padding: 18px 30px 18px 0; - /* Todo */ &:only-child{ padding-right: 0; } @@ -76,8 +79,8 @@ header{ left: -15px; z-index: 10; white-space: nowrap; - background: $gray04; - border: 1px solid $gray03; + background: $color-gray04; + border: 1px solid $color-gray03; list-style: none; display: none; @media screen and (max-width: 1040px){ @@ -89,7 +92,7 @@ header{ @include border-radius(0 5px 5px 5px); } li{ - @include border-shadow($background, $gray03); + @include border-shadow($color-background, $color-gray03); &:hover{ background: #d5d5d5; } @@ -107,7 +110,7 @@ header{ display: block; padding: 5px 30px 5px 15px; &:hover{ - color: $gray01; + color: $color-gray01; } &:only-child{ background: none; @@ -138,32 +141,42 @@ header{ } } .search{ + float: left; + margin-top: 1px; + @media screen and (max-width: 1040px){ + float: none; + margin-top: 15px; + } + @media screen and (max-width: 600px){ + margin-top: 40px; + } input[type="text"]{ background: image-url('search.png') 10px center no-repeat #f2f2f2; - color: $gray02; - border: 1px solid $gray04; - font: 13px $default; + color: $color-gray02; + border: 1px solid $color-gray04; + font: 13px $font-default; padding: 6px 15px 6px 35px; width: 100px; @include transition(0.3s); @include border-radius(15px); - @media screen and (max-width: 600px){ - width: 60px; - } &:focus, &:active{ background: image-url('search.png') 10px center no-repeat #fff; - width: 150px; - border-top: 1px solid $gray03; - color: $gray01; + border-top: 1px solid $color-gray03; + color: $color-gray01; outline: none; - @media screen and (max-width: 600px){ - width: 100px; - } } } } .social{ + float: left; margin-right: 15px; + @media screen and (max-width: 1040px){ + float: none; + margin-right: 0; + a:last-of-type{ + margin-right: 0; + } + } @media screen and (max-width: 600px){ display: none; } @@ -179,49 +192,49 @@ header{ opacity: 1; } &.facebook{ - background: image-url('facebook.png') center no-repeat #3B5998; + background: image-url('social/facebook.png') center no-repeat #3B5998; border: 1px solid #3B5998; &:hover{ border: 1px solid darken(#3B5998, 10%); } } &.google{ - background: image-url('google.png') center no-repeat #C83D20; + background: image-url('social/google.png') center no-repeat #C83D20; border: 1px solid #C83D20; &:hover{ border: 1px solid darken(#C83D20, 10%); } } &.twitter{ - background: image-url('twitter.png') center no-repeat #55CFF8; + background: image-url('social/twitter.png') center no-repeat #55CFF8; border: 1px solid #55CFF8; &:hover{ border: 1px solid darken(#55CFF8, 10%); } } &.github{ - background: image-url('github.png') center no-repeat rgb(175,182,202); + background: image-url('social/github.png') center no-repeat rgb(175,182,202); border: 1px solid rgb(175,182,202); &:hover{ border: 1px solid darken(rgb(175,182,202), 10%); } } &.pinterest{ - background: image-url('pinterest.png') center no-repeat rgb(190,64,55); + background: image-url('social/pinterest.png') center no-repeat rgb(190,64,55); border: 1px solid rgb(190,64,55); &:hover{ border: 1px solid darken(rgb(190,64,55), 10%); } } &.delicious{ - background: image-url('delicious.png') center no-repeat rgb(50,113,203); + background: image-url('social/delicious.png') center no-repeat rgb(50,113,203); border: 1px solid rgb(50,113,203); &:hover{ border: 1px solid darken(rgb(50,113,203), 10%); } } &.rss{ - background: image-url('rss.png') center no-repeat #EF7522; + background: image-url('social/rss.png') center no-repeat #EF7522; border: 1px solid #EF7522; &:hover{ border: 1px solid darken(#EF7522, 10%); diff --git a/sass/parts/_post.scss b/sass/parts/_post.scss index de9c78c..fc4bf6d 100644 --- a/sass/parts/_post.scss +++ b/sass/parts/_post.scss @@ -1,5 +1,5 @@ .post{ - h1.title, .entry{ + h1.title, .entry-content{ margin-left: 200px; @media screen and (max-width: 800px){ margin-left: 0; @@ -9,8 +9,8 @@ position: absolute; top: 85px; line-height: 2; - font-size: $meta-size; - color: $gray02; + font-size: 0.9em; + color: $color-gray02; width: 170px; @media screen and (max-width: 800px){ margin-top: 15px; @@ -18,7 +18,7 @@ width: auto; } a{ - @include link-colors($gray02, $gray01); + @include link-colors($color-gray02, $color-gray01); @include transition(0.3s); } .date, .tags, .comments{ diff --git a/sass/parts/_syntax.scss b/sass/parts/_syntax.scss index 8777000..0a95988 100644 --- a/sass/parts/_syntax.scss +++ b/sass/parts/_syntax.scss @@ -38,17 +38,17 @@ $solarized: light !default; $base3: $_base03; } -$pre-bg: $gray04; -$pre-border: $gray03; +$pre-bg: $color-gray04; +$pre-border: $color-gray03; article{ code, pre{ background: $pre-bg; border: 1px solid $pre-border; - font-family: $monospace; + font-family: $font-mono; } code{ - font-size: $meta-size; + font-size: 0.9em; padding: 1px 3px; margin: 0 3px; @include border-radius(5px); @@ -77,7 +77,7 @@ figure.code{ padding: 5px 15px; @include border-radius(5px); figcaption{ - font-size: $meta-size; + font-size: 0.9em; position: relative; span{ margin: -5px -15px 0; @@ -106,7 +106,7 @@ figure.code{ } .line-numbers{ border-right: 1px solid $pre-border; - font-family: $monospace; + font-family: $font-mono; padding-right: 15px; text-align: right; } @@ -124,9 +124,9 @@ figure.code{ overflow-x: auto; } } -.entry .gist{ +.entry-content .gist{ background: $pre-bg; - color: $gray01; + color: $color-gray01; padding: 30px 15px 5px; margin-top: 10px; border: 1px solid $pre-border; @@ -139,18 +139,18 @@ figure.code{ background: none; border: none; pre{ - font: $meta-size $monospace; + font: 0.9em $font-mono; line-height: 1.5; } } .gist-meta{ - font: 300 $meta-size $default; + font: 300 0.9em $font-default; line-height: 1.5; margin: 0 -16px -6px; padding: 5px 15px; @include background(linear-gradient(top, $pre-bg, $pre-border)); a{ - color: $main; + color: $color-main; &:first-of-type{ position: absolute; top: 5px; diff --git a/sass/parts/_twitter.scss b/sass/parts/_twitter.scss index e6a7736..6a8e6a1 100644 --- a/sass/parts/_twitter.scss +++ b/sass/parts/_twitter.scss @@ -1,5 +1,5 @@ #banner{ - color: $gray02; + color: $color-gray02; padding: 30px 0; line-height: 30px; text-align: center; @@ -8,11 +8,11 @@ @include border-shadow(); &:hover{ a{ - color: $main; + color: $color-main; } } a{ - color: $gray02; + color: $color-gray02; @include transition(0.3s); &:hover{ text-decoration: underline; diff --git a/sass/plugin/_fancybox.scss b/sass/plugins/_fancybox.scss index 89dec97..20a9437 100644 --- a/sass/plugin/_fancybox.scss +++ b/sass/plugins/_fancybox.scss @@ -1,4 +1,4 @@ -/*! fancyBox v2.0.4 fancyapps.com | fancyapps.com/fancybox/#license */ +/*! fancyBox v2.0.6 fancyapps.com | fancyapps.com/fancybox/#license */ .fancybox-tmp iframe, .fancybox-tmp object { vertical-align: top; padding: 0; @@ -9,10 +9,11 @@ position: absolute; top: 0; left: 0; - z-index: 1002; + z-index: 8020; } -.fancybox-outer { +.fancybox-skin { + position: relative; padding: 0; margin: 0; background: #f9f9f9; @@ -22,28 +23,33 @@ } .fancybox-opened { - z-index: 1003; + z-index: 8030; } -.fancybox-opened .fancybox-outer { +.fancybox-opened .fancybox-skin { @include box-shadow(0 10px 25px rgba(0, 0, 0, 0.5)); } -.fancybox-inner { - width: 100%; - height: 100%; +.fancybox-outer, .fancybox-inner { padding: 0; margin: 0; position: relative; outline: none; +} + +.fancybox-inner { overflow: hidden; } +.fancybox-type-iframe .fancybox-inner { + -webkit-overflow-scrolling: touch; +} + .fancybox-error { color: #444; - font: 14px/20px "Helvetica Neue",Helvetica,Arial,sans-serif; - margin: 0; - padding: 10px; + font: 14px/20px "Helvetica Neue",Helvetica,Arial,sans-serif; + margin: 0; + padding: 10px; } .fancybox-image, .fancybox-iframe { @@ -61,22 +67,26 @@ max-height: 100%; } +#fancybox-loading, .fancybox-close, .fancybox-prev span, .fancybox-next span { + background-image: image-url('fancybox/fancybox_sprite.png'); +} + #fancybox-loading { position: fixed; top: 50%; left: 50%; - margin-top: -21px; - margin-left: -21px; - width: 42px; - height: 42px; - background: image-url('fancybox/fancybox_loading.gif'); + margin-top: -22px; + margin-left: -22px; + background-position: 0 -108px; opacity: 0.8; cursor: pointer; - z-index: 1010; + z-index: 8020; } -.fancybox-close, .fancybox-prev span, .fancybox-next span { - background-image: image-url('fancybox/fancybox_sprite.png'); +#fancybox-loading div { + width: 44px; + height: 44px; + background: image-url('fancybox/fancybox_loading.gif') center center no-repeat; } .fancybox-close { @@ -86,59 +96,53 @@ width: 36px; height: 36px; cursor: pointer; - z-index: 1004; + z-index: 8040; } -.fancybox-prev, .fancybox-next { +.fancybox-nav { position: absolute; top: 0; width: 40%; height: 100%; cursor: pointer; background: transparent image-url('fancybox/blank.gif'); /* helps IE */ - z-index: 1003; + -webkit-tap-highlight-color: rgba(0,0,0,0); + z-index: 8040; } .fancybox-prev { - left: 0; + left: 0; } .fancybox-next { right: 0; } -.fancybox-prev span, .fancybox-next span { +.fancybox-nav span { position: absolute; top: 50%; - left: -9999px; width: 36px; - height: 36px; + height: 34px; margin-top: -18px; cursor: pointer; - z-index: 1003; + z-index: 8040; + visibility: hidden; } .fancybox-prev span { + left: 20px; background-position: 0 -36px; } .fancybox-next span { + right: 20px; background-position: 0 -72px; } -.fancybox-prev:hover, .fancybox-next:hover { +.fancybox-nav:hover span { visibility: visible; } -.fancybox-prev:hover span { - left: 20px; -} - -.fancybox-next:hover span { - left: auto; - right: 20px; -} - .fancybox-tmp { position: absolute; top: -9999px; @@ -156,18 +160,24 @@ left: 0; overflow: hidden; display: none; - z-index: 1001; + z-index: 8010; background: #000; } +#fancybox-overlay.overlay-fixed { + position: fixed; + bottom: 0; + right: 0; +} + /* Title helper */ .fancybox-title { - visibility: hidden; + visibility: hidden; font: normal 13px/20px "Helvetica Neue",Helvetica,Arial,sans-serif; position: relative; text-shadow: none; - z-index: 1005; + z-index: 8050; } .fancybox-opened .fancybox-title { @@ -179,7 +189,7 @@ bottom: 0; right: 50%; margin-bottom: -35px; - z-index: 1003; + z-index: 8030; text-align: center; } @@ -210,7 +220,7 @@ .fancybox-title-over-wrap { position: absolute; bottom: 0; - left: 0; + left: 0; color: #fff; padding: 10px; background: #000; diff --git a/sass/screen.scss b/sass/screen.scss index ebc9d41..96025e3 100644 --- a/sass/screen.scss +++ b/sass/screen.scss @@ -2,4 +2,4 @@ @import "base"; @import "parts"; -@import "plugin";
\ No newline at end of file +@import "plugins";
\ No newline at end of file diff --git a/source/_includes/after_footer.html b/source/_includes/after_footer.html index b7beed2..09d93b7 100644 --- a/source/_includes/after_footer.html +++ b/source/_includes/after_footer.html @@ -1,4 +1,5 @@ -<script src="{{ root_url }}/javascripts/jquery.fancybox.pack.js"></script> <script src="{{ root_url }}/javascripts/slash.js"></script> +{% include fancybox.html %} <!-- Delete or comment this line to disable Fancybox --> {% include disqus.html %} +{% include google_analytics.html %} {% include custom/after_footer.html %}
\ No newline at end of file diff --git a/source/_includes/archive_post.html b/source/_includes/archive_post.html index 8ceae91..2b006f6 100644 --- a/source/_includes/archive_post.html +++ b/source/_includes/archive_post.html @@ -1,9 +1,19 @@ -{% capture category %}{{ post.categories | size }}{% endcapture %} -<h1 class="title"><a href="{{ root_url }}{{ post.url }}">{{post.title}}</a></h1> -<div class="meta"> - <span class="date">{{ post.date | date: "%b %e" }}</span> - <span class="tags">{% include post/categories.html %}</span> - {% if site.disqus_short_name and post.comments == true %} - <span class="comments"><a href="{{ root_url }}{{ post.url }}#disqus_thread">Comments</a></span> - {% endif %} -</div>
\ No newline at end of file +{% capture date %}{{ post.date }}{% endcapture %} +{% capture this_year %}{{ date | date: "%Y" }}{% endcapture %} +{% unless year == this_year %} + {% assign year = this_year %} + {% unless forloop.first %} + </section> + {% endunless %} + <section class="archives"><h1 class="year">{{ date | date: "%Y" }}</h1> +{% endunless %} +<article> + <h1 class="title"><a href="{{ root_url }}{{ post.url }}">{{post.title}}</a></h1> + <div class="meta"> + <span class="date">{{ date | date: "%b %e" }}</span> + <span class="tags">{% include post/categories.html %}</span> + {% if site.disqus_short_name and post.comments == true and site.disqus_show_comment_count == true %} + <span class="comments"><a href="{{ root_url }}{{ post.url }}#disqus_thread">Comments</a></span> + {% endif %} + </div> +</article>
\ No newline at end of file diff --git a/source/_includes/article.html b/source/_includes/article.html index a766bb7..1e1c835 100644 --- a/source/_includes/article.html +++ b/source/_includes/article.html @@ -1,25 +1,19 @@ {% if index %} - <h1 class="title"><a href="{{ root_url }}{{ post.url }}">{% if site.titlecase %}{{ post.title | titlecase }}{% else %}{{ post.title }}{% endif %}</a></h1> - <div class="entry"> - {{ content | excerpt }} - {% capture excerpted %}{{ content | has_excerpt }}{% endcapture %} - {% if excerpted == 'true' %}<a href="{{ root_url }}{{ post.url }}" class="more-link">{{ site.excerpt_link }}</a>{% endif %} - </div> - <div class="meta"> - <div class="date">{% include post/date.html %}{{ time }}</div> - <div class="tags">{% include post/categories.html %}</div> - {% if site.disqus_short_name and post.comments == true and site.disqus_show_comment_count == true %} - <span class="comments"><a href="{{ root_url }}{{ post.url }}#disqus_thread">Comments</a></span> - {% endif %} - </div> + <h1 class="title"><a href="{{ root_url }}{{ post.url }}">{% if site.titlecase %}{{ post.title | titlecase }}{% else %}{{ post.title }}{% endif %}</a></h1> + <div class="entry-content"> + {{ content | excerpt }} + {% capture excerpted %}{{ content | has_excerpt }}{% endcapture %} + {% if excerpted == 'true' %}<a href="{{ root_url }}{{ post.url }}" class="more-link">{{ site.excerpt_link }}</a>{% endif %} + </div> {% else %} - <h1 class="title">{% if site.titlecase %}{{ page.title | titlecase }}{% else %}{{ page.title }}{% endif %}</h1> - <div class="entry">{{ content }}</div> - <div class="meta"> - <div class="date">{% include post/date.html %}{{ time }}</div> - <div class="tags">{% include post/categories.html %}</div> - {% if site.disqus_short_name and page.comments == true and site.disqus_show_comment_count == true %} - <span class="comments"><a href="{{ root_url }}{{ post.url }}#disqus_thread">Comments</a></span> - {% endif %} - </div> -{% endif %}
\ No newline at end of file + <h1 class="title">{% if site.titlecase %}{{ page.title | titlecase }}{% else %}{{ page.title }}{% endif %}</h1> + <div class="entry-content">{{ content }}</div> +{% endif %} + +<div class="meta"> + <div class="date">{% include post/date.html %}{{ time }}</div> + <div class="tags">{% include post/categories.html %}</div> + {% if site.disqus_short_name and site.disqus_show_comment_count == true %} + <span class="comments"><a href="{{ root_url }}{{ post.url }}{{ page.url }}#disqus_thread">Comments</a></span> + {% endif %} +</div>
\ No newline at end of file diff --git a/source/_includes/fancybox.html b/source/_includes/fancybox.html new file mode 100644 index 0000000..fd5bcfd --- /dev/null +++ b/source/_includes/fancybox.html @@ -0,0 +1,6 @@ +<script src="{{ root_url }}/javascripts/jquery.fancybox.pack.js"></script> +<script type="text/javascript"> +(function($){ + $('.fancybox').fancybox(); +})(jQuery); +</script>
\ No newline at end of file diff --git a/source/_includes/google_analytics.html b/source/_includes/google_analytics.html index 4d4d596..2950c76 100644 --- a/source/_includes/google_analytics.html +++ b/source/_includes/google_analytics.html @@ -1,13 +1,13 @@ {% if site.google_analytics_tracking_id %} - <script type="text/javascript"> - var _gaq = _gaq || []; - _gaq.push(['_setAccount', '{{ site.google_analytics_tracking_id }}']); - _gaq.push(['_trackPageview']); + <script type="text/javascript"> + var _gaq = _gaq || []; + _gaq.push(['_setAccount', '{{ site.google_analytics_tracking_id }}']); + _gaq.push(['_trackPageview']); - (function() { - var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; - ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; - var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); - })(); - </script> + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + </script> {% endif %} diff --git a/source/_includes/head.html b/source/_includes/head.html index f24ddca..29d99b5 100644 --- a/source/_includes/head.html +++ b/source/_includes/head.html @@ -1,21 +1,20 @@ <!DOCTYPE HTML> <html> <head> - <meta charset="utf-8"> - <title>{% if page.title %}{{ page.title }} - {% endif %}{{ site.title }}</title> - <meta name="author" content="{{ site.author }}"> + <meta charset="utf-8"> + <title>{% if page.title %}{{ page.title }} - {% endif %}{{ site.title }}</title> + <meta name="author" content="{{ site.author }}"> - {% capture description %}{% if page.description %}{{ page.description }}{% else %}{{ content | raw_content }}{% endif %}{% endcapture %} - <meta name="description" content="{{ description | strip_html | condense_spaces | truncate:150 }}"> - {% if page.keywords %}<meta name="keywords" content="{{ page.keywords }}">{% endif %} - <meta name="viewport" content="width=device-width; initial-scale=1; maximum-scale=1"> + {% capture description %}{% if page.description %}{{ page.description }}{% else %}{{ content | raw_content }}{% endif %}{% endcapture %} + <meta name="description" content="{{ description | strip_html | condense_spaces | truncate:150 }}"> + {% if page.keywords %}<meta name="keywords" content="{{ page.keywords }}">{% endif %} + <meta name="viewport" content="width=device-width; initial-scale=1; maximum-scale=1"> - <link href="{{ site.subscribe_rss }}" rel="alternate" title="{{site.title}}" type="application/atom+xml"> - <link rel="canonical" href="{{ canonical }}"> - <link href="{{ root_url }}/favicon.png" rel="shortcut icon"> - <link href="{{ root_url }}/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css"> - <!--[if lt IE 9]><script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]--> - <script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script> - {% include custom/head.html %} - {% include google_analytics.html %} + <link href="{{ site.subscribe_rss }}" rel="alternate" title="{{site.title}}" type="application/atom+xml"> + <link rel="canonical" href="{{ canonical }}"> + <link href="{{ root_url }}/favicon.png" rel="shortcut icon"> + <link href="{{ root_url }}/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css"> + <!--[if lt IE 9]><script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]--> + <script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script> + {% include custom/head.html %} </head>
\ No newline at end of file diff --git a/source/_includes/header.html b/source/_includes/header.html index 168853d..fa076d1 100644 --- a/source/_includes/header.html +++ b/source/_includes/header.html @@ -1,11 +1,7 @@ -<h1 class="left"><a href="{{ root_url }}/">{{ site.title }}</a></h1> -<nav class="menu left">{% include navigation.html %}</nav> -<div class="right"> - <form class="search right" action="{{ site.simple_search }}" method="get"> - <input class="left" type="text" name="q" results="0"> - <input type="hidden" name="q" value="site:{{ site.url | shorthand_url }}"> - </form> - <div class="social right"> +<h1><a href="{{ root_url }}/">{{ site.title }}</a></h1> +<nav class="menu">{% include navigation.html %}</nav> +<div class="alignright"> + <div class="social"> {% if site.facebook_user %} <a class="facebook" href="http://www.facebook.com/{{ site.facebook_user }}" title="Facebook">Facebook</a> {% endif %} @@ -28,5 +24,9 @@ <a class="rss" href="{{ site.subscribe_rss }}" title="RSS">RSS</a> {% endif %} </div> + <form class="search" action="{{ site.simple_search }}" method="get"> + <input class="alignright" type="text" name="q" results="0"> + <input type="hidden" name="q" value="site:{{ site.url | shorthand_url }}"> + </form> </div> {% include custom/header.html %} diff --git a/source/_includes/post/categories.html b/source/_includes/post/categories.html index 2ec7896..8c1c81f 100644 --- a/source/_includes/post/categories.html +++ b/source/_includes/post/categories.html @@ -1,10 +1,8 @@ {% capture category %}{% if post %}{{ post.categories | category_links | size }}{% else %}{{ page.categories | category_links | size }}{% endif %}{% endcapture %} {% unless category == '0' %} -<div class="cat"> - {% if post %} - {{ post.categories | category_links }} - {% else %} - {{ page.categories | category_links }} - {% endif %} -</div> +{% if post %} + {{ post.categories | category_links }} +{% else %} + {{ page.categories | category_links }} +{% endif %} {% endunless %} diff --git a/source/_layouts/category_index.html b/source/_layouts/category_index.html index 7e64ebe..0c16ef3 100644 --- a/source/_layouts/category_index.html +++ b/source/_layouts/category_index.html @@ -2,15 +2,6 @@ layout: default --- -{% for post in site.categories[page.category] %} -<section class="archive"> - {% capture this_year %}{{ post.date | date: "%Y" }}{% endcapture %} - {% unless year == this_year %} - {% assign year = this_year %} - <h1 class="archive-title">{{ year }}</h1> - {% endunless %} - <article class="archive"> - {% include archive_post.html %} - </article> -</section> -{% endfor %} +{% for post in site.posts reverse %} + {% include archive_post.html %} +{% endfor %}
\ No newline at end of file diff --git a/source/_layouts/default.html b/source/_layouts/default.html index ad02643..70d04d1 100644 --- a/source/_layouts/default.html +++ b/source/_layouts/default.html @@ -2,10 +2,10 @@ {% include head.html %} <body> - <header class="inner">{% include header.html %}</header> + <header id="header" class="inner">{% include header.html %}</header> {% include banner.html %} <div id="content" class="inner">{{ content | expand_urls: root_url }}</div> - <footer class="inner">{% include footer.html %}</footer> + <footer id="footer" class="inner">{% include footer.html %}</footer> {% include after_footer.html %} </body> </html>
\ No newline at end of file diff --git a/source/blog/archives/index.html b/source/blog/archives/index.html index 8c58fea..e4bc23c 100644 --- a/source/blog/archives/index.html +++ b/source/blog/archives/index.html @@ -4,14 +4,5 @@ title: Blog Archives --- {% for post in site.posts reverse %} -<section class="archive"> - {% capture this_year %}{{ post.date | date: "%Y" }}{% endcapture %} - {% unless year == this_year %} - {% assign year = this_year %} - <h1 class="archive-title">{{ year }}</h1> - {% endunless %} - <article class="archive"> - {% include archive_post.html %} - </article> -</section> + {% include archive_post.html %} {% endfor %}
\ No newline at end of file diff --git a/source/images/fancybox/fancybox_loading.gif b/source/images/fancybox/fancybox_loading.gif Binary files differindex 641a269..0158617 100644 --- a/source/images/fancybox/fancybox_loading.gif +++ b/source/images/fancybox/fancybox_loading.gif diff --git a/source/images/fancybox/fancybox_sprite.png b/source/images/fancybox/fancybox_sprite.png Binary files differindex ae59713..a1aae1a 100644 --- a/source/images/fancybox/fancybox_sprite.png +++ b/source/images/fancybox/fancybox_sprite.png diff --git a/source/images/pintrest.png b/source/images/pintrest.png Binary files differdeleted file mode 100644 index 34a64d6..0000000 --- a/source/images/pintrest.png +++ /dev/null diff --git a/source/images/delicious.png b/source/images/social/delicious.png Binary files differindex a936776..a936776 100644 --- a/source/images/delicious.png +++ b/source/images/social/delicious.png diff --git a/source/images/facebook.png b/source/images/social/facebook.png Binary files differindex 2e43bd8..2e43bd8 100644 --- a/source/images/facebook.png +++ b/source/images/social/facebook.png diff --git a/source/images/github.png b/source/images/social/github.png Binary files differindex 6962c9d..6962c9d 100644 --- a/source/images/github.png +++ b/source/images/social/github.png diff --git a/source/images/google.png b/source/images/social/google.png Binary files differindex 68f6978..68f6978 100644 --- a/source/images/google.png +++ b/source/images/social/google.png diff --git a/source/images/pinterest.png b/source/images/social/pinterest.png Binary files differindex 34a64d6..34a64d6 100644 --- a/source/images/pinterest.png +++ b/source/images/social/pinterest.png diff --git a/source/images/rss.png b/source/images/social/rss.png Binary files differindex 8492267..8492267 100644 --- a/source/images/rss.png +++ b/source/images/social/rss.png diff --git a/source/images/twitter.png b/source/images/social/twitter.png Binary files differindex 1d63f2d..1d63f2d 100644 --- a/source/images/twitter.png +++ b/source/images/social/twitter.png diff --git a/source/index.html b/source/index.html index 95c6a20..8e29816 100644 --- a/source/index.html +++ b/source/index.html @@ -14,5 +14,5 @@ layout: default {% if paginator.next_page %} <a href="{{paginator.next_page}}" class="next">Next</a> {% endif %} - <a href="{{ root_url }}/blog/archives" class="center">Blog Archives</a> + <div class="center"><a href="{{ root_url }}/blog/archives">Blog Archives</a></div> </nav>
\ No newline at end of file diff --git a/source/javascripts/caption.js b/source/javascripts/caption.js deleted file mode 100644 index 8dc3856..0000000 --- a/source/javascripts/caption.js +++ /dev/null @@ -1,15 +0,0 @@ -(function($){ - $('.entry').each(function(i){ - var _i = i; - $(this).find('img').each(function(){ - var alt = $(this).attr('alt'); - - if (alt == '' || typeof alt == 'undefined'){ - $(this).wrap('<a href="'+$(this).attr('src')+'" class="fancybox" rel="gallery'+_i+'" />'); - } else { - $(this).after('<span class="caption">'+alt+'</span>').wrap('<a href="'+$(this).attr('src')+'" class="fancybox" title="'+alt+'" rel="gallery'+_i+'" />'); - } - }); - }); - $('.fancybox').fancybox(); -})(jQuery);
\ No newline at end of file diff --git a/source/javascripts/external.js b/source/javascripts/external.js deleted file mode 100644 index 2501d9b..0000000 --- a/source/javascripts/external.js +++ /dev/null @@ -1,13 +0,0 @@ -(function($){ - var host = location.host; - - $('a').on('click', function(e){ - var href = $(this).attr('href'), - link = href.replace(/(https?:\/\/)(.*)\/(.*)/, '$2'); - - if (href.match('https?') && link != host){ - window.open(href); - e.preventDefault(); - } - }); -})(jQuery);
\ No newline at end of file diff --git a/source/javascripts/jquery.fancybox.pack.js b/source/javascripts/jquery.fancybox.pack.js index ff34249..6521c21 100644 --- a/source/javascripts/jquery.fancybox.pack.js +++ b/source/javascripts/jquery.fancybox.pack.js @@ -1,32 +1,35 @@ -/*! fancyBox v2.0.4 fancyapps.com | fancyapps.com/fancybox/#license */ -(function(u,q,e){var l=e(u),r=e(q),a=e.fancybox=function(){a.open.apply(this,arguments)},s=!1,t=null;e.extend(a,{version:"2.0.4",defaults:{padding:15,margin:20,width:800,height:600,minWidth:200,minHeight:200,maxWidth:9999,maxHeight:9999,autoSize:!0,fitToView:!0,aspectRatio:!1,topRatio:0.5,fixed:!e.browser.msie||6<e.browser.version||!q.documentElement.hasOwnProperty("ontouchstart"),scrolling:"auto",wrapCSS:"fancybox-default",arrows:!0,closeBtn:!0,closeClick:!1,nextClick:!1,mouseWheel:!0,autoPlay:!1, -playSpeed:3E3,modal:!1,loop:!0,ajax:{},keys:{next:[13,32,34,39,40],prev:[8,33,37,38],close:[27]},tpl:{wrap:'<div class="fancybox-wrap"><div class="fancybox-outer"><div class="fancybox-inner"></div></div></div>',image:'<img class="fancybox-image" src="{href}" alt="" />',iframe:'<iframe class="fancybox-iframe" name="fancybox-frame{rnd}" frameborder="0" hspace="0" '+(e.browser.msie?'allowtransparency="true""':"")+' scrolling="{scrolling}" src="{href}"></iframe>',swf:'<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="100%" height="100%"><param name="wmode" value="transparent" /><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="{href}" /><embed src="{href}" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="100%" height="100%" wmode="transparent"></embed></object>', -error:'<p class="fancybox-error">The requested content cannot be loaded.<br/>Please try again later.</p>',closeBtn:'<div title="Close" class="fancybox-item fancybox-close"></div>',next:'<a title="Next" class="fancybox-item fancybox-next"><span></span></a>',prev:'<a title="Previous" class="fancybox-item fancybox-prev"><span></span></a>'},openEffect:"fade",openSpeed:250,openEasing:"swing",openOpacity:!0,openMethod:"zoomIn",closeEffect:"fade",closeSpeed:250,closeEasing:"swing",closeOpacity:!0,closeMethod:"zoomOut", -nextEffect:"elastic",nextSpeed:300,nextEasing:"swing",nextMethod:"changeIn",prevEffect:"elastic",prevSpeed:300,prevEasing:"swing",prevMethod:"changeOut",helpers:{overlay:{speedIn:0,speedOut:300,opacity:0.8,css:{cursor:"pointer"},closeClick:!0},title:{type:"float"}}},group:{},opts:{},coming:null,current:null,isOpen:!1,isOpened:!1,wrap:null,outer:null,inner:null,player:{timer:null,isActive:!1},ajaxLoad:null,imgPreload:null,transitions:{},helpers:{},open:function(b,c){e.isArray(b)||(b=[b]);if(b.length)a.close(!0), -a.opts=e.extend(!0,{},a.defaults,c),a.group=b,a._start(a.opts.index||0)},cancel:function(){if(!(a.coming&&!1===a.trigger("onCancel"))&&(a.coming=null,a.hideLoading(),a.ajaxLoad&&a.ajaxLoad.abort(),a.ajaxLoad=null,a.imgPreload))a.imgPreload.onload=a.imgPreload.onabort=a.imgPreload.onerror=null},close:function(b){a.cancel();if(a.current&&!1!==a.trigger("beforeClose"))a.unbindEvents(),!a.isOpen||b&&!0===b[0]?(e(".fancybox-wrap").stop().trigger("onReset").remove(),a._afterZoomOut()):(a.isOpen=a.isOpened= -!1,e(".fancybox-item").remove(),a.wrap.stop(!0).removeClass("fancybox-opened"),a.inner.css("overflow","hidden"),a.transitions[a.current.closeMethod]())},play:function(b){var c=function(){clearTimeout(a.player.timer)},d=function(){c();if(a.current&&a.player.isActive)a.player.timer=setTimeout(a.next,a.current.playSpeed)},g=function(){c();e("body").unbind(".player");a.player.isActive=!1;a.trigger("onPlayEnd")};if(a.player.isActive||b&&!1===b[0])g();else if(a.current&&(a.current.loop||a.current.index< -a.group.length-1))a.player.isActive=!0,e("body").bind({"afterShow.player onUpdate.player":d,"onCancel.player beforeClose.player":g,"beforeLoad.player":c}),d(),a.trigger("onPlayStart")},next:function(){a.current&&a.jumpto(a.current.index+1)},prev:function(){a.current&&a.jumpto(a.current.index-1)},jumpto:function(b){a.current&&(b=parseInt(b,10),1<a.group.length&&a.current.loop&&(b>=a.group.length?b=0:0>b&&(b=a.group.length-1)),"undefined"!==typeof a.group[b]&&(a.cancel(),a._start(b)))},reposition:function(b){a.isOpen&& -a.wrap.css(a._getPosition(b))},update:function(){a.isOpen&&(s||(t=setInterval(function(){if(s&&(s=!1,clearTimeout(t),a.current)){if(a.current.autoSize)a.inner.height("auto"),a.current.height=a.inner.height();a._setDimension();a.current.canGrow&&a.inner.height("auto");a.reposition();a.trigger("onUpdate")}},100)),s=!0)},toggle:function(){if(a.isOpen)a.current.fitToView=!a.current.fitToView,a.update()},hideLoading:function(){e("#fancybox-loading").remove()},showLoading:function(){a.hideLoading();e('<div id="fancybox-loading"></div>').click(a.cancel).appendTo("body")}, -getViewport:function(){return{x:l.scrollLeft(),y:l.scrollTop(),w:l.width(),h:l.height()}},unbindEvents:function(){a.wrap&&a.wrap.unbind(".fb");r.unbind(".fb");l.unbind(".fb")},bindEvents:function(){var b=a.current,c=b.keys;b&&(l.bind("resize.fb, orientationchange.fb",a.update),c&&r.bind("keydown.fb",function(b){var g;if(!b.ctrlKey&&!b.altKey&&!b.shiftKey&&!b.metaKey&&0>e.inArray(b.target.tagName.toLowerCase(),["input","textarea","select","button"]))g=b.keyCode,-1<e.inArray(g,c.close)?(a.close(),b.preventDefault()): --1<e.inArray(g,c.next)?(a.next(),b.preventDefault()):-1<e.inArray(g,c.prev)&&(a.prev(),b.preventDefault())}),e.fn.mousewheel&&b.mouseWheel&&1<a.group.length&&a.wrap.bind("mousewheel.fb",function(b,c){var f=e(b.target).get(0);if(0===f.clientHeight||f.scrollHeight===f.clientHeight)b.preventDefault(),a[0<c?"prev":"next"]()}))},trigger:function(b){var c,d=a[-1<e.inArray(b,["onCancel","beforeLoad","afterLoad"])?"coming":"current"];if(d){e.isFunction(d[b])&&(c=d[b].apply(d,Array.prototype.slice.call(arguments, -1)));if(!1===c)return!1;d.helpers&&e.each(d.helpers,function(c,f){if(f&&"undefined"!==typeof a.helpers[c]&&e.isFunction(a.helpers[c][b]))a.helpers[c][b](f,d)});e.event.trigger(b+".fb")}},isImage:function(a){return a&&a.match(/\.(jpg|gif|png|bmp|jpeg)(.*)?$/i)},isSWF:function(a){return a&&a.match(/\.(swf)(.*)?$/i)},_start:function(b){var c={},d=a.group[b]||null,g,f,k;if("object"===typeof d&&(d.nodeType||d instanceof e))g=!0,e.metadata&&(c=e(d).metadata());c=e.extend(!0,{},a.opts,{index:b,element:d}, -e.isPlainObject(d)?d:c);e.each(["href","title","content","type"],function(b,f){c[f]=a.opts[f]||g&&e(d).attr(f)||c[f]||null});if("number"===typeof c.margin)c.margin=[c.margin,c.margin,c.margin,c.margin];c.modal&&e.extend(!0,c,{closeBtn:!1,closeClick:!1,nextClick:!1,arrows:!1,mouseWheel:!1,keys:null,helpers:{overlay:{css:{cursor:"auto"},closeClick:!1}}});a.coming=c;if(!1===a.trigger("beforeLoad"))a.coming=null;else{f=c.type;b=c.href;if(!f)g&&(k=e(d).data("fancybox-type"),!k&&d.className&&(f=(k=d.className.match(/fancybox\.(\w+)/))? -k[1]:null)),!f&&b&&(a.isImage(b)?f="image":a.isSWF(b)?f="swf":b.match(/^#/)&&(f="inline")),f||(f=g?"inline":"html"),c.type=f;"inline"===f||"html"===f?(c.content=c.content||("inline"===f&&b?e(b):d),c.content.length||(f=null)):(c.href=b||d,c.href||(f=null));c.group=a.group;"image"===f?a._loadImage():"ajax"===f?a._loadAjax():f?a._afterLoad():a._error("type")}},_error:function(b){e.extend(a.coming,{type:"html",autoSize:!0,minHeight:"0",hasError:b,content:a.coming.tpl.error});a._afterLoad()},_loadImage:function(){a.imgPreload= -new Image;a.imgPreload.onload=function(){this.onload=this.onerror=null;a.coming.width=this.width;a.coming.height=this.height;a._afterLoad()};a.imgPreload.onerror=function(){this.onload=this.onerror=null;a._error("image")};a.imgPreload.src=a.coming.href;a.imgPreload.complete||a.showLoading()},_loadAjax:function(){a.showLoading();a.ajaxLoad=e.ajax(e.extend({},a.coming.ajax,{url:a.coming.href,error:function(b,c){"abort"!==c?a._error("ajax",b):a.hideLoading()},success:function(b,c){if("success"===c)a.coming.content= -b,a._afterLoad()}}))},_preload:function(){var b=a.group,c=a.current.index,d=function(b){if(b&&a.isImage(b))(new Image).src=b};1<b.length&&(d(e(b[c+1]||b[0]).attr("href")),d(e(b[c-1]||b[b.length-1]).attr("href")))},_afterLoad:function(){a.hideLoading();!a.coming||!1===a.trigger("afterLoad",a.current)?a.coming=!1:(a.isOpened?(e(".fancybox-item").remove(),a.wrap.stop(!0).removeClass("fancybox-opened"),a.inner.css("overflow","hidden"),a.transitions[a.current.prevMethod]()):(e(".fancybox-wrap").stop().trigger("onReset").remove(), -a.trigger("afterClose")),a.unbindEvents(),a.isOpen=!1,a.current=a.coming,a.coming=!1,a.wrap=e(a.current.tpl.wrap).addClass("fancybox-tmp "+a.current.wrapCSS).appendTo("body"),a.outer=e(".fancybox-outer",a.wrap).css("padding",a.current.padding+"px"),a.inner=e(".fancybox-inner",a.wrap),a._setContent(),a.trigger("beforeShow"),a._setDimension(),a.wrap.hide().removeClass("fancybox-tmp"),a.bindEvents(),a._preload(),a.transitions[a.isOpened?a.current.nextMethod:a.current.openMethod]())},_setContent:function(){var b, -c,d=a.current,g=d.type;switch(g){case "inline":case "ajax":case "html":b=d.content;"inline"===g&&b instanceof e&&(b=b.show().detach(),b.parent().hasClass("fancybox-inner")&&b.parents(".fancybox-wrap").trigger("onReset").remove(),e(a.wrap).bind("onReset",function(){b.appendTo("body").hide()}));if(d.autoSize)c=e('<div class="fancybox-tmp"></div>').appendTo(e("body")).append(b),d.width=c.outerWidth(),d.height=c.outerHeight(!0),b=c.contents().detach(),c.remove();break;case "image":b=d.tpl.image.replace("{href}", -d.href);d.aspectRatio=!0;break;case "swf":b=d.tpl.swf.replace(/\{width\}/g,d.width).replace(/\{height\}/g,d.height).replace(/\{href\}/g,d.href);break;case "iframe":b=d.tpl.iframe.replace("{href}",d.href).replace("{scrolling}",d.scrolling).replace("{rnd}",(new Date).getTime())}if(-1<e.inArray(g,["image","swf","iframe"]))d.autoSize=!1,d.scrolling=!1;a.inner.append(b)},_setDimension:function(){var b=a.wrap,c=a.outer,d=a.inner,g=a.current,f=a.getViewport(),k=g.margin,i=2*g.padding,h=g.width+i,j=g.height+ -i,l=g.width/g.height,o=g.maxWidth,m=g.maxHeight,n=g.minWidth,p=g.minHeight;f.w-=k[1]+k[3];f.h-=k[0]+k[2];-1<h.toString().indexOf("%")&&(h=f.w*parseFloat(h)/100);-1<j.toString().indexOf("%")&&(j=f.h*parseFloat(j)/100);g.fitToView&&(o=Math.min(f.w,o),m=Math.min(f.h,m));n=Math.min(h,n);p=Math.min(h,p);o=Math.max(n,o);m=Math.max(p,m);g.aspectRatio?(h>o&&(h=o,j=(h-i)/l+i),j>m&&(j=m,h=(j-i)*l+i),h<n&&(h=n,j=(h-i)/l+i),j<p&&(j=p,h=(j-i)*l+i)):(h=Math.max(n,Math.min(h,o)),j=Math.max(p,Math.min(j,m)));h=Math.round(h); -j=Math.round(j);e(b.add(c).add(d)).width("auto").height("auto");d.width(h-i).height(j-i);b.width(h);k=b.height();if(h>o||k>m)for(;(h>o||k>m)&&h>n&&k>p;)j-=10,g.aspectRatio?(h=Math.round((j-i)*l+i),h<n&&(h=n,j=(h-i)/l+i)):h-=10,d.width(h-i).height(j-i),b.width(h),k=b.height();g.dim={width:h,height:k};g.canGrow=g.autoSize&&j>p&&j<m;g.canShrink=!1;g.canExpand=!1;if(h-i<g.width||j-i<g.height)g.canExpand=!0;else if((h>f.w||k>f.h)&&h>n&&j>p)g.canShrink=!0;b=k-i;a.innerSpace=b-d.height();a.outerSpace=b- -c.height()},_getPosition:function(b){var c=a.current,d=a.getViewport(),e=c.margin,f=a.wrap.width()+e[1]+e[3],k=a.wrap.height()+e[0]+e[2],i={position:"absolute",top:e[0]+d.y,left:e[3]+d.x};if(c.fixed&&(!b||!1===b[0])&&k<=d.h&&f<=d.w)i={position:"fixed",top:e[0],left:e[3]};i.top=Math.ceil(Math.max(i.top,i.top+(d.h-k)*c.topRatio))+"px";i.left=Math.ceil(Math.max(i.left,i.left+0.5*(d.w-f)))+"px";return i},_afterZoomIn:function(){var b=a.current;a.isOpen=a.isOpened=!0;a.wrap.addClass("fancybox-opened").css("overflow", -"visible");a.update();a.inner.css("overflow","auto"===b.scrolling?"auto":"yes"===b.scrolling?"scroll":"hidden");if(b.closeClick||b.nextClick)a.inner.css("cursor","pointer").bind("click.fb",b.nextClick?a.next:a.close);b.closeBtn&&e(b.tpl.closeBtn).appendTo(a.wrap).bind("click.fb",a.close);b.arrows&&1<a.group.length&&((b.loop||0<b.index)&&e(b.tpl.prev).appendTo(a.wrap).bind("click.fb",a.prev),(b.loop||b.index<a.group.length-1)&&e(b.tpl.next).appendTo(a.wrap).bind("click.fb",a.next));a.trigger("afterShow"); -if(a.opts.autoPlay&&!a.player.isActive)a.opts.autoPlay=!1,a.play()},_afterZoomOut:function(){a.trigger("afterClose");a.wrap.trigger("onReset").remove();e.extend(a,{group:{},opts:{},current:null,isOpened:!1,isOpen:!1,wrap:null,outer:null,inner:null})}});a.transitions={getOrigPosition:function(){var b=a.current.element,c={},d=50,g=50,f;b&&b.nodeName&&e(b).is(":visible")?(f=e(b).find("img:first"),f.length?(c=f.offset(),d=f.outerWidth(),g=f.outerHeight()):c=e(b).offset()):(b=a.getViewport(),c.top=b.y+ -0.5*(b.h-g),c.left=b.x+0.5*(b.w-d));return c={top:Math.ceil(c.top)+"px",left:Math.ceil(c.left)+"px",width:Math.ceil(d)+"px",height:Math.ceil(g)+"px"}},step:function(b,c){var d,e,f;if("width"===c.prop||"height"===c.prop)e=f=Math.ceil(b-2*a.current.padding),"height"===c.prop&&(d=(b-c.start)/(c.end-c.start),c.start>c.end&&(d=1-d),e-=a.innerSpace*d,f-=a.outerSpace*d),a.inner[c.prop](e),a.outer[c.prop](f)},zoomIn:function(){var b=a.wrap,c=a.current,d,g;d=c.dim;if("elastic"===c.openEffect){g=e.extend({}, -d,a._getPosition(!0));delete g.position;d=this.getOrigPosition();if(c.openOpacity)d.opacity=0,g.opacity=1;b.css(d).show().animate(g,{duration:c.openSpeed,easing:c.openEasing,step:this.step,complete:a._afterZoomIn})}else b.css(e.extend({},d,a._getPosition())),"fade"===c.openEffect?b.fadeIn(c.openSpeed,a._afterZoomIn):(b.show(),a._afterZoomIn())},zoomOut:function(){var b=a.wrap,c=a.current,d;if("elastic"===c.closeEffect){"fixed"===b.css("position")&&b.css(a._getPosition(!0));d=this.getOrigPosition(); -if(c.closeOpacity)d.opacity=0;b.animate(d,{duration:c.closeSpeed,easing:c.closeEasing,step:this.step,complete:a._afterZoomOut})}else b.fadeOut("fade"===c.closeEffect?c.closeSpeed:0,a._afterZoomOut)},changeIn:function(){var b=a.wrap,c=a.current,d;"elastic"===c.nextEffect?(d=a._getPosition(!0),d.opacity=0,d.top=parseInt(d.top,10)-200+"px",b.css(d).show().animate({opacity:1,top:"+=200px"},{duration:c.nextSpeed,complete:a._afterZoomIn})):(b.css(a._getPosition()),"fade"===c.nextEffect?b.hide().fadeIn(c.nextSpeed, -a._afterZoomIn):(b.show(),a._afterZoomIn()))},changeOut:function(){var b=a.wrap,c=a.current,d=function(){e(this).trigger("onReset").remove()};b.removeClass("fancybox-opened");"elastic"===c.prevEffect?b.animate({opacity:0,top:"+=200px"},{duration:c.prevSpeed,complete:d}):b.fadeOut("fade"===c.prevEffect?c.prevSpeed:0,d)}};a.helpers.overlay={overlay:null,update:function(){var a,c;this.overlay.width(0).height(0);e.browser.msie?(a=Math.max(q.documentElement.scrollWidth,q.body.scrollWidth),c=Math.max(q.documentElement.offsetWidth, -q.body.offsetWidth),a=a<c?l.width():a):a=r.width();this.overlay.width(a).height(r.height())},beforeShow:function(b){if(!this.overlay)this.overlay=e('<div id="fancybox-overlay"></div>').css(b.css||{background:"black"}).appendTo("body"),this.update(),b.closeClick&&this.overlay.bind("click.fb",a.close),l.bind("resize.fb",e.proxy(this.update,this)),this.overlay.fadeTo(b.speedIn||"fast",b.opacity||1)},onUpdate:function(){this.update()},afterClose:function(a){this.overlay&&this.overlay.fadeOut(a.speedOut|| -"fast",function(){e(this).remove()});this.overlay=null}};a.helpers.title={beforeShow:function(b){var c;if(c=a.current.title)c=e('<div class="fancybox-title fancybox-title-'+b.type+'-wrap">'+c+"</div>").appendTo("body"),"float"===b.type&&(c.width(c.width()),c.wrapInner('<span class="child"></span>'),a.current.margin[2]+=Math.abs(parseInt(c.css("margin-bottom"),10))),c.appendTo("over"===b.type?a.inner:"outside"===b.type?a.wrap:a.outer)}};e.fn.fancybox=function(b){function c(b){var c=[],i,h=this.rel; -if(!b.ctrlKey&&!b.altKey&&!b.shiftKey&&!b.metaKey)b.preventDefault(),b=e(this).data("fancybox-group"),"undefined"!==typeof b?i=b?"data-fancybox-group":!1:h&&""!==h&&"nofollow"!==h&&(b=h,i="rel"),i&&(c=g.length?e(g).filter("["+i+'="'+b+'"]'):e("["+i+'="'+b+'"]')),c.length?(d.index=c.index(this),a.open(c.get(),d)):a.open(this,d)}var d=b||{},g=this.selector||"";g?r.undelegate(g,"click.fb-start").delegate(g,"click.fb-start",c):e(this).unbind("click.fb-start").bind("click.fb-start",c);return this}})(window, -document,jQuery);
\ No newline at end of file +/*! fancyBox v2.0.6 fancyapps.com | fancyapps.com/fancybox/#license */ +(function(s,l,d,t){var m=d(s),q=d(l),a=d.fancybox=function(){a.open.apply(this,arguments)},u=!1,k=l.createTouch!==t,o=function(a){return"string"===d.type(a)},n=function(b,c){c&&o(b)&&0<b.indexOf("%")&&(b=a.getViewport()[c]/100*parseInt(b,10));return Math.round(b)+"px"};d.extend(a,{version:"2.0.5",defaults:{padding:15,margin:20,width:800,height:600,minWidth:100,minHeight:100,maxWidth:9999,maxHeight:9999,autoSize:!0,autoResize:!k,autoCenter:!k,fitToView:!0,aspectRatio:!1,topRatio:0.5,fixed:!1,scrolling:"auto", +wrapCSS:"",arrows:!0,closeBtn:!0,closeClick:!1,nextClick:!1,mouseWheel:!0,autoPlay:!1,playSpeed:3E3,preload:3,modal:!1,loop:!0,ajax:{dataType:"html",headers:{"X-fancyBox":!0}},keys:{next:[13,32,34,39,40],prev:[8,33,37,38],close:[27]},tpl:{wrap:'<div class="fancybox-wrap"><div class="fancybox-skin"><div class="fancybox-outer"><div class="fancybox-inner"></div></div></div></div>',image:'<img class="fancybox-image" src="{href}" alt="" />',iframe:'<iframe class="fancybox-iframe" name="fancybox-frame{rnd}" frameborder="0" hspace="0"'+ +(d.browser.msie?' allowtransparency="true"':"")+"></iframe>",swf:'<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="100%" height="100%"><param name="wmode" value="transparent" /><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="{href}" /><embed src="{href}" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="100%" height="100%" wmode="transparent"></embed></object>',error:'<p class="fancybox-error">The requested content cannot be loaded.<br/>Please try again later.</p>', +closeBtn:'<div title="Close" class="fancybox-item fancybox-close"></div>',next:'<a title="Next" class="fancybox-nav fancybox-next"><span></span></a>',prev:'<a title="Previous" class="fancybox-nav fancybox-prev"><span></span></a>'},openEffect:"fade",openSpeed:300,openEasing:"swing",openOpacity:!0,openMethod:"zoomIn",closeEffect:"fade",closeSpeed:300,closeEasing:"swing",closeOpacity:!0,closeMethod:"zoomOut",nextEffect:"elastic",nextSpeed:300,nextEasing:"swing",nextMethod:"changeIn",prevEffect:"elastic", +prevSpeed:300,prevEasing:"swing",prevMethod:"changeOut",helpers:{overlay:{speedIn:0,speedOut:300,opacity:0.8,css:{cursor:"pointer"},closeClick:!0},title:{type:"float"}}},group:{},opts:{},coming:null,current:null,isOpen:!1,isOpened:!1,player:{timer:null,isActive:!1},ajaxLoad:null,imgPreload:null,transitions:{},helpers:{},open:function(b,c){a.close(!0);b&&!d.isArray(b)&&(b=b instanceof d?d(b).get():[b]);a.isActive=!0;a.opts=d.extend(!0,{},a.defaults,c);d.isPlainObject(c)&&c.keys!==t&&(a.opts.keys=c.keys? +d.extend({},a.defaults.keys,c.keys):!1);a.group=b;a._start(a.opts.index||0)},cancel:function(){a.coming&&!1===a.trigger("onCancel")||(a.coming=null,a.hideLoading(),a.ajaxLoad&&a.ajaxLoad.abort(),a.ajaxLoad=null,a.imgPreload&&(a.imgPreload.onload=a.imgPreload.onabort=a.imgPreload.onerror=null))},close:function(b){a.cancel();a.current&&!1!==a.trigger("beforeClose")&&(a.unbindEvents(),!a.isOpen||b&&!0===b[0]?(d(".fancybox-wrap").stop().trigger("onReset").remove(),a._afterZoomOut()):(a.isOpen=a.isOpened= +!1,d(".fancybox-item, .fancybox-nav").remove(),a.wrap.stop(!0).removeClass("fancybox-opened"),a.inner.css("overflow","hidden"),a.transitions[a.current.closeMethod]()))},play:function(b){var c=function(){clearTimeout(a.player.timer)},e=function(){c();a.current&&a.player.isActive&&(a.player.timer=setTimeout(a.next,a.current.playSpeed))},f=function(){c();d("body").unbind(".player");a.player.isActive=!1;a.trigger("onPlayEnd")};if(a.player.isActive||b&&!1===b[0])f();else if(a.current&&(a.current.loop|| +a.current.index<a.group.length-1))a.player.isActive=!0,d("body").bind({"afterShow.player onUpdate.player":e,"onCancel.player beforeClose.player":f,"beforeLoad.player":c}),e(),a.trigger("onPlayStart")},next:function(){a.current&&a.jumpto(a.current.index+1)},prev:function(){a.current&&a.jumpto(a.current.index-1)},jumpto:function(b){a.current&&(b=parseInt(b,10),1<a.group.length&&a.current.loop&&(b>=a.group.length?b=0:0>b&&(b=a.group.length-1)),a.group[b]!==t&&(a.cancel(),a._start(b)))},reposition:function(b, +c){var e;a.isOpen&&(e=a._getPosition(c),b&&"scroll"===b.type?(delete e.position,a.wrap.stop(!0,!0).animate(e,200)):a.wrap.css(e))},update:function(b){a.isOpen&&(u||setTimeout(function(){var c=a.current,e=!b||b&&"orientationchange"===b.type;if(u&&(u=!1,c)){if(!b||"scroll"!==b.type||e)c.autoSize&&"iframe"!==c.type&&(a.inner.height("auto"),c.height=a.inner.height()),(c.autoResize||e)&&a._setDimension(),c.canGrow&&"iframe"!==c.type&&a.inner.height("auto");(c.autoCenter||e)&&a.reposition(b);a.trigger("onUpdate")}}, +200),u=!0)},toggle:function(){a.isOpen&&(a.current.fitToView=!a.current.fitToView,a.update())},hideLoading:function(){q.unbind("keypress.fb");d("#fancybox-loading").remove()},showLoading:function(){a.hideLoading();q.bind("keypress.fb",function(b){27===b.keyCode&&(b.preventDefault(),a.cancel())});d('<div id="fancybox-loading"><div></div></div>').click(a.cancel).appendTo("body")},getViewport:function(){return{x:m.scrollLeft(),y:m.scrollTop(),w:k&&s.innerWidth?s.innerWidth:m.width(),h:k&&s.innerHeight? +s.innerHeight:m.height()}},unbindEvents:function(){a.wrap&&a.wrap.unbind(".fb");q.unbind(".fb");m.unbind(".fb")},bindEvents:function(){var b=a.current,c=b.keys;b&&(m.bind("resize.fb orientationchange.fb"+(b.autoCenter&&!b.fixed?" scroll.fb":""),a.update),c&&q.bind("keydown.fb",function(b){var f;f=b.target||b.srcElement;if(!b.ctrlKey&&!b.altKey&&!b.shiftKey&&!b.metaKey&&(!f||!f.type&&!d(f).is("[contenteditable]")))f=b.keyCode,-1<d.inArray(f,c.close)?(a.close(),b.preventDefault()):-1<d.inArray(f,c.next)? +(a.next(),b.preventDefault()):-1<d.inArray(f,c.prev)&&(a.prev(),b.preventDefault())}),d.fn.mousewheel&&b.mouseWheel&&1<a.group.length&&a.wrap.bind("mousewheel.fb",function(b,c){var d=b.target||null;if(0!==c&&(!d||0===d.clientHeight||d.scrollHeight===d.clientHeight&&d.scrollWidth===d.clientWidth))b.preventDefault(),a[0<c?"prev":"next"]()}))},trigger:function(b,c){var e,f=c||a[-1<d.inArray(b,["onCancel","beforeLoad","afterLoad"])?"coming":"current"];if(f){d.isFunction(f[b])&&(e=f[b].apply(f,Array.prototype.slice.call(arguments, +1)));if(!1===e)return!1;f.helpers&&d.each(f.helpers,function(c,e){if(e&&d.isPlainObject(a.helpers[c])&&d.isFunction(a.helpers[c][b]))a.helpers[c][b](e,f)});d.event.trigger(b+".fb")}},isImage:function(a){return o(a)&&a.match(/\.(jpe?g|gif|png|bmp)((\?|#).*)?$/i)},isSWF:function(a){return o(a)&&a.match(/\.(swf)((\?|#).*)?$/i)},_start:function(b){var c={},e=a.group[b]||null,f,g,i;if(e&&(e.nodeType||e instanceof d))f=!0,d.metadata&&(c=d(e).metadata());c=d.extend(!0,{},a.opts,{index:b,element:e},d.isPlainObject(e)? +e:c);d.each(["href","title","content","type"],function(b,g){c[g]=a.opts[g]||f&&d(e).attr(g)||c[g]||null});"number"===typeof c.margin&&(c.margin=[c.margin,c.margin,c.margin,c.margin]);c.modal&&d.extend(!0,c,{closeBtn:!1,closeClick:!1,nextClick:!1,arrows:!1,mouseWheel:!1,keys:null,helpers:{overlay:{css:{cursor:"auto"},closeClick:!1}}});a.coming=c;if(!1===a.trigger("beforeLoad"))a.coming=null;else{g=c.type;b=c.href||e;g||(f&&(g=d(e).data("fancybox-type"),g||(g=(g=e.className.match(/fancybox\.(\w+)/))? +g[1]:null)),!g&&o(b)&&(a.isImage(b)?g="image":a.isSWF(b)?g="swf":b.match(/^#/)&&(g="inline")),g||(g=f?"inline":"html"),c.type=g);if("inline"===g||"html"===g){if(c.content||(c.content="inline"===g?d(o(b)?b.replace(/.*(?=#[^\s]+$)/,""):b):e),!c.content||!c.content.length)g=null}else b||(g=null);"ajax"===g&&o(b)&&(i=b.split(/\s+/,2),b=i.shift(),c.selector=i.shift());c.href=b;c.group=a.group;c.isDom=f;switch(g){case "image":a._loadImage();break;case "ajax":a._loadAjax();break;case "inline":case "iframe":case "swf":case "html":a._afterLoad(); +break;default:a._error("type")}}},_error:function(b){a.hideLoading();d.extend(a.coming,{type:"html",autoSize:!0,minWidth:0,minHeight:0,padding:15,hasError:b,content:a.coming.tpl.error});a._afterLoad()},_loadImage:function(){var b=a.imgPreload=new Image;b.onload=function(){this.onload=this.onerror=null;a.coming.width=this.width;a.coming.height=this.height;a._afterLoad()};b.onerror=function(){this.onload=this.onerror=null;a._error("image")};b.src=a.coming.href;(b.complete===t||!b.complete)&&a.showLoading()}, +_loadAjax:function(){a.showLoading();a.ajaxLoad=d.ajax(d.extend({},a.coming.ajax,{url:a.coming.href,error:function(b,c){a.coming&&"abort"!==c?a._error("ajax",b):a.hideLoading()},success:function(b,c){"success"===c&&(a.coming.content=b,a._afterLoad())}}))},_preloadImages:function(){var b=a.group,c=a.current,e=b.length,f,g,i,h=Math.min(c.preload,e-1);if(c.preload&&!(2>b.length))for(i=1;i<=h;i+=1)if(f=b[(c.index+i)%e],g=f.href||d(f).attr("href")||f,"image"===f.type||a.isImage(g))(new Image).src=g},_afterLoad:function(){a.hideLoading(); +!a.coming||!1===a.trigger("afterLoad",a.current)?a.coming=!1:(a.isOpened?(d(".fancybox-item, .fancybox-nav").remove(),a.wrap.stop(!0).removeClass("fancybox-opened"),a.inner.css("overflow","hidden"),a.transitions[a.current.prevMethod]()):(d(".fancybox-wrap").stop().trigger("onReset").remove(),a.trigger("afterClose")),a.unbindEvents(),a.isOpen=!1,a.current=a.coming,a.wrap=d(a.current.tpl.wrap).addClass("fancybox-"+(k?"mobile":"desktop")+" fancybox-type-"+a.current.type+" fancybox-tmp "+a.current.wrapCSS).appendTo("body"), +a.skin=d(".fancybox-skin",a.wrap).css("padding",n(a.current.padding)),a.outer=d(".fancybox-outer",a.wrap),a.inner=d(".fancybox-inner",a.wrap),a._setContent())},_setContent:function(){var b=a.current,c=b.content,e=b.type,f=b.minWidth,g=b.minHeight,i=b.maxWidth,h=b.maxHeight;switch(e){case "inline":case "ajax":case "html":b.selector?c=d("<div>").html(c).find(b.selector):c instanceof d&&(c.parent().hasClass("fancybox-inner")&&c.parents(".fancybox-wrap").unbind("onReset"),c=c.show().detach(),d(a.wrap).bind("onReset", +function(){c.appendTo("body").hide()}));b.autoSize&&(f=d('<div class="fancybox-wrap '+a.current.wrapCSS+' fancybox-tmp"></div>').appendTo("body").css({minWidth:n(f,"w"),minHeight:n(g,"h"),maxWidth:n(i,"w"),maxHeight:n(h,"h")}).append(c),b.width=f.width(),b.height=f.height(),f.width(a.current.width),f.height()>b.height&&(f.width(b.width+1),b.width=f.width(),b.height=f.height()),c=f.contents().detach(),f.remove());break;case "image":c=b.tpl.image.replace("{href}",b.href);b.aspectRatio=!0;break;case "swf":c= +b.tpl.swf.replace(/\{width\}/g,b.width).replace(/\{height\}/g,b.height).replace(/\{href\}/g,b.href);break;case "iframe":c=d(b.tpl.iframe.replace("{rnd}",(new Date).getTime())).attr("scrolling",b.scrolling).attr("src",b.href),b.scrolling=k?"scroll":"auto"}if("image"===e||"swf"===e)b.autoSize=!1,b.scrolling="visible";"iframe"===e&&b.autoSize?(a.showLoading(),a._setDimension(),a.inner.css("overflow",b.scrolling),c.bind({onCancel:function(){d(this).unbind();a._afterZoomOut()},load:function(){a.hideLoading(); +try{this.contentWindow.document.location&&(a.current.height=d(this).contents().find("body").height())}catch(b){a.current.autoSize=!1}a[a.isOpen?"_afterZoomIn":"_beforeShow"]()}}).appendTo(a.inner)):(a.inner.append(c),a._beforeShow())},_beforeShow:function(){a.coming=null;a.trigger("beforeShow");a._setDimension();a.wrap.hide().removeClass("fancybox-tmp");a.bindEvents();a._preloadImages();a.transitions[a.isOpened?a.current.nextMethod:a.current.openMethod]()},_setDimension:function(){var b=a.wrap,c= +a.inner,e=a.current,f=a.getViewport(),g=e.margin,i=2*e.padding,h=e.width,j=e.height,r=e.maxWidth+i,k=e.maxHeight+i,l=e.minWidth+i,m=e.minHeight+i,p;f.w-=g[1]+g[3];f.h-=g[0]+g[2];o(h)&&0<h.indexOf("%")&&(h=(f.w-i)*parseFloat(h)/100);o(j)&&0<j.indexOf("%")&&(j=(f.h-i)*parseFloat(j)/100);g=h/j;h+=i;j+=i;e.fitToView&&(r=Math.min(f.w,r),k=Math.min(f.h,k));if(e.aspectRatio){if(h>r&&(h=r,j=(h-i)/g+i),j>k&&(j=k,h=(j-i)*g+i),h<l&&(h=l,j=(h-i)/g+i),j<m)j=m,h=(j-i)*g+i}else h=Math.max(l,Math.min(h,r)),j=Math.max(m, +Math.min(j,k));h=Math.round(h);j=Math.round(j);d(b.add(c)).width("auto").height("auto");c.width(h-i).height(j-i);b.width(h);p=b.height();if(h>r||p>k)for(;(h>r||p>k)&&h>l&&p>m;)j-=10,e.aspectRatio?(h=Math.round((j-i)*g+i),h<l&&(h=l,j=(h-i)/g+i)):h-=10,c.width(h-i).height(j-i),b.width(h),p=b.height();e.dim={width:n(h),height:n(p)};e.canGrow=e.autoSize&&j>m&&j<k;e.canShrink=!1;e.canExpand=!1;if(h-i<e.width||j-i<e.height)e.canExpand=!0;else if((h>f.w||p>f.h)&&h>l&&j>m)e.canShrink=!0;a.innerSpace=p-i- +c.height()},_getPosition:function(b){var c=a.current,e=a.getViewport(),f=c.margin,d=a.wrap.width()+f[1]+f[3],i=a.wrap.height()+f[0]+f[2],h={position:"absolute",top:f[0]+e.y,left:f[3]+e.x};c.autoCenter&&c.fixed&&!b&&i<=e.h&&d<=e.w&&(h={position:"fixed",top:f[0],left:f[3]});h.top=n(Math.max(h.top,h.top+(e.h-i)*c.topRatio));h.left=n(Math.max(h.left,h.left+0.5*(e.w-d)));return h},_afterZoomIn:function(){var b=a.current,c=b?b.scrolling:"no";if(b&&(a.isOpen=a.isOpened=!0,a.wrap.addClass("fancybox-opened"), +a.inner.css("overflow","yes"===c?"scroll":"no"===c?"hidden":c),a.trigger("afterShow"),a.update(),(b.closeClick||b.nextClick)&&a.inner.css("cursor","pointer").bind("click.fb",function(c){if(!d(c.target).is("a")&&!d(c.target).parent().is("a"))a[b.closeClick?"close":"next"]()}),b.closeBtn&&d(b.tpl.closeBtn).appendTo(a.skin).bind("click.fb",a.close),b.arrows&&1<a.group.length&&((b.loop||0<b.index)&&d(b.tpl.prev).appendTo(a.outer).bind("click.fb",a.prev),(b.loop||b.index<a.group.length-1)&&d(b.tpl.next).appendTo(a.outer).bind("click.fb", +a.next)),a.opts.autoPlay&&!a.player.isActive))a.opts.autoPlay=!1,a.play()},_afterZoomOut:function(){var b=a.current;a.wrap.trigger("onReset").remove();d.extend(a,{group:{},opts:{},current:null,isActive:!1,isOpened:!1,isOpen:!1,wrap:null,skin:null,outer:null,inner:null});a.trigger("afterClose",b)}});a.transitions={getOrigPosition:function(){var b=a.current,c=b.element,e=b.padding,f=d(b.orig),g={},i=50,h=50;!f.length&&b.isDom&&d(c).is(":visible")&&(f=d(c).find("img:first"),f.length||(f=d(c)));f.length? +(g=f.offset(),f.is("img")&&(i=f.outerWidth(),h=f.outerHeight())):(b=a.getViewport(),g.top=b.y+0.5*(b.h-h),g.left=b.x+0.5*(b.w-i));return g={top:n(g.top-e),left:n(g.left-e),width:n(i+2*e),height:n(h+2*e)}},step:function(b,c){var e=c.prop,d,g;if("width"===e||"height"===e)d=Math.ceil(b-2*a.current.padding),"height"===e&&(g=(b-c.start)/(c.end-c.start),c.start>c.end&&(g=1-g),d-=a.innerSpace*g),a.inner[e](d)},zoomIn:function(){var b=a.wrap,c=a.current,e=c.openEffect,f="elastic"===e,g=d.extend({},c.dim, +a._getPosition(f)),i=d.extend({opacity:1},g);delete i.position;f?(g=this.getOrigPosition(),c.openOpacity&&(g.opacity=0),a.outer.add(a.inner).width("auto").height("auto")):"fade"===e&&(g.opacity=0);b.css(g).show().animate(i,{duration:"none"===e?0:c.openSpeed,easing:c.openEasing,step:f?this.step:null,complete:a._afterZoomIn})},zoomOut:function(){var b=a.wrap,c=a.current,d=c.openEffect,f="elastic"===d,g={opacity:0};f&&("fixed"===b.css("position")&&b.css(a._getPosition(!0)),g=this.getOrigPosition(),c.closeOpacity&& +(g.opacity=0));b.animate(g,{duration:"none"===d?0:c.closeSpeed,easing:c.closeEasing,step:f?this.step:null,complete:a._afterZoomOut})},changeIn:function(){var b=a.wrap,c=a.current,d=c.nextEffect,f="elastic"===d,g=a._getPosition(f),i={opacity:1};g.opacity=0;f&&(g.top=n(parseInt(g.top,10)-200),i.top="+=200px");b.css(g).show().animate(i,{duration:"none"===d?0:c.nextSpeed,easing:c.nextEasing,complete:a._afterZoomIn})},changeOut:function(){var b=a.wrap,c=a.current,e=c.prevEffect,f={opacity:0};b.removeClass("fancybox-opened"); +"elastic"===e&&(f.top="+=200px");b.animate(f,{duration:"none"===e?0:c.prevSpeed,easing:c.prevEasing,complete:function(){d(this).trigger("onReset").remove()}})}};a.helpers.overlay={overlay:null,update:function(){var a,c;this.overlay.width("100%").height("100%");d.browser.msie||k?(a=Math.max(l.documentElement.scrollWidth,l.body.scrollWidth),c=Math.max(l.documentElement.offsetWidth,l.body.offsetWidth),a=a<c?m.width():a):a=q.width();this.overlay.width(a).height(q.height())},beforeShow:function(b){this.overlay|| +(b=d.extend(!0,{},a.defaults.helpers.overlay,b),this.overlay=d('<div id="fancybox-overlay"></div>').css(b.css).appendTo("body"),b.closeClick&&this.overlay.bind("click.fb",a.close),a.current.fixed&&!k?this.overlay.addClass("overlay-fixed"):(this.update(),this.onUpdate=function(){this.update()}),this.overlay.fadeTo(b.speedIn,b.opacity))},afterClose:function(a){this.overlay&&this.overlay.fadeOut(a.speedOut||0,function(){d(this).remove()});this.overlay=null}};a.helpers.title={beforeShow:function(b){var c; +if(c=a.current.title)c=d('<div class="fancybox-title fancybox-title-'+b.type+'-wrap">'+c+"</div>").appendTo("body"),"float"===b.type&&(c.width(c.width()),c.wrapInner('<span class="child"></span>'),a.current.margin[2]+=Math.abs(parseInt(c.css("margin-bottom"),10))),c.appendTo("over"===b.type?a.inner:"outside"===b.type?a.wrap:a.skin)}};d.fn.fancybox=function(b){var c=d(this),e=this.selector||"",f,g=function(g){var h=this,j=f,k;!g.ctrlKey&&!g.altKey&&!g.shiftKey&&!g.metaKey&&!d(h).is(".fancybox-wrap")&& +(g.preventDefault(),g=b.groupAttr||"data-fancybox-group",k=d(h).attr(g),k||(g="rel",k=h[g]),k&&""!==k&&"nofollow"!==k&&(h=e.length?d(e):c,h=h.filter("["+g+'="'+k+'"]'),j=h.index(this)),b.index=j,a.open(h,b))},b=b||{};f=b.index||0;e?q.undelegate(e,"click.fb-start").delegate(e,"click.fb-start",g):c.unbind("click.fb-start").bind("click.fb-start",g);return this};d(l).ready(function(){a.defaults.fixed=d.support.fixedPosition||!(d.browser.msie&&6>=d.browser.version)&&!k})})(window,document,jQuery);
\ No newline at end of file diff --git a/source/javascripts/navigation.js b/source/javascripts/navigation.js deleted file mode 100644 index 652aafa..0000000 --- a/source/javascripts/navigation.js +++ /dev/null @@ -1,16 +0,0 @@ -(function($){ - var appends = '<option>Menu</option>'; - - $('.menu .main > li').each(function(){ - var link = $(this).children('a'); - appends += '<option value="'+link.attr('href')+'">'+link.html()+'</option>'; - $(this).find('li').each(function(){ - var link = $(this).children('a'); - appends += '<option value="'+link.attr('href')+'">- '+link.html()+'</option>'; - }); - }); - - $('nav.menu').append('<select>'+appends+'</select>').on('change', 'select', function(){ - location.href = $(this).val(); - }); -})(jQuery);
\ No newline at end of file diff --git a/source/javascripts/slash.js b/source/javascripts/slash.js index c23a4a2..6433ba0 100644 --- a/source/javascripts/slash.js +++ b/source/javascripts/slash.js @@ -1,45 +1,71 @@ (function($){ - /* external.js */ - var host = location.host; - - $('a').on('click', function(e){ - var href = $(this).attr('href'), - link = href.replace(/(https?:\/\/)(.*)\/(.*)/, '$2'); - - if (href.match('https?') && link != host){ - window.open(href); - e.preventDefault(); - } - }); - - /* navigation.js */ - var appends = '<option>Menu</option>'; - - $('.menu .main > li').each(function(){ - var link = $(this).children('a'); - appends += '<option value="'+link.attr('href')+'">'+link.html()+'</option>'; - $(this).find('li').each(function(){ - var link = $(this).children('a'); - appends += '<option value="'+link.attr('href')+'">- '+link.html()+'</option>'; + // Open external links in new window + var externalLinks = function(){ + var host = location.host; + + $('body').on('click', 'a', function(e){ + var href = this.href, + link = href.replace(/https?:\/\/([^\/]+)(.*)/, '$1'); + + if (link != '' && link != host && !$(this).hasClass('fancybox')){ + window.open(href); + e.preventDefault(); + } }); - }); - - $('nav.menu').append('<select>'+appends+'</select>').on('change', 'select', function(){ - location.href = $(this).val(); - }); - - /* caption.js */ - $('.entry').each(function(i){ - var _i = i; - $(this).find('img').each(function(){ - var alt = $(this).attr('alt'); - - if (alt == '' || typeof alt == 'undefined'){ - $(this).wrap('<a href="'+$(this).attr('src')+'" class="fancybox" rel="gallery'+_i+'" />'); - } else { - $(this).after('<span class="caption">'+alt+'</span>').wrap('<a href="'+$(this).attr('src')+'" class="fancybox" title="'+alt+'" rel="gallery'+_i+'" />'); + }; + + // Append menu for mobile device + var navigationMenu = function(){ + var appends = '<option>Menu</option>'; + + var search = function(obj, level){ + var children = obj.children(), + link = children.eq(0), + _level = level + 1; + + appends += '<option value="'+link.attr('href')+'">'; + + if (level > 0) appends += '|'; + + for (var i=0; i<level; i++){ + appends += '—'; } + + appends += link.text()+'</option>'; + + if (children.length > 1){ + children.eq(1).children('li').each(function(){ + search($(this), _level); + }); + } + }; + + $('#header .menu .main').children('li').each(function(){ + search($(this), 0); }); - }); - $('.fancybox').fancybox(); + + $('#header .menu').append('<select>'+appends+'</select>').on('change', 'select', function(){ + location.href = $(this).val(); + }); + }; + + // Append caption after pictures + var appendCaption = function(){ + $('.entry-content').each(function(i){ + var _i = i; + $(this).find('img').each(function(){ + var alt = this.alt; + + if (alt != ''){ + $(this).after('<span class="caption">'+alt+'</span>'); + } + + $(this).wrap('<a href="'+this.src+'" title="'+alt+'" class="fancybox" rel="gallery'+_i+'" />'); + }); + }); + }; + + externalLinks(); // Delete or comment this line to disable opening external links in new window + navigationMenu(); // Delete or comment this line to disable menu for mobile device + appendCaption(); // Delete or comment this line to disable caption })(jQuery);
\ No newline at end of file |
