diff --git a/helpers/meta_helper.rb b/helpers/meta_helper.rb index c636789..3bc0137 100644 --- a/helpers/meta_helper.rb +++ b/helpers/meta_helper.rb @@ -27,3 +27,4 @@ def page_keywords keywords.uniq.join(", ") end + diff --git a/source/assets/css/all.scss b/source/assets/css/all.scss index 318b2ba..96c4074 100644 --- a/source/assets/css/all.scss +++ b/source/assets/css/all.scss @@ -3,16 +3,14 @@ @import "settings"; @import "imports"; -// div {border: 1px dashed orange;} - body { - background: $offwhite url(/assets/img/bg/subtle_white_feathers.png); + // background: $offwhite url(/assets/img/bg/white_wall_hash.png); color: $dark; font-family: $main_font; } header{ - background: $dark; + background: $dark; // url(/assets/img/bg/congruent_outline.png); color: $offwhite; width: 100%; height: auto; @@ -64,12 +62,30 @@ header a:hover { color: $accent_color; } -footer { - // background: $grey; - padding: 50px 0; - color: $offwhite; +.poster img { + width: 100%; } -footer a, footer a:hover{ - color: $offwhite; + + +.side-links { + text-align: right; + font-size: .85em; +} + +.side-links ul { + margin: 0 0 20px 0; + padding: 0; +} +.side-links ul li { + list-style: none; +} + +.side-links a { + color: $dark; + font-weight: bolder; +} + +.side-links a:hover{ + color: $accent_color; text-decoration: none; } diff --git a/source/assets/css/kinda_crafty.scss b/source/assets/css/kinda_crafty.scss deleted file mode 100644 index 318b2ba..0000000 --- a/source/assets/css/kinda_crafty.scss +++ /dev/null @@ -1,75 +0,0 @@ -@charset "utf-8"; - -@import "settings"; -@import "imports"; - -// div {border: 1px dashed orange;} - -body { - background: $offwhite url(/assets/img/bg/subtle_white_feathers.png); - color: $dark; - font-family: $main_font; -} - -header{ - background: $dark; - color: $offwhite; - width: 100%; - height: auto; - position: relative; -} - -header nav{ - overflow: hidden; - display: inline-block; - margin: 10px 0 0 0; - padding: 13px 0px; -} - -header ul{ - list-style: none; - margin-left: 0; - padding: 0; -} - -header ul li{ - float: left; - margin-left: 0; - font-size: 16px; - letter-spacing: 1px; -} - -header ul.social{ - position: absolute; - top: 13px; - right: 0px; - margin: 10px 0 0 0; -} - -header a { - text-decoration: none; - color: $offwhite; - padding: 0 10px; -} - -header a:hover { - color: $offwhite; - text-decoration: none; - border-bottom: 4px solid $accent_color; -} - -.social a:hover { - text-decoration: none; - border: none; - color: $accent_color; -} - -footer { - // background: $grey; - padding: 50px 0; - color: $offwhite; -} -footer a, footer a:hover{ - color: $offwhite; - text-decoration: none; -} diff --git a/source/contact/index.html.haml b/source/contact/index.html.haml new file mode 100644 index 0000000..6117ec0 --- /dev/null +++ b/source/contact/index.html.haml @@ -0,0 +1,65 @@ +--- +title: A Little About Me +poster: /assets/img/gulf_iss040e090540.jpg +--- + +.row + .col-sm-12 + %h2 Mark Moser - digital handyman + +.row + .col-sm-8 + %p + I’m a ruby developer exploring and learning everything I can about being a better + developer. This place is where I share my findings, explorations, and other creative + outlets. + + %p + I’m also fond of working in video post production: editing, compositing, and + motion graphics. 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. + I have experience shooting interviews and putting together short informational + videos. I am very comfortable in the whole Adobe Production Suite of tools. + + %p + I have a high value for quality craftsmanship. 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. + + .col-sm-4.side-links + -# = tag :img, src: '/assets/img/ObleyMirror_100.jpg', alt: 'Mark Moser Mirror' + -# %br + -# %br + + %ul + %li + = mail_to 'mmoser@fullsight.com' + + %ul + %li + some videos can be found on + = link_to 'vimeo', 'http://www.vimeo.com/mmoser' + %li + I occasionally play on + = link_to 'obleys.net', 'http://www.obleys.net' + %li + and sometimes + = link_to 'youtube', 'http://www.youtube.com/user/ObleyWan' + + %ul + %li + = link_to 'skype: fullsightstudios', 'skype:fullsightstudios?userinfo' + + %ul + %li + = link_to 'bluehost', 'http://www.bluehost.com/track/fullsight' + is my preferred shared web host + %li + = link_to 'digital ocean', 'https://www.digitalocean.com/?refcode=0d1758a3ccb2' + is my preferred vps host + %li + free cloud storage from + = link_to 'dropbox', 'https://www.getdropbox.com/referrals/NTUzODQzOQ' + diff --git a/source/index.haml b/source/index.haml index cc7e874..8a13858 100644 --- a/source/index.haml +++ b/source/index.haml @@ -1,27 +1,8 @@ --- title: A Fresh Start +poster: /assets/img/star_nasa.jpg --- .row - .col-md-10.col-md-offset-1.col-sm-12 - %h2 I’m Mark Moser, your digital handyman. + .col-sm-12 - %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 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. diff --git a/source/layouts/kinda_crafty.html.haml b/source/layouts/kinda_crafty.html.haml deleted file mode 100644 index 946e065..0000000 --- a/source/layouts/kinda_crafty.html.haml +++ /dev/null @@ -1,27 +0,0 @@ -!!! -/[if lt IE 7] -/ [if IE 7] "X-UA-Compatible"}/ - %meta{content: "width=device-width,initial-scale=1.0", name: "viewport"}/ - %meta{content: page_description, name: "description"}/ - %meta{content: page_keywords, name: "keywords"}/ - %title= page_title - = stylesheet_link_tag "kinda_crafty" - = javascript_include_tag "vendor/modernizr" - = partial "partials/analytics" - = yield_content :head - %body{class: page_classes} - /[if lt IE 8] - partial "partials/compatibility-notice" - .wrapper - .media - = tag :img, src: '/assets/img/star_nasa.jpg', class:'media-object' - = partial "partials/header" - .container-fluid - = yield - = partial "partials/footer" - = javascript_include_tag "app" diff --git a/source/layouts/layout.html.haml b/source/layouts/layout.html.haml index afe4a21..11dbaa2 100644 --- a/source/layouts/layout.html.haml +++ b/source/layouts/layout.html.haml @@ -2,7 +2,7 @@ /[if lt IE 7] / [if IE 7] "X-UA-Compatible"}/ @@ -12,12 +12,16 @@ %title= page_title = stylesheet_link_tag "all" = javascript_include_tag "vendor/modernizr" - = partial "partials/analytics" + = partial "shared/analytics" = yield_content :head %body{class: page_classes} /[if lt IE 8] - partial "partials/compatibility-notice" + partial "shared/compatibility-notice" + = partial "shared/header" + - if current_page.data.poster.present? + .poster + = tag :img, src: current_page.data.poster .container - = partial "partials/left_side" = yield = javascript_include_tag "app" + diff --git a/source/partials/_footer.haml b/source/partials/_footer.haml deleted file mode 100644 index 31ec94a..0000000 --- a/source/partials/_footer.haml +++ /dev/null @@ -1,7 +0,0 @@ -%footer - .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/_left_side.html.haml b/source/partials/_left_side.html.haml deleted file mode 100644 index 810d01b..0000000 --- a/source/partials/_left_side.html.haml +++ /dev/null @@ -1,34 +0,0 @@ -%p - check out some of - = link_to 'my work', 'video' - -%ul - %li - more video can be found on - = link_to 'vimeo', 'http://www.vimeo.com/mmoser' - %li - I occasionally play on - = link_to 'obleys.net', 'http://www.obleys.net' - %li - and sometimes - = link_to 'youtube', 'http://www.youtube.com/user/ObleyWan' - %li - view my - = link_to 'linked in', 'http://www.linkedin.com/in/markamoser' - page - -%ul - %li= link_to 'skype: fullsightstudios', 'skype:fullsightstudios?userinfo' - -%ul - %li - = link_to 'bluehost', 'http://www.bluehost.com/track/fullsight' - is my preferred shared web host - - %li - = link_to 'digital ocean', 'https://www.digitalocean.com/?refcode=0d1758a3ccb2' - is my preferred vps host - - %li - free cloud storage from - = link_to 'dropbox', 'https://www.getdropbox.com/referrals/NTUzODQzOQ' diff --git a/source/partials/_side_list.haml b/source/partials/_side_list.haml deleted file mode 100644 index 810d01b..0000000 --- a/source/partials/_side_list.haml +++ /dev/null @@ -1,34 +0,0 @@ -%p - check out some of - = link_to 'my work', 'video' - -%ul - %li - more video can be found on - = link_to 'vimeo', 'http://www.vimeo.com/mmoser' - %li - I occasionally play on - = link_to 'obleys.net', 'http://www.obleys.net' - %li - and sometimes - = link_to 'youtube', 'http://www.youtube.com/user/ObleyWan' - %li - view my - = link_to 'linked in', 'http://www.linkedin.com/in/markamoser' - page - -%ul - %li= link_to 'skype: fullsightstudios', 'skype:fullsightstudios?userinfo' - -%ul - %li - = link_to 'bluehost', 'http://www.bluehost.com/track/fullsight' - is my preferred shared web host - - %li - = link_to 'digital ocean', 'https://www.digitalocean.com/?refcode=0d1758a3ccb2' - is my preferred vps host - - %li - free cloud storage from - = link_to 'dropbox', 'https://www.getdropbox.com/referrals/NTUzODQzOQ' diff --git a/source/partials/_analytics.erb b/source/shared/_analytics.erb similarity index 100% rename from source/partials/_analytics.erb rename to source/shared/_analytics.erb diff --git a/source/partials/_compatibility-notice.erb b/source/shared/_compatibility-notice.erb similarity index 100% rename from source/partials/_compatibility-notice.erb rename to source/shared/_compatibility-notice.erb diff --git a/source/partials/_header.haml b/source/shared/_header.haml similarity index 78% rename from source/partials/_header.haml rename to source/shared/_header.haml index 3b17691..bc2f20b 100644 --- a/source/partials/_header.haml +++ b/source/shared/_header.haml @@ -1,17 +1,16 @@ %header - .container-fluid + .container .row - .col-md-10.col-md-offset-1.col-sm-12 + .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 + %a{href: "contact"} contact %ul.social :ruby diff --git a/todo.txt b/todo.txt new file mode 100644 index 0000000..a87e672 --- /dev/null +++ b/todo.txt @@ -0,0 +1 @@ +* pull bootstrap out of bower, replace with custom boot strap generated theme