Permalink
Browse files

Updating styles

  • Loading branch information...
1 parent 628be47 commit 77c74da1ba5759c629ce57d65749ab6cd0ec356f @reinh committed Jul 16, 2008
Showing with 29 additions and 18 deletions.
  1. +0 −1 Sitefile
  2. +2 −2 content/blog/2008/07/14/a-thinking-mans-sphinx.txt
  3. +12 −12 content/css/site.css
  4. +2 −2 layouts/index.rhtml
  5. +1 −1 lib/widont.rb
  6. +12 −0 tasks/deploy.rake
View
@@ -1,4 +1,3 @@
-
task :default => :build
desc 'deploy the site to the webserver'
@@ -9,7 +9,7 @@ filter:
- textile
---
-_NB:_ This has been cross-posted on my "company blog":http://hashrocket.com.
+_NB:_ This has been cross-posted on the "Hashrocket blog":http://hashrocket.com.
We've recently switched a number of projects to "ThinkingSphinx":http://ts.freelancing-gods.com/ here at "Hashrocket":http://www.hashrocket.com. These projects were originally using SOLR or "UltraSphinx":http://blog.evanweaver.com/files/doc/fauna/ultrasphinx/files/README.html. Today, we'll explore the differences between UltraSphinx and ThinkingSphinx and why we chose to switch.
@@ -33,7 +33,7 @@ Let's start with a basic example of a sphinx index declaration. Keep in mind tha
h4. UltraSphinx
-UltraSphinx uses a declarative @is_indexed@ statement in the model that feels vaguely similar in style to an association or named scope declaration. This is the usage example given in the "README":http://blog.evanweaver.com/files/doc/fauna/ultrasphinx/files/README.html:
+UltraSphinx uses a declarative @is_indexed@ statement in the model that feels vaguely similar in style to an association or named scope declaration. This is the usage example given in the "README":http://blog.evanweaver.com/files/doc/fauna/ultrasphinx/files/README.html:
<% coderay( :lang => "ruby") do -%>
class Post
View
@@ -24,7 +24,7 @@ body {
margin: 0;
padding: 0;
color: #222;
-/* background: url('blueprint/lib/grid.png') repeat 12px -2px;*/
+ background: url('blueprint/lib/grid.png') repeat 12px 0px;
}
.container {
@@ -46,7 +46,6 @@ h2 {
margin: 0;
margin-bottom: .5em;
color: <%= @page.color['header'] %>;
-
}
h3 {
@@ -74,18 +73,13 @@ p.read-more { text-align: center; margin: 18px 0 0;}
p.read-more a { text-align: center; color: <%= @page.color['link-hover'] %>; font-size: 18px;}
p.read-more a:hover { text-decoration: underline;}
-#footer, #footer a { color: #444;}
-#footer h3 { color: #666;}
-#footer a:hover { color: #125AA7;}
-
blockquote {
margin-left: 0;
padding-left: 1.5em;
color: <%= @page.color['blockquote'] %>;
}
pre {
-/* background: <%= @page.color['box-bg'] %>;*/
padding: .9px 0;
margin: 0 0 18px;
}
@@ -110,6 +104,10 @@ ul.no-bullet li {
padding-left: none;
}
+em {
+ background: #ffe;
+}
+
/* Tables
* --------------------------------------------------------------------- */
table {
@@ -231,6 +229,11 @@ dl.posts dd {
line-height: 18px;
}
+#footer {position:relative;}
+
+#footer, #footer a { color: #444;}
+#footer h3 { color: #777;}
+#footer a:hover { color: #125AA7;}
#footer p {
margin-bottom: .5em;
@@ -239,18 +242,14 @@ dl.posts dd {
#footer .panel {
width: 180px;
margin-right: 20px;
- border-top: 3px solid <%= @page.color['border'] %>;
- padding-top: 1.5em;
}
#footer .panel.last {
width: 190px;
margin-right: 0;
}
-#about {position:relative;}
-
-#about .top-link {top:0;}
+a.top-link {top:0;}
#copyright {}
@@ -390,6 +389,7 @@ div.entry-content {
.post-list h3.month {
position: absolute;
+ top: -1px;
text-align: right;
width: 190px;
padding-right: 10px;
View
@@ -57,7 +57,7 @@ filter:
</h1>
<div class="nav">
<ul>
- <li class="column span-2 append-1"><a href="#about" onClick='document.getElementById("about").setAttribute("style", "background:#FFFFDD")'>About</a></li>
+ <li class="column span-2 append-1"><a href="#about" onClick='document.getElementById("about").setAttribute("style", "background:#FFFFEE")'>About</a></li>
<li class="column span-2 append-1"><a href="/#recent">Recently</a></li>
<li class="column span-2 last <%= "active" if @page.title == "Archive" %>"><a href="/blog/archive">Archive</a></li>
</ul>
@@ -69,6 +69,7 @@ filter:
</div>
<div class="column span-15 first last section" id="footer">
+ <a class="extra-quiet plain top-link" href='#header' onClick='document.getElementById("about").setAttribute("style", "background:#FFFFFF")'>[top]</a>
<div class="panel column first">
<div id="about">
<h3>About</h3>
@@ -79,7 +80,6 @@ filter:
<li><a href="http://feeds.feedburner.com/reinh" rel="alternate" type="application/rss+xml">Subscribe</a>&nbsp;<a href="http://feeds.feedburner.com/reinh" rel="alternate" type="application/rss+xml"><img src="http://www.feedburner.com/fb/images/pub/feed-icon16x16.png" alt="" style="vertical-align:middle;border:0;margin:0;padding:0"/></a></li>
<li><a href="http://twitter.com/reinh">Twitter Me</a></li>
</ul>
- <a class="extra-quiet plain top-link" href='#header' onClick='document.getElementById("about").setAttribute("style", "background:#FFFFFF")'>[top]</a>
</div>
</div>
<div class="panel column plain">
View
@@ -2,7 +2,7 @@ module Widont
class << self
def widont_single(text)
text.strip!
- text[text.rindex(' '), 1] = '&nbsp;' if text.rindex(' ')
+ text[text.rindex(' '), 1] = '&nbsp;' if text.rindex(' ') and !text.include?('&nbsp;')
text
end
alias_method :widont, :widont_single
View
@@ -1,7 +1,19 @@
require 'rake/contrib/sshpublisher'
+task :staging do
+ SITE.remote_dir = "/var/www/beta.reinh.com"
+end
+
+task :production do
+ SITE.remote_dir = "/var/www/reinh.com"
+end
+
namespace :deploy do
+ SITE.user = "www"
+ SITE.host = "reinh"
+ SITE.remote_dir = "/var/www/beta.reinh.com"
+ SITE.rsync_args = %w( -av --delete )
desc 'Deploy to the server using rsync'
task :rsync do

0 comments on commit 77c74da

Please sign in to comment.