From 5a3a3bd07e0892bf152e202a64e860f3366bc8cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20=C4=86wirko?= Date: Sat, 25 Oct 2014 23:03:41 +0200 Subject: [PATCH] new ghost version adjustments --- README.md | 8 ++++++++ assets/css/style.css | 26 +++++++++++++++++--------- assets/js/vendor/imagesloaded.js | 7 ------- assets/scss/_theme-settings.scss | 3 ++- assets/scss/style.scss | 8 ++++++++ author.hbs | 3 --- default.hbs | 15 +-------------- index.hbs | 3 --- package.json | 2 +- page.hbs | 4 ---- partials/open-graph-twitter.hbs | 16 ---------------- post.hbs | 3 --- tag.hbs | 3 --- 13 files changed, 37 insertions(+), 64 deletions(-) delete mode 100644 assets/js/vendor/imagesloaded.js delete mode 100644 partials/open-graph-twitter.hbs diff --git a/README.md b/README.md index 287e3d0..082b7c9 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,14 @@ Your feedback will be very appreciated. You can also send feature requests by op Thanks! +#### Changelog + +##### 1.1.0 (25.10.2014) + +- Ghost 0.5.3 ready +- custom Open Graph tags removed (in Ghost 0.5.3 you have better default ones) +- removed unused imagesloaded script +- post headers color fix #### License diff --git a/assets/css/style.css b/assets/css/style.css index 42c34b4..30e3421 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -5489,14 +5489,14 @@ h1, h2, h3, h4, h5, h6 { font-family: "Source Sans Pro", sans-serif; font-weight: 700; font-style: normal; - color: #222222; + color: black; text-rendering: optimizeLegibility; margin-top: 0.2rem; margin-bottom: 0.5rem; line-height: 1.4; } h1 small, h2 small, h3 small, h4 small, h5 small, h6 small { font-size: 60%; - color: #6f6f6f; + color: #595959; line-height: 0; } h1 { @@ -5519,7 +5519,7 @@ h6 { .subheader { line-height: 1.4; - color: #6f6f6f; + color: #595959; font-weight: normal; margin-top: 0.2rem; margin-bottom: 0.5rem; } @@ -5631,17 +5631,17 @@ blockquote { blockquote cite { display: block; font-size: 0.8125rem; - color: #555555; } + color: #3b3b3b; } blockquote cite:before { content: "\2014 \0020"; } blockquote cite a, blockquote cite a:visited { - color: #555555; } + color: #3b3b3b; } blockquote, blockquote p { line-height: 1.7; - color: #6f6f6f; } + color: #595959; } /* Microformats */ .vcard { @@ -6886,7 +6886,9 @@ body { transform: translateX(-0.3125rem); } .rborder, .lborder, .tborder, .bborder { - background: black; } + background: black; + -webkit-transform: translateZ(0); + transform: translateZ(0); } .rborder, .lborder { position: fixed; @@ -6930,6 +6932,8 @@ body { top: 0; left: 0; background: rgba(0, 0, 0, 0.9); + -webkit-user-select: none; + user-select: none; /* main-menu-ovrl closing cross */ /* Menu style */ } .main-menu-ovrl .main-menu-ovrl-close { @@ -6943,7 +6947,9 @@ body { color: white; outline: none; z-index: 100; - cursor: pointer; } + cursor: pointer; + -webkit-user-select: none; + user-select: none; } .main-menu-ovrl nav { text-align: center; position: relative; @@ -6957,7 +6963,9 @@ body { margin: 0 auto; display: inline-block; height: 100%; - position: relative; } + position: relative; + -webkit-user-select: none; + user-select: none; } .main-menu-ovrl ul li { display: block; height: 20%; diff --git a/assets/js/vendor/imagesloaded.js b/assets/js/vendor/imagesloaded.js deleted file mode 100644 index d66f658..0000000 --- a/assets/js/vendor/imagesloaded.js +++ /dev/null @@ -1,7 +0,0 @@ -/*! - * imagesLoaded PACKAGED v3.1.8 - * JavaScript is all like "You images are done yet or what?" - * MIT License - */ - -(function(){function e(){}function t(e,t){for(var n=e.length;n--;)if(e[n].listener===t)return n;return-1}function n(e){return function(){return this[e].apply(this,arguments)}}var i=e.prototype,r=this,o=r.EventEmitter;i.getListeners=function(e){var t,n,i=this._getEvents();if("object"==typeof e){t={};for(n in i)i.hasOwnProperty(n)&&e.test(n)&&(t[n]=i[n])}else t=i[e]||(i[e]=[]);return t},i.flattenListeners=function(e){var t,n=[];for(t=0;e.length>t;t+=1)n.push(e[t].listener);return n},i.getListenersAsObject=function(e){var t,n=this.getListeners(e);return n instanceof Array&&(t={},t[e]=n),t||n},i.addListener=function(e,n){var i,r=this.getListenersAsObject(e),o="object"==typeof n;for(i in r)r.hasOwnProperty(i)&&-1===t(r[i],n)&&r[i].push(o?n:{listener:n,once:!1});return this},i.on=n("addListener"),i.addOnceListener=function(e,t){return this.addListener(e,{listener:t,once:!0})},i.once=n("addOnceListener"),i.defineEvent=function(e){return this.getListeners(e),this},i.defineEvents=function(e){for(var t=0;e.length>t;t+=1)this.defineEvent(e[t]);return this},i.removeListener=function(e,n){var i,r,o=this.getListenersAsObject(e);for(r in o)o.hasOwnProperty(r)&&(i=t(o[r],n),-1!==i&&o[r].splice(i,1));return this},i.off=n("removeListener"),i.addListeners=function(e,t){return this.manipulateListeners(!1,e,t)},i.removeListeners=function(e,t){return this.manipulateListeners(!0,e,t)},i.manipulateListeners=function(e,t,n){var i,r,o=e?this.removeListener:this.addListener,s=e?this.removeListeners:this.addListeners;if("object"!=typeof t||t instanceof RegExp)for(i=n.length;i--;)o.call(this,t,n[i]);else for(i in t)t.hasOwnProperty(i)&&(r=t[i])&&("function"==typeof r?o.call(this,i,r):s.call(this,i,r));return this},i.removeEvent=function(e){var t,n=typeof e,i=this._getEvents();if("string"===n)delete i[e];else if("object"===n)for(t in i)i.hasOwnProperty(t)&&e.test(t)&&delete i[t];else delete this._events;return this},i.removeAllListeners=n("removeEvent"),i.emitEvent=function(e,t){var n,i,r,o,s=this.getListenersAsObject(e);for(r in s)if(s.hasOwnProperty(r))for(i=s[r].length;i--;)n=s[r][i],n.once===!0&&this.removeListener(e,n.listener),o=n.listener.apply(this,t||[]),o===this._getOnceReturnValue()&&this.removeListener(e,n.listener);return this},i.trigger=n("emitEvent"),i.emit=function(e){var t=Array.prototype.slice.call(arguments,1);return this.emitEvent(e,t)},i.setOnceReturnValue=function(e){return this._onceReturnValue=e,this},i._getOnceReturnValue=function(){return this.hasOwnProperty("_onceReturnValue")?this._onceReturnValue:!0},i._getEvents=function(){return this._events||(this._events={})},e.noConflict=function(){return r.EventEmitter=o,e},"function"==typeof define&&define.amd?define("eventEmitter/EventEmitter",[],function(){return e}):"object"==typeof module&&module.exports?module.exports=e:this.EventEmitter=e}).call(this),function(e){function t(t){var n=e.event;return n.target=n.target||n.srcElement||t,n}var n=document.documentElement,i=function(){};n.addEventListener?i=function(e,t,n){e.addEventListener(t,n,!1)}:n.attachEvent&&(i=function(e,n,i){e[n+i]=i.handleEvent?function(){var n=t(e);i.handleEvent.call(i,n)}:function(){var n=t(e);i.call(e,n)},e.attachEvent("on"+n,e[n+i])});var r=function(){};n.removeEventListener?r=function(e,t,n){e.removeEventListener(t,n,!1)}:n.detachEvent&&(r=function(e,t,n){e.detachEvent("on"+t,e[t+n]);try{delete e[t+n]}catch(i){e[t+n]=void 0}});var o={bind:i,unbind:r};"function"==typeof define&&define.amd?define("eventie/eventie",o):e.eventie=o}(this),function(e,t){"function"==typeof define&&define.amd?define(["eventEmitter/EventEmitter","eventie/eventie"],function(n,i){return t(e,n,i)}):"object"==typeof exports?module.exports=t(e,require("wolfy87-eventemitter"),require("eventie")):e.imagesLoaded=t(e,e.EventEmitter,e.eventie)}(window,function(e,t,n){function i(e,t){for(var n in t)e[n]=t[n];return e}function r(e){return"[object Array]"===d.call(e)}function o(e){var t=[];if(r(e))t=e;else if("number"==typeof e.length)for(var n=0,i=e.length;i>n;n++)t.push(e[n]);else t.push(e);return t}function s(e,t,n){if(!(this instanceof s))return new s(e,t);"string"==typeof e&&(e=document.querySelectorAll(e)),this.elements=o(e),this.options=i({},this.options),"function"==typeof t?n=t:i(this.options,t),n&&this.on("always",n),this.getImages(),a&&(this.jqDeferred=new a.Deferred);var r=this;setTimeout(function(){r.check()})}function f(e){this.img=e}function c(e){this.src=e,v[e]=this}var a=e.jQuery,u=e.console,h=u!==void 0,d=Object.prototype.toString;s.prototype=new t,s.prototype.options={},s.prototype.getImages=function(){this.images=[];for(var e=0,t=this.elements.length;t>e;e++){var n=this.elements[e];"IMG"===n.nodeName&&this.addImage(n);var i=n.nodeType;if(i&&(1===i||9===i||11===i))for(var r=n.querySelectorAll("img"),o=0,s=r.length;s>o;o++){var f=r[o];this.addImage(f)}}},s.prototype.addImage=function(e){var t=new f(e);this.images.push(t)},s.prototype.check=function(){function e(e,r){return t.options.debug&&h&&u.log("confirm",e,r),t.progress(e),n++,n===i&&t.complete(),!0}var t=this,n=0,i=this.images.length;if(this.hasAnyBroken=!1,!i)return this.complete(),void 0;for(var r=0;i>r;r++){var o=this.images[r];o.on("confirm",e),o.check()}},s.prototype.progress=function(e){this.hasAnyBroken=this.hasAnyBroken||!e.isLoaded;var t=this;setTimeout(function(){t.emit("progress",t,e),t.jqDeferred&&t.jqDeferred.notify&&t.jqDeferred.notify(t,e)})},s.prototype.complete=function(){var e=this.hasAnyBroken?"fail":"done";this.isComplete=!0;var t=this;setTimeout(function(){if(t.emit(e,t),t.emit("always",t),t.jqDeferred){var n=t.hasAnyBroken?"reject":"resolve";t.jqDeferred[n](t)}})},a&&(a.fn.imagesLoaded=function(e,t){var n=new s(this,e,t);return n.jqDeferred.promise(a(this))}),f.prototype=new t,f.prototype.check=function(){var e=v[this.img.src]||new c(this.img.src);if(e.isConfirmed)return this.confirm(e.isLoaded,"cached was confirmed"),void 0;if(this.img.complete&&void 0!==this.img.naturalWidth)return this.confirm(0!==this.img.naturalWidth,"naturalWidth"),void 0;var t=this;e.on("confirm",function(e,n){return t.confirm(e.isLoaded,n),!0}),e.check()},f.prototype.confirm=function(e,t){this.isLoaded=e,this.emit("confirm",this,t)};var v={};return c.prototype=new t,c.prototype.check=function(){if(!this.isChecked){var e=new Image;n.bind(e,"load",this),n.bind(e,"error",this),e.src=this.src,this.isChecked=!0}},c.prototype.handleEvent=function(e){var t="on"+e.type;this[t]&&this[t](e)},c.prototype.onload=function(e){this.confirm(!0,"onload"),this.unbindProxyEvents(e)},c.prototype.onerror=function(e){this.confirm(!1,"onerror"),this.unbindProxyEvents(e)},c.prototype.confirm=function(e,t){this.isConfirmed=!0,this.isLoaded=e,this.emit("confirm",this,t)},c.prototype.unbindProxyEvents=function(e){n.unbind(e.target,"load",this),n.unbind(e.target,"error",this)},s}); \ No newline at end of file diff --git a/assets/scss/_theme-settings.scss b/assets/scss/_theme-settings.scss index 53d5d85..1bb92de 100644 --- a/assets/scss/_theme-settings.scss +++ b/assets/scss/_theme-settings.scss @@ -23,9 +23,10 @@ $primary-color: $color-main-contrast; $row-width: rem-calc(800); $body-font-family: $main-font; -$header-font-family: $headers-font; +$header-font-family: $headers-font; $header-font-weight: 700; +$header-font-color: $color-main-dark; $paragraph-font-size: 1.125rem; $paragraph-line-height: 1.7; diff --git a/assets/scss/style.scss b/assets/scss/style.scss index 395fb28..4d4700a 100644 --- a/assets/scss/style.scss +++ b/assets/scss/style.scss @@ -493,6 +493,8 @@ body { // document borders .rborder, .lborder, .tborder, .bborder { background: $color-main-dark; + -webkit-transform: translateZ(0); + transform: translateZ(0); } .rborder, .lborder { position: fixed; @@ -544,6 +546,8 @@ body { top: 0; left: 0; background: rgba($color-main-dark, .9); + -webkit-user-select: none; + user-select: none; /* main-menu-ovrl closing cross */ .main-menu-ovrl-close { font-size: rem-calc(60); @@ -557,6 +561,8 @@ body { outline: none; z-index: 100; cursor: pointer; + -webkit-user-select: none; + user-select: none; } /* Menu style */ nav { @@ -574,6 +580,8 @@ body { display: inline-block; height: 100%; position: relative; + -webkit-user-select: none; + user-select: none; li { display: block; height: 20%; diff --git a/author.hbs b/author.hbs index 47c9af7..9098dfd 100644 --- a/author.hbs +++ b/author.hbs @@ -3,9 +3,6 @@ {{! Everything inside the #author tags pulls data from the author }} {{#author}} - {{! facebook and twitter meta data config partial}} - {{> open-graph-twitter}} -