"!==k[1]||lb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)n.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}n.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),l.appendChecked||n.grep(vb(p,"input"),wb),q=0;while(f=p[q++])if((!d||-1===n.inArray(f,d))&&(g=n.contains(f.ownerDocument,f),h=vb(o.appendChild(f),"script"),g&&Ab(h),c)){e=0;while(f=h[e++])pb.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=n.expando,j=n.cache,k=l.deleteExpando,m=n.event.special;null!=(d=a[h]);h++)if((b||n.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)m[e]?n.event.remove(d,e):n.removeEvent(d,e,g.handle);j[f]&&(delete j[f],k?delete d[i]:typeof d.removeAttribute!==L?d.removeAttribute(i):d[i]=null,c.push(f))}}}),n.fn.extend({text:function(a){return W(this,function(a){return void 0===a?n.text(this):this.empty().append((this[0]&&this[0].ownerDocument||z).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=xb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=xb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(vb(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&Ab(vb(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&n.cleanData(vb(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&n.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return W(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(gb,""):void 0;if(!("string"!=typeof a||nb.test(a)||!l.htmlSerialize&&hb.test(a)||!l.leadingWhitespace&&ib.test(a)||sb[(kb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(jb,"<$1>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(vb(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(vb(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,k=this.length,m=this,o=k-1,p=a[0],q=n.isFunction(p);if(q||k>1&&"string"==typeof p&&!l.checkClone&&ob.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(k&&(i=n.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=n.map(vb(i,"script"),yb),f=g.length;k>j;j++)d=i,j!==o&&(d=n.clone(d,!0,!0),f&&n.merge(g,vb(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,n.map(g,zb),j=0;f>j;j++)d=g[j],pb.test(d.type||"")&&!n._data(d,"globalEval")&&n.contains(h,d)&&(d.src?n._evalUrl&&n._evalUrl(d.src):n.globalEval((d.text||d.textContent||d.innerHTML||"").replace(rb,"")));i=c=null}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=0,e=[],g=n(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),n(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Db,Eb={};function Fb(b,c){var d=n(c.createElement(b)).appendTo(c.body),e=a.getDefaultComputedStyle?a.getDefaultComputedStyle(d[0]).display:n.css(d[0],"display");return d.detach(),e}function Gb(a){var b=z,c=Eb[a];return c||(c=Fb(a,b),"none"!==c&&c||(Db=(Db||n("")).appendTo(b.documentElement),b=(Db[0].contentWindow||Db[0].contentDocument).document,b.write(),b.close(),c=Fb(a,b),Db.detach()),Eb[a]=c),c}!function(){var a,b,c=z.createElement("div"),d="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;padding:0;margin:0;border:0";c.innerHTML=" a
",e.firstChild.style.width="5px",b=3!==e.offsetWidth),a.removeChild(c),a=c=e=null}return b}}();var Hb=/^margin/,Ib=new RegExp("^("+T+")(?!px)[a-z%]+$","i"),Jb,Kb,Lb=/^(top|right|bottom|left)$/;a.getComputedStyle?(Jb=function(a){return a.ownerDocument.defaultView.getComputedStyle(a,null)},Kb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Jb(a),g=c?c.getPropertyValue(b)||c[b]:void 0,c&&(""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),Ib.test(g)&&Hb.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0===g?g:g+""}):z.documentElement.currentStyle&&(Jb=function(a){return a.currentStyle},Kb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Jb(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Ib.test(g)&&!Lb.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function Mb(a,b){return{get:function(){var c=a();if(null!=c)return c?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d,e,f,g,h=z.createElement("div"),i="border:0;width:0;height:0;position:absolute;top:0;left:-9999px",j="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;padding:0;margin:0;border:0";h.innerHTML=" a a a ").append(n.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};var dd=a.document.documentElement;function ed(a){return n.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&n.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,n.contains(b,e)?(typeof e.getBoundingClientRect!==L&&(d=e.getBoundingClientRect()),c=ed(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===n.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(c=a.offset()),c.top+=n.css(a[0],"borderTopWidth",!0),c.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-n.css(d,"marginTop",!0),left:b.left-c.left-n.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||dd;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||dd})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);n.fn[a]=function(d){return W(this,function(a,d,e){var f=ed(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?n(f).scrollLeft():e,c?e:n(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=Mb(l.pixelPosition,function(a,c){return c?(c=Kb(a,b),Ib.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return W(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var fd=a.jQuery,gd=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=gd),b&&a.jQuery===n&&(a.jQuery=fd),n},typeof b===L&&(a.jQuery=a.$=n),n});
\ No newline at end of file
diff --git a/source/index.haml b/source/index.haml
index dd5d3df..357a358 100644
--- a/source/index.haml
+++ b/source/index.haml
@@ -3,29 +3,35 @@ title: A Fresh Start
---
.row
- .col-md-8
+ .col-md-10.col-md-offset-1.col-sm-12
+ .row
+ .col-md-12
+ .media
+ = tag :img, src: '/assets/img/star_nasa.jpg', class:'media-object'
+ .row
+ .col-md-8
- %h2 I’m Mark Moser, your digital handyman.
+ %h2 I’m Mark Moser, your digital handyman.
- %p
- I’m most fond of working in video post production: editing, compositing, and
- motion graphics. I’m all set up for your HD video needs or putting together that
- web video you are dreaming up. I can either be your “one man band” for those smaller
- productions, put together a killer team when you need even greater production value,
- or be the go-to post production guy you call to join your existing team.
+ %p
+ I’m most fond of working in video post production: editing, compositing, and
+ motion graphics. I’m all set up for your HD video needs or putting together that
+ web video you are dreaming up. I can either be your “one man band” for those smaller
+ productions, put together a killer team when you need even greater production value,
+ or be the go-to post production guy you call to join your existing team.
- %p
- I have experience shooting interviews and putting together short informational
- videos. I am very comfortable in the whole Adobe Production Suite of tools. I also
- work with wordpress, developing themes and custom plugins to accomplish tasks not
- quite covered in the base install.
+ %p
+ I have experience shooting interviews and putting together short informational
+ videos. I am very comfortable in the whole Adobe Production Suite of tools. I also
+ work with wordpress, developing themes and custom plugins to accomplish tasks not
+ quite covered in the base install.
- %p
- I want to do great work, with people who also do great work. I love to explore and
- learn about my world. I enjoy being challenged. I take pleasure in providing creative
- solutions to specific needs, always keeping the bigger picture in mind. I was raised to
- work hard and play hard. I have a high value for quality
- craftsmanship and look forward to getting my hands dirty realizing your vision.
+ %p
+ I want to do great work, with people who also do great work. I love to explore and
+ learn about my world. I enjoy being challenged. I take pleasure in providing creative
+ solutions to specific needs, always keeping the bigger picture in mind. I was raised to
+ work hard and play hard. I have a high value for quality
+ craftsmanship and look forward to getting my hands dirty realizing your vision.
- .col-md-4
- = partial "partials/side_list"
+ .col-md-4
+ = partial "partials/side_list"
diff --git a/source/layouts/layout.html.haml b/source/layouts/layout.html.haml
index df725d7..ff139a7 100644
--- a/source/layouts/layout.html.haml
+++ b/source/layouts/layout.html.haml
@@ -17,8 +17,9 @@
%body{class: page_classes}
/[if lt IE 8]
partial "partials/compatibility-notice"
+ .wrapper
= partial "partials/header"
.container-fluid
= yield
- = partial "partials/footer"
- = javascript_include_tag "app"
+ = partial "partials/footer"
+ = javascript_include_tag "app"
diff --git a/source/partials/_footer.haml b/source/partials/_footer.haml
index d709d54..31ec94a 100644
--- a/source/partials/_footer.haml
+++ b/source/partials/_footer.haml
@@ -1,7 +1,7 @@
%footer
- %p
- =link_to 'main', '/'
- ·
- = link_to 'projects', 'video'
- %p= mail_to 'mmoser@fullsight.com'
- %p 309.363.4474
+ .container-fluid
+ .row
+ .col-md-10.col-md-offset-1.col-sm-12
+
+ -# .text-center
+ -# %p= mail_to 'mmoser@fullsight.com'
diff --git a/source/partials/_header.haml b/source/partials/_header.haml
index 7b160d2..3b17691 100644
--- a/source/partials/_header.haml
+++ b/source/partials/_header.haml
@@ -1,18 +1,27 @@
-%nav.navbar.navbar-default{:role => "navigation"}
+%header
.container-fluid
- / Brand and toggle get grouped for better mobile display
- .navbar-header
- %button.navbar-toggle.collapsed{"data-target" => "#bs-example-navbar-collapse-1", "data-toggle" => "collapse", :type => "button"}
- %span.sr-only Toggle navigation
- %span.icon-bar
- %span.icon-bar
- %span.icon-bar
- %a.navbar-brand{:href => "/"}
- = tag :img, src: '/assets/img/ObleyMirror_100.jpg'
- / Collect the nav links, forms, and other content for toggling
- #bs-example-navbar-collapse-1.collapse.navbar-collapse
- %ul.nav.navbar-nav
- %li.active
- %a{:href => "#"} Link
- %li
- %a{:href => "#"} Link
+ .row
+ .col-md-10.col-md-offset-1.col-sm-12
+ %nav
+ %ul
+ %li
+ %a{href: '/'}
+ -# = tag :img, src: '/assets/img/ObleyMirror_100.jpg', alt: 'Mark Moser Mirror'
+ home
+ %li
+ %a{href: "video"} video
+ %li
+ %a{href: "#"} contact
+
+ %ul.social
+ :ruby
+ social_links = {
+ 'fa-linkedin-square' => 'http://linkedin.com/in/markamoser/',
+ 'fa-twitter' => 'https://twitter.com/obley',
+ 'fa-github' => 'https://github.com/markmoser',
+ 'fa-bitbucket' => 'https://bitbucket.org/markamoser',
+ }
+ - social_links.each do |k,v|
+ %li
+ = link_to "#{v}" do
+ %i.fa.fa-lg{class: "#{k}"}
diff --git a/source/partials/_side_list.haml b/source/partials/_side_list.haml
index f353d9b..810d01b 100644
--- a/source/partials/_side_list.haml
+++ b/source/partials/_side_list.haml
@@ -32,9 +32,3 @@
%li
free cloud storage from
= link_to 'dropbox', 'https://www.getdropbox.com/referrals/NTUzODQzOQ'
-
-%ul
- %li TEMPLATE TEMP
- %li= link_to 'blogin', 'blogin'
- %li= link_to 'blogin-sidebar', 'blogin/article.html'
- %li= link_to 'crafty', 'crafty'