Permalink
Browse files

First iteration of converting 2 column articles to 1 column

  • Loading branch information...
1 parent 1abf026 commit f1fb4f56dc9c328ddfb61e2165fbe577b6cad101 @rohit committed Nov 13, 2010
View
0 README.md 100755 → 100644
No changes.
View
0 app.rb 100755 → 100644
No changes.
View
No changes.
View
0 articles/hcl-ceo-foot-in-mouth.md 100755 → 100644
No changes.
No changes.
View
No changes.
View
No changes.
View
No changes.
View
0 config.ru 100755 → 100644
No changes.
View
11 lib/article.rb 100755 → 100644
@@ -20,8 +20,8 @@ def self.[](article_slug)
title, @article = @article.split '<!-- Title Hint -->'
title.sub! /<h2>/, '<h2><em>'
title.sub! /<\/h2>/, '</em></h2>'
- col1, col2 = @article.split '<!-- Column Hint -->'
- Article.new article_slug, title, excerpt, published, col1, col2
+ content = @article
+ Article.new article_slug, title, excerpt, published, content
end
def self.files
@@ -50,13 +50,12 @@ def self.parse_date(date)
Date.strptime date
end
- attr_accessor :slug, :title, :col1, :col2, :published, :excerpt
+ attr_accessor :slug, :title, :content, :published, :excerpt
- def initialize(slug, title, excerpt = nil, published = nil, col1 = nil, col2 = nil)
+ def initialize(slug, title, excerpt = nil, published = nil, content = nil)
@slug = slug
@title = title
- @col1 = col1
- @col2 = col2
+ @content = content
@published = published
@excerpt = excerpt
end
View
0 lib/core_ext/enumerable.rb 100755 → 100644
No changes.
View
29 public/css/main.css 100755 → 100644
@@ -76,13 +76,21 @@ img.profile {
float: left;
}
-.col1, .col2 {
+.col1, .col2, .col3, .col4 {
margin-right: 16px;
padding-left: 19px;
padding-right: 3px;
float: left;
}
+.col4 {
+ width: 922px;
+}
+
+.col3 {
+ width: 682px;
+}
+
.col2 {
width: 442px;
}
@@ -167,18 +175,13 @@ h1 a:hover {
h2 {
font-size: 2.4em;
font-style: italic;
- line-height: 18px;
+ line-height: 24px;
margin: 18px 19px;
color: #2E2E2E;
- text-align: center;
+ text-align: left;
text-shadow: 1px 1px #dedede;
}
-h2 em {
- border-bottom: 2px solid #ccc;
- padding-bottom: 4px;
-}
-
header h2 em {
border: 0;
padding-bottom: 0;
@@ -201,9 +204,8 @@ h4 {
font-weight: normal;
font-family: verdana, Kalimati, sans-serif;
text-transform: uppercase;
- text-align: center;
padding: 2px 0 4px 0;
- margin-bottom: 12px;
+ margin: 18px 19px;
text-shadow: 1px 1px #dedede;
}
@@ -230,6 +232,13 @@ p {
font-family: verdana, Kalimati, sans-serif;
}
+article > div > p:first-child {
+ font-family: Georgia, "Nimbus Roman No9 L", Serif;
+ font-size: 1.9em;
+ line-height: 19px;
+ font-style: italic;
+}
+
form {
padding-left: 6px;
}
View
0 public/images/bg.gif 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 public/images/rohit.jpg 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 public/images/ubuntu904_t.jpg 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 public/js/html5.js 100755 → 100644
No changes.
View
0 public/js/validate_form.js 100755 → 100644
No changes.
View
0 public/robots.txt 100755 → 100644
No changes.
View
0 public/sitemap.xml 100755 → 100644
No changes.
View
0 views/about.erb 100755 → 100644
No changes.
View
15 views/article.erb 100755 → 100644
@@ -35,15 +35,14 @@
</header>
<section id="content">
<article>
- <%= @article.title %>
- <h4 id="published-date">
- <%= humanize_date @article.published %>
- </h4>
- <div class="col2">
- <%= @article.col1 %>
+ <div class="col3">
+ <%= @article.content %>
</div>
- <div class="col2">
- <%= @article.col2 %>
+ <div class="col1">
+ <%= @article.title %>
+ <h4 id="published-date">
+ <%= humanize_date @article.published %>
+ </h4>
</div>
</article>
</section>
View
0 views/articles.erb 100755 → 100644
No changes.
View
0 views/contact.erb 100755 → 100644
No changes.
View
0 views/contact_done.erb 100755 → 100644
No changes.
View
0 views/feed.erb 100755 → 100644
No changes.
View
0 views/layout.erb 100755 → 100644
No changes.
View
0 views/welcome.erb 100755 → 100644
No changes.

0 comments on commit f1fb4f5

Please sign in to comment.