diff --git a/source/fonts/fontawesome-webfont.ttf b/source/fonts/fontawesome-webfont.ttf new file mode 100644 index 0000000000000000000000000000000000000000..35acda2fa1196aad98c2adf4378a7611dd713aa3 Binary files /dev/null and b/source/fonts/fontawesome-webfont.ttf differ diff --git a/source/fonts/fontawesome-webfont.woff b/source/fonts/fontawesome-webfont.woff new file mode 100644 index 0000000000000000000000000000000000000000..400014a4b06eee3d0c0d54402a47ab2601b2862b Binary files /dev/null and b/source/fonts/fontawesome-webfont.woff differ diff --git a/source/fonts/fontawesome-webfont.woff2 b/source/fonts/fontawesome-webfont.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..4d13fc60404b91e398a37200c4a77b645cfd9586 Binary files /dev/null and b/source/fonts/fontawesome-webfont.woff2 differ diff --git a/source/index.html.haml b/source/index.html.haml index cbebc602322dbd72a40348926f1ab116ebc13b6f..24a558e509b177b4d417e752425dad9e1c1c0acc 100644 --- a/source/index.html.haml +++ b/source/index.html.haml @@ -3,21 +3,35 @@ pageable: true per_page: 6 --- -%header.main-header{cover} - %nav.main-nav.overlay.clearfix - - if blog_settings.logo.present? - %a.blog-logo{href: home_path} - = image_tag blog_settings.logo, alt: blog_settings.name - - if blog_settings.navigation - %a.menu-button.icon-menu{href: '#'} - %span.word Menu - .vertical - .main-header-content.inner - %h1.page-title= blog_settings.name - %h2.page-description= blog_settings.description - %a.scroll-down.icon-arrow-left{href: '#content', data: {offset: '-45'}} - %span.hidden Scroll Down +-#%header.main-header{cover} +-# %nav.main-nav.overlay.clearfix +-# - if blog_settings.logo.present? +-# %a.blog-logo{href: home_path} +-# = image_tag blog_settings.logo, alt: blog_settings.name +-# - if blog_settings.navigation +-# %a.menu-button.icon-menu{href: '#'} +-# %span.word Menu +-# .vertical +-# .main-header-content.inner +-# %h1.page-title= blog_settings.name +-# %h2.page-description= blog_settings.description +-# %a.scroll-down.icon-arrow-left{href: '#content', data: {offset: '-45'}} +-# %span.hidden Scroll Down +-# +-#%main#content.content{role: :main} +-# = partial('shared/page_articles', +-# locals: { page_articles: page_articles, paginate: paginate }) -%main#content.content{role: :main} - = partial('shared/page_articles', - locals: { page_articles: page_articles, paginate: paginate }) + +%header.subheader + .container + %h2.page-title + = blog_settings.name + %small= blog_settings.description +%main#content.container{role: :main} + .row + .col-md-9 + = partial('shared/page_articles', + locals: { page_articles: page_articles, paginate: paginate }) + -#.col-md-3 + -# {{> "tags"}} diff --git a/source/layouts/layout.haml b/source/layouts/layout.haml index eae8803bae6dcbc7accdab988aa8a901f55a6664..931e8b67e372523fc3891498454cb518a911443a 100644 --- a/source/layouts/layout.haml +++ b/source/layouts/layout.haml @@ -1,11 +1,80 @@ +-#!!! 5 +-#%html +-# %head +-# %title= page_title +-# %meta{name: :description, content: page_description} +-# %meta{charset: 'utf-8'} +-# %meta{name: :viewport, content: 'width=device-width, initial-scale=1.0'} +-# %meta{'http-equiv' => 'X-UA-Compatible', content: 'IE=edge'} +-# %meta{name: 'HandheldFriendly', content: 'True'} +-# +-# -# Open Graph Tags +-# %meta{property: "og:site_name", content: blog_settings.name} +-# %meta{property: "og:type", content: og_type} +-# - if og_title.present? +-# %meta{property: "og:title", content: og_title} +-# %meta{property: "og:description", content: page_description} +-# %meta{property: "og:url", content: URI.join(blog_settings.url, current_page.url)} +-# - if cover? +-# %meta{property: "og:image", content: URI.join(blog_settings.url, image_path(current_page.data.cover))} +-# - if is_blog_article? +-# %meta{property: "article:published_time", content: current_article.date.strftime('%Y-%m-%d')} +-# +-# -# Twitter Card Tags +-# %meta{name: "twitter:card", content: "summary"} +-# - if blog_author.twitter.present? +-# %meta{name: "twitter:site", content: blog_author.twitter} +-# - if twitter_title.present? +-# %meta{name: "twitter:title", content: twitter_title} +-# %meta{name: "twitter:description", content: page_description} +-# %meta{name: "twitter:url", content: URI.join(blog_settings.url, current_page.url)} +-# - if cover? +-# %meta{name: "twitter:image:src", content: URI.join(blog_settings.url, image_path(current_page.data.cover))} +-# +-# = feed_tag :atom, "#{blog.options.prefix.to_s}/feed.xml", title: "Atom Feed" +-# = favicon_tag 'images/favicon.ico' +-# %link{rel: :stylesheet, type: 'text/css', href: '//fonts.googleapis.com/css?family=Merriweather:300,700,700italic,300italic|Open+Sans:700,400'} +-# = stylesheet_link_tag :application +-# %body{class: "#{page_class} nav-closed"} +-# +-# = partial('shared/navigation') +-# +-# .site-wrapper +-# = yield +-# +-# %footer.site-footer.clearfix +-# %section.copyright +-# %a{href: home_path}= blog_settings.name +-# © +-# = Time.now.year +-# %section.poweredby +-# -# +-# Proudly published with +-# %a{href: 'http://middlemanapp.com'} Middleman +-# Casper theme powered by +-# %a{href: 'https://ghost.org'} Ghost +-# +-# = javascript_include_tag :application + + + + + + + !!! 5 %html %head + %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"} + %meta{:charset => "utf-8"} + %meta{:content => "IE=edge", "http-equiv" => "X-UA-Compatible"} %title= page_title %meta{name: :description, content: page_description} - %meta{charset: 'utf-8'} - %meta{name: :viewport, content: 'width=device-width, initial-scale=1.0'} - %meta{'http-equiv' => 'X-UA-Compatible', content: 'IE=edge'} + %meta{:content => "True", :name => "HandheldFriendly"} + %meta{:content => "width=device-width, initial-scale=1.0", :name => "viewport"} + = favicon_tag 'images/favicon.ico' + = stylesheet_link_tag :application + = feed_tag :atom, "#{blog.options.prefix.to_s}/feed.xml", title: "Atom Feed" %meta{name: 'HandheldFriendly', content: 'True'} -# Open Graph Tags @@ -30,28 +99,36 @@ %meta{name: "twitter:url", content: URI.join(blog_settings.url, current_page.url)} - if cover? %meta{name: "twitter:image:src", content: URI.join(blog_settings.url, image_path(current_page.data.cover))} - - = feed_tag :atom, "#{blog.options.prefix.to_s}/feed.xml", title: "Atom Feed" - = favicon_tag 'images/favicon.ico' - %link{rel: :stylesheet, type: 'text/css', href: '//fonts.googleapis.com/css?family=Merriweather:300,700,700italic,300italic|Open+Sans:700,400'} - = stylesheet_link_tag :application - %body{class: "#{page_class} nav-closed"} - + %body = partial('shared/navigation') - .site-wrapper - = yield - - %footer.site-footer.clearfix - %section.copyright - %a{href: home_path}= blog_settings.name - © - = Time.now.year - %section.poweredby - -# - Proudly published with - %a{href: 'http://middlemanapp.com'} Middleman - Casper theme powered by - %a{href: 'https://ghost.org'} Ghost - + = yield + #search-results-container.modal.fade{:role => "dialog", :tabindex => "-1"} + .modal-dialog + .modal-content + .modal-header + %button.close{"aria-label" => "Close", "data-dismiss" => "modal", :type => "button"} + %span{"aria-hidden" => "true"} × + %h4.modal-title Search results + .modal-body + Searched for + %strong#search-term + %hr + %section#loading-spinner.text-center + %i.fa.fa-spinner.fa-spin.fa-2x + %section#search-results.search-results + .modal-footer + %button.btn.btn-default{"data-dismiss" => "modal", :type => "button"} Close + %footer.site-footer.clearfix.container.text-muted + %hr + .row + .col-md-6 + %a{"data-scroll" => "true", :href => "#top"} + %i.fa.fa-arrow-up + Back to top + .col-md-6.text-right + %p + %strong= blog_settings.name + © + = Time.now.year = javascript_include_tag :application diff --git a/source/shared/_page_articles.haml b/source/shared/_page_articles.haml index b24400ee5d85d30774dab66be95deaf8f45c4b0f..4f6084bb2d53ab1729beb16452e0fa1ed7daf6b9 100644 --- a/source/shared/_page_articles.haml +++ b/source/shared/_page_articles.haml @@ -1,21 +1,56 @@ +-#.extra-pagination.inner +-# = partial('shared/pagination') if paginate +-# +-#- page_articles.each do |article| +-# %article.post +-# %header.post-header +-# %h2.post-title= link_to article.title, article +-# %section.post-excerpt +-# %p +-# = summary(article) +-# = link_to '»', article, class: 'read-more' +-# %footer.post-meta +-# - if gravatar? +-# %img.author-thumb{src: gravatar(24), alt: blog_author.name, nopin: 'nopin'} +-# %a{href: author_path}= blog_author.name +-# - if tags?(article) +-# on #{tags(article)} +-# %time.post-date{datetime: article.date.strftime('%Y-%m-%d')} +-# = article.date.strftime(blog_settings.date_format) +-# +-#= partial('shared/pagination') if paginate + + + + .extra-pagination.inner = partial('shared/pagination') if paginate - page_articles.each do |article| - %article.post + %article.post{:class => "post"} %header.post-header %h2.post-title= link_to article.title, article - %section.post-excerpt - %p - = summary(article) - = link_to '»', article, class: 'read-more' - %footer.post-meta - - if gravatar? - %img.author-thumb{src: gravatar(24), alt: blog_author.name, nopin: 'nopin'} - %a{href: author_path}= blog_author.name - - if tags?(article) - on #{tags(article)} - %time.post-date{datetime: article.date.strftime('%Y-%m-%d')} - = article.date.strftime(blog_settings.date_format) + %section.post-meta.text-muted + %ul.list-inline + %li + %i.fa.fa-calendar + %time.post-date{datetime: article.date.strftime('%Y-%m-%d')} + = article.date.strftime(blog_settings.date_format) + %li + -#{{#if image}} + -#%a.author-image{:href => gravatar(24), :style => 'background-image: url( gravatar(24) )'} + -# %span.hidden {{name}}'s Picture + -#{{else}} + %i.fa.fa-user + -#{{/if}} + %a{href: author_path}= blog_author.name + + %li + %i.fa.fa-folder-open + - if tags?(article) + #{tags(article)} + + %section.post-content + = article.body = partial('shared/pagination') if paginate