Compare commits

...

14 Commits
1.1.6 ... 1.1.7

Author SHA1 Message Date
1b86190c4d Upgrading Casper to 1.1.7 2015-03-09 17:52:52 +00:00
37d7d0b4f0 Sexier animation timing on menu 2015-03-09 16:05:25 +02:00
329dfef410 Merge pull request #185 from novaugust/master
Fix transition property
2015-03-05 23:10:35 +02:00
baea6bb2fd Fix transition property 2015-03-05 14:08:04 -07:00
dffc9f3cb3 Merge pull request #183 from tomkwok/patch-1
Add -ms- prefix for IE9
2015-03-04 11:37:44 +02:00
7f42eaabfe Add -ms- prefix for IE9 2015-03-04 17:33:35 +08:00
dcfddacfa1 Merge pull request #182 from mankittens/master
Prefixed second instance of tt with pre
2015-03-04 11:13:00 +02:00
031ac1fb40 Prefixed second instance of tt with pre 2015-03-04 03:50:52 -05:00
9339635abd Merge pull request #181 from PaulAdamDavis/fix-nav-overflow
Fix menu button overflow
2015-03-02 18:04:15 +02:00
0d3bafde1e Fix menu button overflow
References #180

- Adds `overflow-x: hidden` to `.site-wrapper` when navigation is open to prevent the menu button flowing into the navigation & covering the 'Menu' title text in Firefox.
2015-03-02 14:00:20 +00:00
7af816a48e Merge pull request #172 from mankittens/master
Improvement to .post-content .full-img
2015-03-02 09:32:12 +02:00
a5dcaf6cd5 Removed references to .full-img, debounce, and smartresize, and replaced with pure CSS
issue #172
New code will center all post images and allow them to extend beyond the main text column. No JavaScript or special classes required.
2015-03-02 02:21:19 -05:00
e59dcaa256 Fix vertical height bug
Introduced in @46dc55769e5f11bddde77ae131f0cb24f82fd9ea - vh is incompatible with % - all references to height needed to be updated in order for this to work correctly
2015-03-01 08:51:38 +02:00
8b35959ff6 Update Nav position
Fixes #178
2015-03-01 08:25:35 +02:00
3 changed files with 37 additions and 84 deletions

View File

@ -352,7 +352,7 @@ pre {
border-radius: 3px; border-radius: 3px;
} }
pre code, tt { pre code, pre tt {
font-size: inherit; font-size: inherit;
white-space: pre-wrap; white-space: pre-wrap;
background: transparent; background: transparent;
@ -476,9 +476,12 @@ margin on the iframe, cause it breaks stuff. */
} }
body.nav-opened .site-wrapper { body.nav-opened .site-wrapper {
overflow-x: hidden;
-webkit-transform: translate3D(-240px, 0, 0); -webkit-transform: translate3D(-240px, 0, 0);
-ms-transform: translate3D(-240px, 0, 0); -ms-transform: translate3D(-240px, 0, 0);
transform: translate3D(-240px, 0, 0); transform: translate3D(-240px, 0, 0);
-webkit-transition: -webkit-transform 0.3s ease;
transition: transform 0.3s ease;
} }
@ -550,9 +553,9 @@ body.nav-closed .nav {
body.nav-opened .nav { body.nav-opened .nav {
opacity: 1; opacity: 1;
-webkit-transition: -webkit-transform 0.5s ease, -webkit-transition: -webkit-transform 0.3s ease,
opacity 0s ease 0s; opacity 0s ease 0s;
transition: -webkit-transform 0.5s ease, transition: transform 0.3s ease,
opacity 0s ease 0s; opacity 0s ease 0s;
-webkit-transform: translate3D(0, 0, 0); -webkit-transform: translate3D(0, 0, 0);
-ms-transform: translate3D(0, 0, 0); -ms-transform: translate3D(0, 0, 0);
@ -787,7 +790,7 @@ body.nav-opened .nav {
white-space: nowrap; white-space: nowrap;
border-radius: 3px; border-radius: 3px;
background: rgba(0,0,0,0.1); background: rgba(0,0,0,0.1);
transition: all 0.6s ease; transition: all 0.5s ease;
} }
.menu-button:focus { .menu-button:focus {
outline: 0; outline: 0;
@ -805,7 +808,7 @@ body.nav-opened .menu-button {
-webkit-transform: translate3D(94px, 0, 0); -webkit-transform: translate3D(94px, 0, 0);
-ms-transform: translate3D(94px, 0, 0); -ms-transform: translate3D(94px, 0, 0);
transform: translate3D(94px, 0, 0); transform: translate3D(94px, 0, 0);
transition: all 0.4s ease; transition: all 0.3s ease;
} }
body.nav-opened .menu-button .word { body.nav-opened .menu-button .word {
opacity: 0; opacity: 0;
@ -869,7 +872,7 @@ body.nav-opened .menu-button .word {
.no-cover.main-header { .no-cover.main-header {
min-height: 160px; min-height: 160px;
max-height: 40%; max-height: 40vh;
background: #f5f8fa; background: #f5f8fa;
} }
@ -1052,8 +1055,9 @@ body:not(.post-template) .post-title {
border: none; border: none;
} }
/* Stop .full-img from creating horizontal scroll - slight hack due to /* Stop elements, such as img wider than the post content, from
imperfections with browser width % calculations and rounding */ creating horizontal scroll - slight hack due to imperfections
with browser width % calculations and rounding */
.post-template .content { .post-template .content {
overflow: hidden; overflow: hidden;
} }
@ -1070,21 +1074,22 @@ body:not(.post-template) .post-title {
display: none; display: none;
} }
/* Keep images centred and within the bounds of the post-width */ /* Keep images centered, and allow images wider than the main
text column to break out. */
.post-content img { .post-content img {
display: block; display: block;
max-width: 100%; max-width: 126%;
height: auto; height: auto;
margin: 0 auto;
padding: 0.6em 0; padding: 0.6em 0;
} /* Centers an image by (1) pushing its left edge to the
center of its container and (2) shifting the entire image
/* Break out larger images to be wider than the main text column in the opposite direction by half its own width.
the class is applied with jQuery */ Works for images that are larger than their containers. */
.post-content .full-img { position: relative;
width: 126%; left: 50%;
max-width: none; -webkit-transform: translateX(-50%); /* for Safari and iOS */
margin: 0 -13%; -ms-transform: translateX(-50%); /* for IE9 */
transform: translateX(-50%);
} }
/* The author credit area after the post */ /* The author credit area after the post */
@ -1392,7 +1397,7 @@ body:not(.post-template) .post-title {
/* On page2+ make all the headers smaller */ /* On page2+ make all the headers smaller */
.archive-template .main-header { .archive-template .main-header {
max-height: 30%; max-height: 30vh;
} }
/* On page2+ show extra pagination controls at the top of post list */ /* On page2+ show extra pagination controls at the top of post list */
@ -1456,7 +1461,7 @@ body:not(.post-template) .post-title {
box-sizing: border-box; box-sizing: border-box;
height: auto; height: auto;
min-height: 240px; min-height: 240px;
height: 60%; height: 60vh;
padding: 15% 0; padding: 15% 0;
} }
@ -1540,12 +1545,12 @@ body:not(.post-template) .post-title {
} }
.post-head.main-header { .post-head.main-header {
height:45%; height:45vh;
} }
.tag-head.main-header, .tag-head.main-header,
.author-head.main-header { .author-head.main-header {
height: 30%; height: 30vh;
} }
.no-cover.post-head.main-header { .no-cover.post-head.main-header {
@ -1568,15 +1573,15 @@ body:not(.post-template) .post-title {
.main-header { .main-header {
margin-bottom: 15px; margin-bottom: 15px;
height: 40%; height: 40vh;
} }
.no-cover.main-header { .no-cover.main-header {
height: 30%; height: 30vh;
} }
.archive-template .main-header { .archive-template .main-header {
max-height: 20%; max-height: 20vh;
min-height: 160px; min-height: 160px;
padding: 10% 0; padding: 10% 0;
} }
@ -1737,12 +1742,7 @@ body:not(.post-template) .post-title {
.post-content img { .post-content img {
padding: 0; padding: 0;
}
.post-content .full-img {
width: auto;
width: calc(100% + 32px); /* expand with to image + margins */ width: calc(100% + 32px); /* expand with to image + margins */
margin: 0 -16px; /* get rid of margins */
min-width: 0; min-width: 0;
max-width: 112%; /* fallback when calc doesn't work */ max-width: 112%; /* fallback when calc doesn't work */
} }
@ -1801,12 +1801,12 @@ body:not(.post-template) .post-title {
} }
.post-head.main-header { .post-head.main-header {
height: 30%; height: 30vh;
} }
.tag-head.main-header, .tag-head.main-header,
.author-head.main-header { .author-head.main-header {
height: 20%; height: 20vh;
} }
.author-profile .author-image { .author-profile .author-image {

View File

@ -3,60 +3,16 @@
*/ */
/* globals jQuery, document */ /* globals jQuery, document */
(function ($, sr, undefined) { (function ($, undefined) {
"use strict"; "use strict";
var $document = $(document), var $document = $(document);
// debouncing function from John Hann
// http://unscriptable.com/index.php/2009/03/20/debouncing-javascript-methods/
debounce = function (func, threshold, execAsap) {
var timeout;
return function debounced () {
var obj = this, args = arguments;
function delayed () {
if (!execAsap) {
func.apply(obj, args);
}
timeout = null;
}
if (timeout) {
clearTimeout(timeout);
} else if (execAsap) {
func.apply(obj, args);
}
timeout = setTimeout(delayed, threshold || 100);
};
};
$document.ready(function () { $document.ready(function () {
var $postContent = $(".post-content"); var $postContent = $(".post-content");
$postContent.fitVids(); $postContent.fitVids();
function updateImageWidth() {
var $this = $(this),
contentWidth = $postContent.outerWidth(), // Width of the content
imageWidth = this.naturalWidth; // Original image resolution
if (imageWidth >= contentWidth) {
$this.addClass('full-img');
} else {
$this.removeClass('full-img');
}
}
var $img = $("img").on('load', updateImageWidth);
function casperFullImg() {
$img.each(updateImageWidth);
}
casperFullImg();
$(window).smartresize(casperFullImg);
$(".scroll-down").arctic_scroll(); $(".scroll-down").arctic_scroll();
$(".menu-button, .nav-cover, .nav-close").on("click", function(e){ $(".menu-button, .nav-cover, .nav-close").on("click", function(e){
@ -66,9 +22,6 @@
}); });
// smartresize
jQuery.fn[sr] = function(fn) { return fn ? this.bind('resize', debounce(fn)) : this.trigger(sr); };
// Arctic Scroll by Paul Adam Davis // Arctic Scroll by Paul Adam Davis
// https://github.com/PaulAdamDavis/Arctic-Scroll // https://github.com/PaulAdamDavis/Arctic-Scroll
$.fn.arctic_scroll = function (options) { $.fn.arctic_scroll = function (options) {
@ -100,4 +53,4 @@
}); });
}; };
})(jQuery, 'smartresize'); })(jQuery);

View File

@ -1,4 +1,4 @@
{ {
"name": "Casper", "name": "Casper",
"version": "1.1.6" "version": "1.1.7"
} }