diff --git a/config.rb b/config.rb index 5399cbc..6520377 100644 --- a/config.rb +++ b/config.rb @@ -52,8 +52,11 @@ end activate :blog do |blog| blog.paginate = true blog.layout = "layouts/blog.html" + blog.new_article_template = "article_template.erb" + blog.default_extension = '.haml' blog.tag_template = "tag.html" blog.sources = "blog/{title}.html" + # blog.calendar_template = 'calendar.html' end #video pages diff --git a/helpers/meta_helper.rb b/helpers/meta_helper.rb index 3bc0137..c636789 100644 --- a/helpers/meta_helper.rb +++ b/helpers/meta_helper.rb @@ -27,4 +27,3 @@ def page_keywords keywords.uniq.join(", ") end - diff --git a/source/assets/css/all.scss b/source/assets/css/all.scss index e1f695e..a4348e0 100644 --- a/source/assets/css/all.scss +++ b/source/assets/css/all.scss @@ -61,6 +61,13 @@ header a:hover { border-bottom: 4px solid $accent_color; } +.post_footer { + font-size: .75em; + margin: 50px 0 0 0; + color: $grey; + font-family: $accent_font; +} + .social a:hover { text-decoration: none; border: none; @@ -72,11 +79,16 @@ header a:hover { margin: 50px 0; } -.poster img { - width: 100%; - padding: 0 auto; +a { + color: $dark; + text-decoration: underline; } +a:hover{ + color: $accent_color; +} + + .side-links { font-family: $accent_font; text-align: right; @@ -94,9 +106,54 @@ header a:hover { .side-links a { color: $dark; font-weight: bolder; + text-decoration: none; } .side-links a:hover{ color: $accent_color; text-decoration: none; } + +.poster { + width: 100%; + height: 300px; + padding: 0 auto; + background-position: center 0; +} + +@media all and (min-width: 768px) { + .poster { + width: 100%; + height: 300px; + background-position: center 0; + } +} + +@media all and (max-width: 1280px) and (min-width: 768px) { + .poster { + width: 100%; + height: 300px; + background-position: center 0; + } +} + +@media all and (max-width: 1280px) and (min-width: 992px) { + .poster { + width: 100%; + height: 400px; + background-position: center 0; + } +} + +@media all and (min-width: 1280px ) { + header { + width: 1280px; + margin: 0 auto; + } + .poster { + width: 1280px; + margin: 0 auto; + height: 400px; + background-position: 0 0; + } +} diff --git a/source/assets/img/bg/snow_@2X.png b/source/assets/img/bg/snow_@2X.png deleted file mode 100644 index 4c0db0f..0000000 Binary files a/source/assets/img/bg/snow_@2X.png and /dev/null differ diff --git a/source/assets/img/bg/stardust.png b/source/assets/img/bg/stardust.png deleted file mode 100644 index 288a7d2..0000000 Binary files a/source/assets/img/bg/stardust.png and /dev/null differ diff --git a/source/assets/img/bg/stardust_@2X.png b/source/assets/img/bg/stardust_@2X.png deleted file mode 100644 index 288a7d2..0000000 Binary files a/source/assets/img/bg/stardust_@2X.png and /dev/null differ diff --git a/source/assets/img/bg/subtle_white_feathers_@2X.png b/source/assets/img/bg/subtle_white_feathers_@2X.png deleted file mode 100644 index a1009a6..0000000 Binary files a/source/assets/img/bg/subtle_white_feathers_@2X.png and /dev/null differ diff --git a/source/assets/img/bg/white_wall_hash_@2X.png b/source/assets/img/bg/white_wall_hash_@2X.png deleted file mode 100644 index c4e27cc..0000000 Binary files a/source/assets/img/bg/white_wall_hash_@2X.png and /dev/null differ diff --git a/source/blog/a-fresh-start.html.haml b/source/blog/a-fresh-start.html.haml index 099bd3b..5c1a67d 100644 --- a/source/blog/a-fresh-start.html.haml +++ b/source/blog/a-fresh-start.html.haml @@ -1,12 +1,18 @@ --- title: A Fresh Start poster: /assets/img/star_nasa.jpg -date: 2014-09-16 -tags: example +date: 2014-09-20 +tags: about --- -.spacer-100 .row .col-sm-12 - A new thing + %h3 A[nother] New Thing + %p + So I've decided to try to resurrect this blogging thing yet again. I've detected a pattern, + which I'm sure is very common, where I study new things in sprints. During these periods I + get super excited and nerd out. I just want this place to be a vehicle where I share what + I'm learning. I'm no writer, so I apologize for the delivery if it is lacking. + + %p Thanks for reading. Drop me a comment when something is helpful, or wrong. diff --git a/source/blog/example-article.html.markdown b/source/blog/example-article.html.markdown deleted file mode 100644 index 618d7f3..0000000 --- a/source/blog/example-article.html.markdown +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: Example Article -date: 2012-01-01 -tags: example ---- - -This is an example article. You probably want to delete it and write your own articles! diff --git a/source/contact.html.haml b/source/contact.html.haml index 6117ec0..98ecdcd 100644 --- a/source/contact.html.haml +++ b/source/contact.html.haml @@ -29,10 +29,6 @@ poster: /assets/img/gulf_iss040e090540.jpg 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' diff --git a/source/index.haml b/source/index.haml index 7587961..ebd5615 100644 --- a/source/index.haml +++ b/source/index.haml @@ -1,20 +1,24 @@ --- pageable: true per_page: 10 -poster: /assets/img/bg/tree_bark.png --- +.row + .col-sm-9#main{:role => "main"} + - if paginate && num_pages > 1 + %p + Page #{page_number} of #{num_pages} + - if prev_page + %p= link_to 'Previous page', prev_page -- if paginate && num_pages > 1 - %p - Page #{page_number} of #{num_pages} - - if prev_page - %p= link_to 'Previous page', prev_page -- page_articles.each_with_index do |article, i| - %h2 - = link_to article.title, article - = article.summary(250) + - page_articles.each do |article| + %h2= link_to article.title.titleize, article + = article.body + .spacer-50 -- if paginate - - if next_page - %p= link_to 'Next page', next_page + - if paginate + - if next_page + %p= link_to 'Next page', next_page + + .col-sm-3 + = partial 'shared/blog_list' diff --git a/source/layouts/blog.html.haml b/source/layouts/blog.html.haml index 3a26fa8..a7ad319 100644 --- a/source/layouts/blog.html.haml +++ b/source/layouts/blog.html.haml @@ -1,48 +1,12 @@ -!!! -/[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"}/ - = feed_tag :atom, "#{blog.options.prefix.to_s}/feed.xml", title: "Atom Feed" - %title - = page_title - - # Blog Title#{' - ' + current_article.title unless current_article.nil?} - = stylesheet_link_tag "all" - = javascript_include_tag "vendor/modernizr" - = partial "shared/analytics" - = yield_content :head +- content_for :head do + -# Blog Title#{' - ' + current_article.title unless current_article.nil?} + = feed_tag :atom, "#{blog.options.prefix.to_s}/feed.xml", title: "Atom Feed" - %body{class: page_classes} - /[if lt IE 8] - partial "shared/compatibility-notice" - = partial "shared/header" - - if current_page.data.poster.present? - .poster - = tag :img, src: current_page.data.poster - .container - .row - .col-sm-9#main{:role => "main"} - = yield - .col-sm-3 - .spacer-50 - .side-links - %ul - %li.bolder Recent Posts - - blog.articles[0...10].each do |article| - %li - = link_to article.title, article - - %ul - %li Tags - - blog.tags.each do |tag, articles| - %li= link_to "#{tag}", tag_path(tag) - - .spacer-50 - - = javascript_include_tag "app" += wrap_layout :layout do + .row + .col-sm-9#main{:role => "main"} + = yield + .post_footer + %p published around #{current_article.date.strftime('%m/%d/%Y')} + .col-sm-3 + = partial 'shared/blog_list' diff --git a/source/layouts/layout.html.haml b/source/layouts/layout.html.haml index 1261b4a..51957f8 100644 --- a/source/layouts/layout.html.haml +++ b/source/layouts/layout.html.haml @@ -13,14 +13,20 @@ = stylesheet_link_tag "all" = javascript_include_tag "vendor/modernizr" = partial "shared/analytics" + + - unless current_page.data.poster.nil? + :css + .poster { background-image: url(#{ current_page.data.poster });} + = yield_content :head %body{class: page_classes} /[if lt IE 8] partial "shared/compatibility-notice" = partial "shared/header" - - if current_page.data.poster.present? + - if current_page.data.poster.nil? + .spacer-50 + - else .poster - = tag :img, src: current_page.data.poster, style: 'background-repeat:repeat-y;width: 100%; height: 200px;' .container = yield .spacer-50 diff --git a/source/tag.html.haml b/source/tag.html.haml index f7f3e9e..08e1849 100644 --- a/source/tag.html.haml +++ b/source/tag.html.haml @@ -2,18 +2,25 @@ pageable: true per_page: 10 --- -%h1 - Articles tagged '#{tagname}' -- if paginate && num_pages > 1 - %p - Page #{page_number} of #{num_pages} - - if prev_page - %p= link_to 'Previous page', prev_page -%ul - - page_articles.each_with_index do |article, i| - %li - = link_to article.title, article -- if paginate - - if next_page - %p= link_to 'Next page', next_page +.row + .col-sm-9#main{:role => "main"} + %h2 + Articles tagged: #{tagname.titleize} + - if paginate && num_pages > 1 + %p + Page #{page_number} of #{num_pages} + - if prev_page + %p= link_to 'Previous page', prev_page + + - page_articles.each do |article| + %h2= link_to article.title.titleize, article + = article.body + .spacer-50 + + - if paginate + - if next_page + %p= link_to 'Next page', next_page + + .col-sm-3 + = partial 'shared/blog_list' diff --git a/source/video/template.html.haml b/source/video/template.html.haml index 2e1d7bc..84f18e2 100644 --- a/source/video/template.html.haml +++ b/source/video/template.html.haml @@ -2,7 +2,6 @@ title: Video --- -.spacer-50 .row .col-sm-12 %h3= video.title @@ -22,7 +21,7 @@ title: Video %video{video.options.merge(options)} .row - .col-sm-12 + .col-sm-9 - if video.note %p= video.note @@ -35,8 +34,7 @@ title: Video %br = video.credit -.row - .col-sm-12 + .col-sm-3 .side-links %ul %li More Videos: