Skip to content

Commit 7fbd851

Browse files
author
Marylou Kunkle
committed
Removed unnecessary files, fixed layout links
I merged application.sass into site.sass. I deleted the public site.css file because it was taking precedence and needed removed. Also, the blog and forums were not able to see the css files, so I fixed the links so they work now.
1 parent 3f8efb1 commit 7fbd851

5 files changed

Lines changed: 31 additions & 94 deletions

File tree

‎public/stylesheets/site.css‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎views/layout.haml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
!!! 5
22
%html
3-
%head
4-
%title Hackety Hack
5-
%link{:rel => "stylesheet", :href => "stylesheets/reset.css", :type => 'text/css'}
6-
%link{:rel => "stylesheet", :href => "stylesheets/site.css", :type => 'text/css'}
7-
%link{:rel => "stylesheet", :href => "stylesheets/ruby.css", :type => 'text/css'}
8-
%link{:rel => "stylesheet", :href => "stylesheets/application.css", :type => 'text/css'}
9-
%body
10-
%nav{:style => "float:right;"}
11-
%a{:href => "/blog"}Blog
12-
%a{:href => "http://github.com/hacketyhack/hacketyhack"}Help
13-
%a{:href => "/forums"}Forums
14-
- if logged_in?
15-
%a{:href => "/logout" }Log out
16-
- else
17-
%a{:href => "/signup" }Sign Up
18-
%a{:href => "/login" }Log in
19-
%div{:id => "flash-notice"}= flash[:notice]
20-
%div{:id => "flash-error"}= flash[:error]
21-
%img{ :src => "images/hhhello.png", :id => "hello", :alt => "Hello"}
22-
%div{:id => "pitch", :class => "clearfix"}
23-
!= yield
3+
%head
4+
%title Hackety Hack
5+
%link{:rel => "stylesheet", :href => "/stylesheets/reset.css", :type => 'text/css'}
6+
%link{:rel => "stylesheet", :href => "/stylesheets/site.css", :type => 'text/css'}
7+
%link{:rel => "stylesheet", :href => "/stylesheets/ruby.css", :type => 'text/css'}
8+
%body
9+
%nav{:style => "float:right;"}
10+
%a{:href => "/"}Home \
11+
%a{:href => "/blog"}Blog \
12+
%a{:href => "http://github.com/hacketyhack/hacketyhack"}Help \
13+
%a{:href => "/forums"}Forums \
14+
- if logged_in?
15+
%a{:href => "/logout" }Log out
16+
- else
17+
%a{:href => "/signup" }Sign Up \
18+
%a{:href => "/login" }Log in
19+
%div{:id => "flash-notice"}= flash[:notice]
20+
%div{:id => "flash-error"}= flash[:error]
21+
%img{ :src => "/images/hhhello.png", :id => "hello", :alt => "Hello"}
22+
%div{:id => "pitch", :class => "clearfix"}
23+
!= yield

‎views/posts/index.haml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#content
2-
- @posts.each do |post|
3-
.post
4-
%h1
5-
%a{:href => "/posts/#{post.id}"}= post.title
6-
- markdown = RDiscount.new(post.body, :smart, :filter_html)
7-
%p!= markdown.to_html
8-
%p= "#{post.comments.count} comments"
2+
- @posts.each do |post|
3+
.post
4+
%h1
5+
%p= post.title
6+
- markdown = RDiscount.new(post.body, :smart, :filter_html)
7+
%p!= markdown.to_html
8+
%a{:href => "/posts/#{post.id}"}= "#{post.comments.count} comments"

‎views/stylesheets/application.sass‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎views/stylesheets/site.sass‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ nav
1414
position: absolute
1515
right: 170px
1616
top: 10px
17+
a
18+
text-decoration: none
19+
color: #000000
1720

1821
#pitch
1922
position: absolute

0 commit comments

Comments
 (0)