layout settled

This commit is contained in:
Mark Moser
2014-09-14 21:15:43 -05:00
parent 8a7a1a444b
commit 97799a7e9c
14 changed files with 106 additions and 216 deletions

View File

@ -1,27 +0,0 @@
!!!
/[if lt IE 7] <html class="no-js lt-ie9 lt-ie8 lt-ie7">
/ [if IE 7] <html class="no-js lt-ie9 lt-ie8"> <![endif]
/ [if IE 8] <html class="no-js lt-ie9"><![endif]
%html.no-js
%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"}/
%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]
<haml_loud> partial "partials/compatibility-notice" </haml_loud>
.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"

View File

@ -2,7 +2,7 @@
/[if lt IE 7] <html class="no-js lt-ie9 lt-ie8 lt-ie7">
/ [if IE 7] <html class="no-js lt-ie9 lt-ie8"> <![endif]
/ [if IE 8] <html class="no-js lt-ie9"><![endif]
%html.no-js
%html
%head
%meta{charset: "utf-8"}/
%meta{content: "IE=edge,chrome=1", "http-equiv" => "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]
<haml_loud> partial "partials/compatibility-notice" </haml_loud>
<haml_loud> partial "shared/compatibility-notice" </haml_loud>
= 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"