final tweaks for the initial round

This commit is contained in:
Mark Moser
2014-09-20 13:55:31 -05:00
parent ab8ec56737
commit 742eadf502
16 changed files with 132 additions and 99 deletions

View File

@ -52,8 +52,11 @@ end
activate :blog do |blog| activate :blog do |blog|
blog.paginate = true blog.paginate = true
blog.layout = "layouts/blog.html" blog.layout = "layouts/blog.html"
blog.new_article_template = "article_template.erb"
blog.default_extension = '.haml'
blog.tag_template = "tag.html" blog.tag_template = "tag.html"
blog.sources = "blog/{title}.html" blog.sources = "blog/{title}.html"
# blog.calendar_template = 'calendar.html'
end end
#video pages #video pages

View File

@ -27,4 +27,3 @@ def page_keywords
keywords.uniq.join(", ") keywords.uniq.join(", ")
end end

View File

@ -61,6 +61,13 @@ header a:hover {
border-bottom: 4px solid $accent_color; 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 { .social a:hover {
text-decoration: none; text-decoration: none;
border: none; border: none;
@ -72,11 +79,16 @@ header a:hover {
margin: 50px 0; margin: 50px 0;
} }
.poster img { a {
width: 100%; color: $dark;
padding: 0 auto; text-decoration: underline;
} }
a:hover{
color: $accent_color;
}
.side-links { .side-links {
font-family: $accent_font; font-family: $accent_font;
text-align: right; text-align: right;
@ -94,9 +106,54 @@ header a:hover {
.side-links a { .side-links a {
color: $dark; color: $dark;
font-weight: bolder; font-weight: bolder;
text-decoration: none;
} }
.side-links a:hover{ .side-links a:hover{
color: $accent_color; color: $accent_color;
text-decoration: none; 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;
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 263 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 209 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 70 KiB

View File

@ -1,12 +1,18 @@
--- ---
title: A Fresh Start title: A Fresh Start
poster: /assets/img/star_nasa.jpg poster: /assets/img/star_nasa.jpg
date: 2014-09-16 date: 2014-09-20
tags: example tags: about
--- ---
.spacer-100
.row .row
.col-sm-12 .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.

View File

@ -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!

View File

@ -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. keeping the bigger picture in mind. I was raised to work hard and play hard.
.col-sm-4.side-links .col-sm-4.side-links
-# = tag :img, src: '/assets/img/ObleyMirror_100.jpg', alt: 'Mark Moser Mirror'
-# %br
-# %br
%ul %ul
%li %li
= mail_to 'mmoser@fullsight.com' = mail_to 'mmoser@fullsight.com'

View File

@ -1,20 +1,24 @@
--- ---
pageable: true pageable: true
per_page: 10 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 - page_articles.each do |article|
%p %h2= link_to article.title.titleize, article
Page #{page_number} of #{num_pages} = article.body
- if prev_page .spacer-50
%p= link_to 'Previous page', prev_page
- page_articles.each_with_index do |article, i|
%h2
= link_to article.title, article
= article.summary(250)
- if paginate - if paginate
- if next_page - if next_page
%p= link_to 'Next page', next_page %p= link_to 'Next page', next_page
.col-sm-3
= partial 'shared/blog_list'

View File

@ -1,48 +1,12 @@
!!! - content_for :head do
/[if lt IE 7] <html class="no-js lt-ie9 lt-ie8 lt-ie7"> -# Blog Title#{' - ' + current_article.title unless current_article.nil?}
/ [if IE 7] <html class="no-js lt-ie9 lt-ie8"> <![endif] = feed_tag :atom, "#{blog.options.prefix.to_s}/feed.xml", title: "Atom Feed"
/ [if IE 8] <html class="no-js lt-ie9"><![endif]
%html
%head
%meta{charset: "utf-8"}/
%meta{content: "IE=edge,chrome=1", "http-equiv" => "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
%body{class: page_classes} = wrap_layout :layout do
/[if lt IE 8] .row
<haml_loud> partial "shared/compatibility-notice" </haml_loud> .col-sm-9#main{:role => "main"}
= partial "shared/header" = yield
- if current_page.data.poster.present? .post_footer
.poster %p published around #{current_article.date.strftime('%m/%d/%Y')}
= tag :img, src: current_page.data.poster .col-sm-3
.container = partial 'shared/blog_list'
.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"

View File

@ -13,14 +13,20 @@
= stylesheet_link_tag "all" = stylesheet_link_tag "all"
= javascript_include_tag "vendor/modernizr" = javascript_include_tag "vendor/modernizr"
= partial "shared/analytics" = partial "shared/analytics"
- unless current_page.data.poster.nil?
:css
.poster { background-image: url(#{ current_page.data.poster });}
= yield_content :head = yield_content :head
%body{class: page_classes} %body{class: page_classes}
/[if lt IE 8] /[if lt IE 8]
<haml_loud> partial "shared/compatibility-notice" </haml_loud> <haml_loud> partial "shared/compatibility-notice" </haml_loud>
= partial "shared/header" = partial "shared/header"
- if current_page.data.poster.present? - if current_page.data.poster.nil?
.spacer-50
- else
.poster .poster
= tag :img, src: current_page.data.poster, style: 'background-repeat:repeat-y;width: 100%; height: 200px;'
.container .container
= yield = yield
.spacer-50 .spacer-50

View File

@ -2,18 +2,25 @@
pageable: true pageable: true
per_page: 10 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 .row
- if next_page .col-sm-9#main{:role => "main"}
%p= link_to 'Next page', next_page %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'

View File

@ -2,7 +2,6 @@
title: Video title: Video
--- ---
.spacer-50
.row .row
.col-sm-12 .col-sm-12
%h3= video.title %h3= video.title
@ -22,7 +21,7 @@ title: Video
%video{video.options.merge(options)} %video{video.options.merge(options)}
.row .row
.col-sm-12 .col-sm-9
- if video.note - if video.note
%p= video.note %p= video.note
@ -35,8 +34,7 @@ title: Video
%br %br
= video.credit = video.credit
.row .col-sm-3
.col-sm-12
.side-links .side-links
%ul %ul
%li More Videos: %li More Videos: