diff --git a/app/assets/javascripts/blog.coffee b/app/assets/javascripts/blog.coffee new file mode 100644 index 0000000..71b6b98 --- /dev/null +++ b/app/assets/javascripts/blog.coffee @@ -0,0 +1,4 @@ +$ -> + $(".post iframe") + .attr("width", 754) + .attr("height", 430) diff --git a/app/assets/javascripts/rich.js b/app/assets/javascripts/rich.js index 7920923..f523279 100644 --- a/app/assets/javascripts/rich.js +++ b/app/assets/javascripts/rich.js @@ -1 +1,2 @@ -//= require rich/base \ No newline at end of file +//= require rich/base +//= depend_on_asset "rich/images.png" diff --git a/app/assets/stylesheets/_blog.scss b/app/assets/stylesheets/_blog.scss index f55da95..1920dc4 100644 --- a/app/assets/stylesheets/_blog.scss +++ b/app/assets/stylesheets/_blog.scss @@ -1,4 +1,4 @@ -$posts-width: 524px; +$posts-width: 754px; $links-width: 205px; @@ -13,19 +13,11 @@ $instagram-link-height: $links-width; @include size($posts-width 100%); } -.photos { - @include size($header-size 100%); - - .photo { - margin-bottom: 5px; - } -} - .fixed-links { float: right; position: fixed; margin-top: -138px; - margin-left: 682px; + margin-left: $posts-width + $element-margin; } .links { @@ -146,4 +138,4 @@ $instagram-link-height: $links-width; font-size: 12px; font-weight: bold; text-transform: uppercase; -} \ No newline at end of file +} diff --git a/app/assets/stylesheets/_header.scss b/app/assets/stylesheets/_header.scss index e58834e..b8ac3eb 100644 --- a/app/assets/stylesheets/_header.scss +++ b/app/assets/stylesheets/_header.scss @@ -2,7 +2,7 @@ $header-size: 118px; -$pages-width: $page-left-margin - $element-margin; +$pages-width: $element-margin; $pages-margin: 12px; $page-link-margin: 15px; diff --git a/app/assets/stylesheets/_pages.scss b/app/assets/stylesheets/_pages.scss index 7e9faf3..0c0e9f0 100644 --- a/app/assets/stylesheets/_pages.scss +++ b/app/assets/stylesheets/_pages.scss @@ -25,10 +25,6 @@ iframe { border: none; } -.content { - margin-left: $page-left-margin; -} - .background-text { position: absolute; font-weight: bold; @@ -59,4 +55,4 @@ a[rel^=lightbox] { } } } -} \ No newline at end of file +} diff --git a/app/assets/stylesheets/bitters/_variables.scss b/app/assets/stylesheets/bitters/_variables.scss index 5008939..720bd54 100644 --- a/app/assets/stylesheets/bitters/_variables.scss +++ b/app/assets/stylesheets/bitters/_variables.scss @@ -12,7 +12,6 @@ $base-font-size: 1em; $base-line-height: $base-font-size; $base-border-radius: em(3); -$page-left-margin: 92px; $element-margin: 20px; // Colors diff --git a/app/views/posts/index.html.slim b/app/views/posts/index.html.slim index 9bc739a..be28d7b 100644 --- a/app/views/posts/index.html.slim +++ b/app/views/posts/index.html.slim @@ -1,7 +1,4 @@ .blog - aside.photos - = render Photo.orphaned - section.posts = render collection diff --git a/spec/features/blog_spec.rb b/spec/features/blog_spec.rb index f2191c4..cf3a3d5 100644 --- a/spec/features/blog_spec.rb +++ b/spec/features/blog_spec.rb @@ -11,14 +11,6 @@ expect(page).not_to have_post post end - scenario "displays the photo feed" do - photo = create :photo - - visit posts_path - - expect(page).to have_photo photo - end - context "has content for" do include_context :page_for, :posts