From 3a5fa9959bdeb69317a0c463e8de74756da3a451 Mon Sep 17 00:00:00 2001 From: kimberli Date: Mon, 11 Aug 2014 00:39:34 -0700 Subject: [PATCH] Screw this --- assets/css/style.css | 61 ++++++++++++---------------------- assets/img/arrow-left.svg | 30 ----------------- assets/img/stack.svg | 70 +++++++++++++++++++++++++++++++++++++++ assets/img/test.html | 46 +++++++++++++++++++++++++ assets/js/script.js | 7 +--- assets/js/script.min.js | 2 +- index.html | 59 +++++++++++++++++++-------------- 7 files changed, 173 insertions(+), 102 deletions(-) create mode 100644 assets/img/stack.svg create mode 100644 assets/img/test.html diff --git a/assets/css/style.css b/assets/css/style.css index bfb8bf4..4a632aa 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -52,7 +52,7 @@ a { #content-outer-box { height: 100%; - margin-bottom: -40px; + margin-bottom: -36px; } #content-box { position: relative; @@ -85,53 +85,37 @@ a { margin: auto; text-align: center; } -.sm-pic { +.sm-link { position: absolute; - width: 50px; - height: 50px; - background-size: 50px !important; - background-repeat: no-repeat; left: 6px; top: 5px; + width: 50px; + height: 50px; + display: block; } -#email { - background: url('../img/email.svg'); -} -#linkedin { - background: url('../img/linkedin.svg'); -} -#github { - background: url('../img/github.svg'); -} -#resume { - background: url('../img/resume.svg'); -} -#email:hover { - background: url('../img/email_hover.svg'); -} -#linkedin:hover { - background: url('../img/linkedin_hover.svg'); -} -#github:hover { - background: url('../img/github_hover.svg'); +.sm-pic { + width: 100%; + height: 100%; + pointer-events: none; } -#resume:hover { - background: url('../img/resume_hover.svg'); +#stack:hover { + fill:black; } .footer { text-align: center; -} -.footnote { - text-decoration: none; font-family: 'Arvo', sans-serif; font-size: 14px; + color: #ffa68f; +} +.footer a { + text-decoration: none; } -.footnote:link { +.footer a:link { color: #ffa68f; } -.footnote:visited, -.footnote:hover, -.footnote:active { +.footer a:visited, +.footer a:hover, +.footer a:active { color: #fff9c8; } @@ -326,10 +310,8 @@ path { height: 50%; } .border-svg { - position: relative; - right: 0px; - top: -8px; height: 6px; + right: 0; width: 100%; } #content-box { @@ -375,10 +357,9 @@ path { width: 35px; height: 35px; } - .sm-pic { + .sm-link { width: 25px; height: 25px; - background-size: 25px !important; } .sm-path { stroke-width: 2px; diff --git a/assets/img/arrow-left.svg b/assets/img/arrow-left.svg index 49b3125..6aa3a3f 100644 --- a/assets/img/arrow-left.svg +++ b/assets/img/arrow-left.svg @@ -11,34 +11,4 @@ L7.657,19.557z"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/assets/img/stack.svg b/assets/img/stack.svg new file mode 100644 index 0000000..e92c7ab --- /dev/null +++ b/assets/img/stack.svg @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/img/test.html b/assets/img/test.html new file mode 100644 index 0000000..d6ecbf9 --- /dev/null +++ b/assets/img/test.html @@ -0,0 +1,46 @@ + + + + + +SVG Sprite Demonstration + + + + + + + + + +
+ +
+ + + + + + + + +

CSS background

+
+ + + \ No newline at end of file diff --git a/assets/js/script.js b/assets/js/script.js index 6388ef5..85f5bf3 100644 --- a/assets/js/script.js +++ b/assets/js/script.js @@ -21,12 +21,7 @@ function adjust() { var divHeight = $('#content-box').outerHeight(true)/2; var boxHeight = $('#content').outerHeight(true)/2; - if( $(this).width() <= 400 ) { - $('#content-box').css({top: Math.round(boxHeight-divHeight-20)}); - } - else { - $('#content-box').css({top: Math.round(boxHeight-divHeight)}); - } + $('#content-box').css({top: Math.round(boxHeight-divHeight)}); } // Run adjust() for the first time diff --git a/assets/js/script.min.js b/assets/js/script.min.js index 69feeaa..3144089 100644 --- a/assets/js/script.min.js +++ b/assets/js/script.min.js @@ -1 +1 @@ -function adjust(){$(this).width()<=1024?($("#content").remove().insertAfter($("#visual")),$(".border-path").attr("d","M0 2 L"+$("#content").outerWidth(!0)+" 2 Z"),$(this).width()<=728?($(".img-path").attr("d","M4,55a52,52 0 1,0 104,0a52,52 0 1,0 -104,0"),$(".sm-path").attr("d","M8,17a11,11 0 1,0 22,0a11,11 0 1,0 -22,0"),$(".sm-path.opp").attr("d","M30,17a11,11 0 1,0 -22,0a11,11 0 1,0 22,0")):($(".img-path").attr("d","M5,85a77,77 0 1,0 154,0a77,77 0 1,0 -154,0"),$(".sm-path").attr("d","M5,30a23,23 0 1,0 46,0a23,23 0 1,0 -46,0"),$(".sm-path.opp").attr("d","M51,30a23,23 0 1,0 -46,0a23,23 0 1,0 46,0"))):($("#visual").remove().insertAfter($("#content")),$(".border-path").attr("d","M2 0 L2 "+$("#content").outerHeight(!0)+" Z"));var e=$("#content-box").outerHeight(!0)/2,t=$("#content").outerHeight(!0)/2;$("#content-box").css($(this).width()<=400?{top:Math.round(t-e-20)}:{top:Math.round(t-e)})}adjust(),$(window).load(function(){$("#loader").css("background","none"),$("#container").css("opacity",1),$("#slider").leanSlider({directionNav:"#slider-direction-nav",controlNav:"#slider-control-nav"}),setTimeout(function(){$('')},5e3)}),function(e,t){var n=function(e,t,n){var a;return function(){function i(){n||e.apply(r,o),a=null}var r=this,o=arguments;a?clearTimeout(a):n&&e.apply(r,o),a=setTimeout(i,t||100)}};jQuery.fn[t]=function(e){return e?this.bind("resize",n(e)):this.trigger(t)}}(jQuery,"smartresize"),$(window).smartresize(function(){adjust()}),function(e){"use strict";function t(e){return new RegExp("(^|\\s+)"+e+"(\\s+|$)")}function n(e,t){var n=a(e,t)?r:i;n(e,t)}var a,i,r;"classList"in document.documentElement?(a=function(e,t){return e.classList.contains(t)},i=function(e,t){e.classList.add(t)},r=function(e,t){e.classList.remove(t)}):(a=function(e,n){return t(n).test(e.className)},i=function(e,t){a(e,t)||(e.className=e.className+" "+t)},r=function(e,n){e.className=e.className.replace(t(n)," ")});var o={hasClass:a,addClass:i,removeClass:r,toggleClass:n,has:a,add:i,remove:r,toggle:n};"function"==typeof define&&define.amd?define(o):e.classie=o}(window),function(){"use strict";function e(){[].slice.call(document.querySelectorAll("path")).forEach(function(e,t){c[t]=e;var n=c[t].getTotalLength();l[t]=n,c[t].style.strokeDasharray=n+" "+n,c[t].style.strokeDashoffset=n})}function t(){var e=o/s;if(e>1)window.cancelAnimFrame(d),n();else{o++;for(var a=0;a=o.length)&&(s=0),e(o[s]).addClass("current"),i.directionNav&&e(i.directionNav).length){var c=e(''+i.prevText+""),l=e(''+i.nextText+"");i.directionNavPrevBuilder&&(c=e(i.directionNavPrevBuilder.call(this,i.prevText))),i.directionNavNextBuilder&&(l=e(i.directionNavNextBuilder.call(this,i.nextText))),c.on("click",function(e){e.preventDefault(),a.prev()}),l.on("click",function(e){e.preventDefault(),a.next()}),e(i.directionNav).append(c),e(i.directionNav).append(l)}return i.controlNav&&e(i.controlNav).length&&o.each(function(t){var n=e(''+(t+1)+"");i.controlNavBuilder&&(n=e(i.controlNavBuilder.call(this,t,e(o[t])))),n.on("click",function(e){e.preventDefault(),a.show(t)}),e(i.controlNav).append(n)}),u(),d(),i.afterLoad.call(this),a},d=function(){i.pauseTime&&i.pauseTime>0&&(clearTimeout(c),c=setTimeout(function(){a.next()},i.pauseTime))},u=function(){i.controlNav&&(e(".lean-slider-control-nav",i.controlNav).removeClass("active"),e(e(".lean-slider-control-nav",i.controlNav).get(s)).addClass("active"))};return a.prev=function(){i.beforeChange.call(this,s),s--,0>s&&(s=o.length-1),o.removeClass("current"),e(o[s]).addClass("current"),u(),d(),i.afterChange.call(this,s)},a.next=function(){i.beforeChange.call(this,s),s++,s>=o.length&&(s=0),o.removeClass("current"),e(o[s]).addClass("current"),u(),d(),i.afterChange.call(this,s)},a.show=function(t){i.beforeChange.call(this,s),s=t,0>s&&(s=o.length-1),s>=o.length&&(s=0),o.removeClass("current"),e(o[s]).addClass("current"),u(),d(),i.afterChange.call(this,s)},l()}}(jQuery); \ No newline at end of file +function adjust(){$(this).width()<=1024?($("#content").remove().insertAfter($("#visual")),$(".border-path").attr("d","M0 2 L"+$("#content").outerWidth(!0)+" 2 Z"),$(this).width()<=728?($(".img-path").attr("d","M4,55a52,52 0 1,0 104,0a52,52 0 1,0 -104,0"),$(".sm-path").attr("d","M8,17a11,11 0 1,0 22,0a11,11 0 1,0 -22,0"),$(".sm-path.opp").attr("d","M30,17a11,11 0 1,0 -22,0a11,11 0 1,0 22,0")):($(".img-path").attr("d","M5,85a77,77 0 1,0 154,0a77,77 0 1,0 -154,0"),$(".sm-path").attr("d","M5,30a23,23 0 1,0 46,0a23,23 0 1,0 -46,0"),$(".sm-path.opp").attr("d","M51,30a23,23 0 1,0 -46,0a23,23 0 1,0 46,0"))):($("#visual").remove().insertAfter($("#content")),$(".border-path").attr("d","M2 0 L2 "+$("#content").outerHeight(!0)+" Z"));var e=$("#content-box").outerHeight(!0)/2,t=$("#content").outerHeight(!0)/2;$("#content-box").css({top:Math.round(t-e)})}adjust(),$(window).load(function(){$("#loader").css("background","none"),$("#container").css("opacity",1),$("#slider").leanSlider({directionNav:"#slider-direction-nav",controlNav:"#slider-control-nav"}),setTimeout(function(){$('')},5e3)}),function(e,t){var n=function(e,t,n){var a;return function(){function i(){n||e.apply(r,o),a=null}var r=this,o=arguments;a?clearTimeout(a):n&&e.apply(r,o),a=setTimeout(i,t||100)}};jQuery.fn[t]=function(e){return e?this.bind("resize",n(e)):this.trigger(t)}}(jQuery,"smartresize"),$(window).smartresize(function(){adjust()}),function(e){"use strict";function t(e){return new RegExp("(^|\\s+)"+e+"(\\s+|$)")}function n(e,t){var n=a(e,t)?r:i;n(e,t)}var a,i,r;"classList"in document.documentElement?(a=function(e,t){return e.classList.contains(t)},i=function(e,t){e.classList.add(t)},r=function(e,t){e.classList.remove(t)}):(a=function(e,n){return t(n).test(e.className)},i=function(e,t){a(e,t)||(e.className=e.className+" "+t)},r=function(e,n){e.className=e.className.replace(t(n)," ")});var o={hasClass:a,addClass:i,removeClass:r,toggleClass:n,has:a,add:i,remove:r,toggle:n};"function"==typeof define&&define.amd?define(o):e.classie=o}(window),function(){"use strict";function e(){[].slice.call(document.querySelectorAll("path")).forEach(function(e,t){c[t]=e;var n=c[t].getTotalLength();l[t]=n,c[t].style.strokeDasharray=n+" "+n,c[t].style.strokeDashoffset=n})}function t(){var e=o/s;if(e>1)window.cancelAnimFrame(d),n();else{o++;for(var a=0;a=o.length)&&(s=0),e(o[s]).addClass("current"),i.directionNav&&e(i.directionNav).length){var c=e(''+i.prevText+""),l=e(''+i.nextText+"");i.directionNavPrevBuilder&&(c=e(i.directionNavPrevBuilder.call(this,i.prevText))),i.directionNavNextBuilder&&(l=e(i.directionNavNextBuilder.call(this,i.nextText))),c.on("click",function(e){e.preventDefault(),a.prev()}),l.on("click",function(e){e.preventDefault(),a.next()}),e(i.directionNav).append(c),e(i.directionNav).append(l)}return i.controlNav&&e(i.controlNav).length&&o.each(function(t){var n=e(''+(t+1)+"");i.controlNavBuilder&&(n=e(i.controlNavBuilder.call(this,t,e(o[t])))),n.on("click",function(e){e.preventDefault(),a.show(t)}),e(i.controlNav).append(n)}),u(),d(),i.afterLoad.call(this),a},d=function(){i.pauseTime&&i.pauseTime>0&&(clearTimeout(c),c=setTimeout(function(){a.next()},i.pauseTime))},u=function(){i.controlNav&&(e(".lean-slider-control-nav",i.controlNav).removeClass("active"),e(e(".lean-slider-control-nav",i.controlNav).get(s)).addClass("active"))};return a.prev=function(){i.beforeChange.call(this,s),s--,0>s&&(s=o.length-1),o.removeClass("current"),e(o[s]).addClass("current"),u(),d(),i.afterChange.call(this,s)},a.next=function(){i.beforeChange.call(this,s),s++,s>=o.length&&(s=0),o.removeClass("current"),e(o[s]).addClass("current"),u(),d(),i.afterChange.call(this,s)},a.show=function(t){i.beforeChange.call(this,s),s=t,0>s&&(s=o.length-1),s>=o.length&&(s=0),o.removeClass("current"),e(o[s]).addClass("current"),u(),d(),i.afterChange.call(this,s)},l()}}(jQuery); \ No newline at end of file diff --git a/index.html b/index.html index e529c49..170498e 100644 --- a/index.html +++ b/index.html @@ -5,7 +5,7 @@ - + @@ -20,6 +20,25 @@ +
@@ -48,32 +67,40 @@ - + + +
- + + +
- + + +
- + + +
- Powered by Java* +

Powered by Java*

@@ -88,24 +115,6 @@
- - + \ No newline at end of file