diff --git a/_includes/header.html b/_includes/header.html index 4173899..c6aafc7 100755 --- a/_includes/header.html +++ b/_includes/header.html @@ -21,7 +21,6 @@ - diff --git a/assets/js/init.js b/assets/js/init.js index 0c5f0af..4e25933 100755 --- a/assets/js/init.js +++ b/assets/js/init.js @@ -11,13 +11,13 @@ skel.init({ reset: 'full', breakpoints: { - global: { range: '*', href: '{{ site.baseurl }}/assets/css/style.css', containers: 1400, grid: { gutters: 50 } }, - wide: { range: '-1680', href: '{{ site.baseurl }}/assets/css/style-wide.css', containers: 1200, grid: { gutters: 40 } }, - normal: { range: '-1280', href: '{{ site.baseurl }}/assets/css/style-normal.css', containers: 960, grid: { gutters: 30 }, viewport: { scalable: false } }, - narrow: { range: '-980', href: '{{ site.baseurl }}/assets/css/style-narrow.css', containers: '95%', grid: { gutters: 20 } }, - narrower: { range: '-840', href: '{{ site.baseurl }}/assets/css/style-narrower.css', grid: { collapse: 1 } }, - mobile: { range: '-736', href: '{{ site.baseurl }}/assets/css/style-mobile.css', containers: '90%', grid: { gutters: 15 } }, - mobilep: { range: '-480', href: '{{ site.baseurl }}/assets/css/style-mobilep.css', grid: { collapse: 2 }, containers: '100%' } + global: { range: '*', href: '{{ site.baseurl }}/assets/sass/style.css', containers: 1400, grid: { gutters: 50 } }, + wide: { range: '-1680', href: '{{ site.baseurl }}/assets/sass/style-wide.css', containers: 1200, grid: { gutters: 40 } }, + normal: { range: '-1280', href: '{{ site.baseurl }}/assets/sass/style-normal.css', containers: 960, grid: { gutters: 30 }, viewport: { scalable: false } }, + narrow: { range: '-980', href: '{{ site.baseurl }}/assets/sass/style-narrow.css', containers: '95%', grid: { gutters: 20 } }, + narrower: { range: '-840', href: '{{ site.baseurl }}/assets/sass/style-narrower.css', grid: { collapse: 1 } }, + mobile: { range: '-736', href: '{{ site.baseurl }}/assets/sass/style-mobile.css', containers: '90%', grid: { gutters: 15 } }, + mobilep: { range: '-480', href: '{{ site.baseurl }}/assets/sass/style-mobilep.css', grid: { collapse: 2 }, containers: '100%' } }, plugins: { layers: { @@ -52,21 +52,21 @@ // Disable animations/transitions until the page has loaded. $body.addClass('is-loading'); - + $window.on('load', function() { $body.removeClass('is-loading'); }); - + // Forms (IE<10). var $form = $('form'); if ($form.length > 0) { - + $form.find('.form-button-submit') .on('click', function() { $(this).parents('form').submit(); return false; }); - + if (skel.vars.IEVersion < 10) { $.fn.n33_formerize=function(){var _fakes=new Array(),_form = $(this);_form.find('input[type=text],textarea').each(function() { var e = $(this); if (e.val() == '' || e.val() == e.attr('placeholder')) { e.addClass('formerize-placeholder'); e.val(e.attr('placeholder')); } }).blur(function() { var e = $(this); if (e.attr('name').match(/_fakeformerizefield$/)) return; if (e.val() == '') { e.addClass('formerize-placeholder'); e.val(e.attr('placeholder')); } }).focus(function() { var e = $(this); if (e.attr('name').match(/_fakeformerizefield$/)) return; if (e.val() == e.attr('placeholder')) { e.removeClass('formerize-placeholder'); e.val(''); } }); _form.find('input[type=password]').each(function() { var e = $(this); var x = $($('
').append(e.clone()).remove().html().replace(/type="password"/i, 'type="text"').replace(/type=password/i, 'type=text')); if (e.attr('id') != '') x.attr('id', e.attr('id') + '_fakeformerizefield'); if (e.attr('name') != '') x.attr('name', e.attr('name') + '_fakeformerizefield'); x.addClass('formerize-placeholder').val(x.attr('placeholder')).insertAfter(e); if (e.val() == '') e.hide(); else x.hide(); e.blur(function(event) { event.preventDefault(); var e = $(this); var x = e.parent().find('input[name=' + e.attr('name') + '_fakeformerizefield]'); if (e.val() == '') { e.hide(); x.show(); } }); x.focus(function(event) { event.preventDefault(); var x = $(this); var e = x.parent().find('input[name=' + x.attr('name').replace('_fakeformerizefield', '') + ']'); x.hide(); e.show().focus(); }); x.keypress(function(event) { event.preventDefault(); x.val(''); }); }); _form.submit(function() { $(this).find('input[type=text],input[type=password],textarea').each(function(event) { var e = $(this); if (e.attr('name').match(/_fakeformerizefield$/)) e.attr('name', ''); if (e.val() == e.attr('placeholder')) { e.removeClass('formerize-placeholder'); e.val(''); } }); }).bind("reset", function(event) { event.preventDefault(); $(this).find('select').val($('option:first').val()); $(this).find('input,textarea').each(function() { var e = $(this); var x; e.removeClass('formerize-placeholder'); switch (this.type) { case 'submit': case 'reset': break; case 'password': e.val(e.attr('defaultValue')); x = e.parent().find('input[name=' + e.attr('name') + '_fakeformerizefield]'); if (e.val() == '') { e.hide(); x.show(); } else { e.show(); x.hide(); } break; case 'checkbox': case 'radio': e.attr('checked', e.attr('defaultValue')); break; case 'text': case 'textarea': e.val(e.attr('defaultValue')); if (e.val() == '') { e.addClass('formerize-placeholder'); e.val(e.attr('placeholder')); } break; default: e.val(e.attr('defaultValue')); break; } }); window.setTimeout(function() { for (x in _fakes) _fakes[x].trigger('formerize_sync'); }, 10); }); return _form; }; $form.n33_formerize(); @@ -83,4 +83,4 @@ }); -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/assets/sass/style.scss b/assets/sass/style.scss index a5ebf74..3e00875 100755 --- a/assets/sass/style.scss +++ b/assets/sass/style.scss @@ -19,7 +19,6 @@ body, #skel-layers-wrapper { - background: $color-bg url('../css/images/bg01.png'); } body { @@ -281,7 +280,6 @@ text-align: center; cursor: default; background-color: $color-accent-bg; - @include vendor-value('background-image', 'linear-gradient(top, rgba(0,0,0,0), rgba(0,0,0,0.15)), url("../css/images/bg01.png")'); color: $color-accent-fg; border-radius: 100%; display: inline-block; @@ -416,7 +414,6 @@ thead { background-color: #555555; - @include vendor-value('background-image', 'linear-gradient(top, rgba(0,0,0,0), rgba(0,0,0,0.15)), url("../css/images/bg01.png")'); color: #fff; } @@ -437,7 +434,6 @@ @include vendor-property('appearance', 'none'); @include vendor-property('transition', 'background-color 0.2s ease-in-out, color 0.2s ease-in-out, box-shadow 0.2s ease-in-out'); background-color: $color-accent-bg; - @include vendor-value('background-image', 'linear-gradient(top, rgba(0,0,0,0), rgba(0,0,0,0.15)), url("../css/images/bg01.png")'); border-radius: $size-radius; border: 0; color: $color-accent-fg; @@ -527,7 +523,6 @@ text-align: center; padding: 3em 0 0 0; background-color: #fff; - background-image: url('../css/images/bg02.png'), url('../css/images/bg02.png'), url('../css/images/bg01.png'); background-position: top left, top left, top left; background-size: 100% 6em, 100% 6em, auto; background-repeat: no-repeat, no-repeat, repeat; @@ -547,7 +542,6 @@ #nav { cursor: default; background-color: #333; - @include vendor-value('background-image', 'linear-gradient(top, rgba(0,0,0,0), rgba(0,0,0,0.3)), url("../css/images/bg01.png")'); padding: 0; &:after { @@ -556,7 +550,6 @@ width: 100%; height: 0.75em; background-color: $color-accent-bg; - background-image: url("../css/images/bg01.png"); } > ul { @@ -599,7 +592,6 @@ left: 50%; margin-left: -0.375em; background-color: $color-accent-bg; - background-image: url("../css/images/bg01.png"); } a { @@ -624,7 +616,6 @@ .dropotron { background-color: #333; - @include vendor-value('background-image', 'linear-gradient(top, rgba(0,0,0,0.3), rgba(0,0,0,0)), url("../css/images/bg01.png")'); border-radius: $size-radius; color: #fff; min-width: 10em; @@ -715,7 +706,6 @@ &.style2 { background-color: #fff; - background-image: url('../css/images/bg02.png'), url('../css/images/bg03.png'), url('../css/images/bg01.png'); background-position: top left, bottom left, top left; background-size: 100% 6em, 100% 6em, auto; background-repeat: no-repeat, no-repeat, repeat; @@ -723,7 +713,6 @@ &.style3 { background-color: $color-accent-bg; - @include vendor-value('background-image', 'linear-gradient(top, rgba(0,0,0,0), rgba(0,0,0,0.15)), url("../css/images/bg01.png")'); color: $color-accent-fg; .button {