Skip to content
This repository has been archived by the owner on Jul 17, 2018. It is now read-only.

Reflow Blog page #1

Merged
merged 1 commit into from
Sep 4, 2014
Merged

Reflow Blog page #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/assets/javascripts/blog.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
$ ->
$(".post iframe")
.attr("width", 754)
.attr("height", 430)
3 changes: 2 additions & 1 deletion app/assets/javascripts/rich.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
//= require rich/base
//= require rich/base
//= depend_on_asset "rich/images.png"
14 changes: 3 additions & 11 deletions app/assets/stylesheets/_blog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$posts-width: 524px;
$posts-width: 754px;

$links-width: 205px;

Expand All @@ -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 {
Expand Down Expand Up @@ -146,4 +138,4 @@ $instagram-link-height: $links-width;
font-size: 12px;
font-weight: bold;
text-transform: uppercase;
}
}
2 changes: 1 addition & 1 deletion app/assets/stylesheets/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 1 addition & 5 deletions app/assets/stylesheets/_pages.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@ iframe {
border: none;
}

.content {
margin-left: $page-left-margin;
}

.background-text {
position: absolute;
font-weight: bold;
Expand Down Expand Up @@ -59,4 +55,4 @@ a[rel^=lightbox] {
}
}
}
}
}
1 change: 0 additions & 1 deletion app/assets/stylesheets/bitters/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions app/views/posts/index.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
.blog
aside.photos
= render Photo.orphaned

section.posts
= render collection

Expand Down
8 changes: 0 additions & 8 deletions spec/features/blog_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down