Skip to content

Commit 647903a

Browse files
steveklabniksteveklabnik
committed
Merge remote branch 'ml/master'
2 parents 5411fd9 + 7fbd851 commit 647903a

5 files changed

Lines changed: 98 additions & 96 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: 70 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,71 @@
1+
body
2+
13
div#content
2-
border-style: solid
3-
border: 1px
4+
border-style: solid
5+
border: 1px
6+
7+
#hello
8+
float: right
9+
position: absolute
10+
right: 0px
11+
z-index: -1
12+
13+
nav
14+
position: absolute
15+
right: 170px
16+
top: 10px
17+
a
18+
text-decoration: none
19+
color: #000000
20+
21+
#pitch
22+
position: absolute
23+
max-width: 600px
24+
left: 20px
25+
top: 50px
26+
font-family: Arial, Verdana, sans
27+
background: #FFFFFF
28+
padding: 1em
29+
border: #000000 solid thick
30+
h1
31+
font-size: 1.5em
32+
h2
33+
padding: 1em 0em 0em 0em
34+
p
35+
36+
#posts
37+
position: relative
38+
max-width: 550px
39+
left: 20px
40+
top: 50px
41+
font-family: Arial, Verdana, sans
42+
background: #FFFFFF
43+
padding: 1em
44+
border: #000000 solid thick
45+
p
46+
padding: .25em
47+
margin: .25em
48+
font-size: 1.2em
49+
h1
50+
font-size: 2em
51+
h2
52+
padding: 1em 0em 0em 0em
53+
font-size: 1.5em
54+
55+
td
56+
padding: 0.5em 0em 0.5em 0.5em
57+
58+
ul li
59+
list-style-type: disc
60+
margin-left: 20px
61+
62+
ol li
63+
list-style-type: decimal
64+
margin-left: 20px
65+
66+
#posts blockquote
67+
padding: 10px
68+
margin-left: 20px
69+
margin-right: 20px
70+
border: 2px solid #000
71+

0 commit comments

Comments
 (0)