code.H3RALD.com — h3rald: e481dbbaea2449f859f2b4282e8b17c047f95ea8

Fixed minor CSS errors.
* Closes #49.

h3rald h3rald@h3rald.com

Sat, 12 Sep 2009 18:37:44 +0200

commit

e481dbbaea2449f859f2b4282e8b17c047f95ea8

parent

69cc66656c76775da1cef8fc060608c4ee0a1553

6 files changed, 77 insertions(+), 76 deletions(-)

jump to

content/css/_definitions.sass

content/css/_elements.sass

content/css/_layout.sass

content/css/_text.sass

layouts/article_item.erb

layouts/default.erb

M content/css/_definitions.sass → content/css/_definitions.sass

@@ -25,3 +25,6 @@ margin: 1em 0 0 0
 
 =code_font
   font-family: "Consolas", "Monaco", "Monospace"
+
+=darkbg_font
+  color: #CACACA

M content/css/_elements.sass → content/css/_elements.sass

@@ -22,11 +22,6 @@ p
     line-height: 1.5em
     margin: 1em 0
     
-  p[style] img
-    +double_border
-    margin: 0 5px 
-    padding: 3px
-
 blockquote, .note
   color: !gray
   font-style: italic
@@ -175,9 +170,11 @@ .article-item
   padding: 0.5em 0
   display: block
 
+.article-meta
+  font-size: 0.8em
+
 .tag
   font-weight: bold
-  font-size: 0.8em
 
 .project-data
   border-left = 3px "double" !red
@@ -189,9 +186,8 @@ ul
   overflow: hidden
 
   &.article-meta
-    float: left
     list-style-type: none
-    border-left = 3px "solid" !gray
+    border-left = 2px "solid" !gray
     padding-left: 0.5em
     margin-left: 0.5em
     margin-bottom: 1em
@@ -215,9 +211,6 @@ vertical-align: top
 
 #content .article-meta li
   margin-left: 0
-
-.date
-  font-size: 0.8em
 
 .inner-border img
   margin-top: 7px

M content/css/_layout.sass → content/css/_layout.sass

@@ -1,5 +1,7 @@ 
 ----- 
 ----- 
+@import definitions
+
 *
   font-family: inherit
   font-style: inherit
@@ -104,6 +106,7 @@ clear: both
   height: auto
   padding: 0
   width: 100%
+  +darkbg_font
 
 #services
   margin: auto
@@ -113,9 +116,10 @@ #footer
   position: relative
   height: 40px
   width: 100%
-  font-size: 80%
+  font-size: 0.8em
   text-align: center
   padding-top: 1em
+  +darkbg_font
 
 .clearfooter
   height: 40px
@@ -127,7 +131,6 @@ text-align: left
   font-size: 90%
   display: block
   height: 600px
-  color: #CACACA
 
 .footer-left, .footer-right
   width: 30%

M content/css/_text.sass → content/css/_text.sass

@@ -54,7 +54,6 @@ font-size: 90%
   padding-left: 1em
 
 .article-summary
-  padding-top: 0.5em
   padding-left: 1em
   font-style: italic

M layouts/article_item.erb → layouts/article_item.erb

@@ -3,9 +3,7 @@ filter: erb
 -----
 <div class="article-item"> 
 	<h4><a href="/articles/<%= @article.attributes[:permalink]%>/"><%= @article.attributes[:title]%></a></h4><% unless (@article.attributes[:tags].empty?) then %>
-		<div class="date"><%= @article.attributes[:date].strftime("%A, %d %B %Y") %></div>
-		<div><%=	@article.attributes[:tags].map{ |t| %{<span class="tag"><a href="/tags/#{t}/">#{t}</a></span>} }.join(" &middot; ") %>
-	</div>
+		<%= render 'article_meta', :article => @article %>
 	<% end %><%	if (@article.attributes[:summary] && !@no_summary) then %><div class="article-summary"><%= @article.attributes[:summary] %>
 	</div><% end %>
 </div>

M layouts/default.erb → layouts/default.erb

@@ -7,8 +7,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 	<head>
 		<title><%= @item[:title] %> - H3RALD</title>
 		<% if @item[:feed] then %>
-		<link rel="alternate" type="application/rss+xml" title="H3RALD - <%= @item[:feed_title]%> (RSS Feed)" href="<%= @item[:feed]%>rss/" />
-		<link rel="alternate" type="application/atom+xml" title="H3RALD - <%= @item[:feed_title]%> (Atom Feed)" href="<%= @item[:feed]%>atom/" />
+			<link rel="alternate" type="application/rss+xml" title="H3RALD - <%= @item[:feed_title]%> (RSS Feed)" href="<%= @item[:feed]%>rss/" />
+			<link rel="alternate" type="application/atom+xml" title="H3RALD - <%= @item[:feed_title]%> (Atom Feed)" href="<%= @item[:feed]%>atom/" />
 		<% end %>
 		<meta name="author" content="Fabio Cevasco" />
 		<meta name="copyright" content="Fabio Cevasco" />
@@ -19,16 +19,16 @@ <meta name="target_country" content="en-us" />
 		<meta name="country" content="United States" />
 		<meta name="description" content="H3RALD - Fabio Cevasco's Web Site" />
 		<% 	
-				min_keywords = "h3rald, fabio cevasco, "
-				default = "ruby, rails technical writing, reviews, software, browsers, articles, traveling, books, genova"
-				case @item[:type] 
-				when 'article' then
-					keywords = min_keywords+@item[:tags].join(', ')
-				when 'project' then
-					keywords = @item[:permalink] == 'h3rald' ? "fabio cevasco, "+@item[:permalink] : min_keywords+@item[:permalink]
-				else
-					keywords = min_keywords+default
-				end
+			min_keywords = "h3rald, fabio cevasco, "
+			default = "ruby, rails technical writing, reviews, software, browsers, articles, traveling, books, genova"
+			case @item[:type] 
+			when 'article' then
+				keywords = min_keywords+@item[:tags].join(', ')
+			when 'project' then
+				keywords = @item[:permalink] == 'h3rald' ? "fabio cevasco, "+@item[:permalink] : min_keywords+@item[:permalink]
+			else
+				keywords = min_keywords+default
+			end
 		%>
 		<meta name="keywords" content="<%= keywords %>" />
 		<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
@@ -36,7 +36,7 @@ <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 		<meta content="44.388041;9.073248" name="ICBM" />
 
 		<link href="/css/main.css" media="all" rel="stylesheet" type="text/css" />
-		
+
 	</head>
 	<body>
 		<a href="http://github.com/h3rald/h3rald"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" /></a>
@@ -54,9 +54,9 @@ <h1><span class="logo"></span><a id="logo" href="/" title="H3RALD"></a></h1>
 					</div>
 					<div id="header-right">
 						<ul id="navigation">
-						<% ['archives', 'projects', 'about', 'other'].each do |l| %>
-							<li><span class="preload nav-<%= l%>"></span><a id="nav-<%= l%>"href="/<%= l %>/" title="<%= l.upcase %>"/></a></li>
-						<% end %>
+							<% ['archives', 'projects', 'about', 'other'].each do |l| %>
+								<li><span class="preload nav-<%= l%>"></span><a id="nav-<%= l%>"href="/<%= l %>/" title="<%= l.upcase %>"/></a></li>
+							<% end %>
 						</ul>
 					</div>
 				</div>
@@ -73,41 +73,41 @@ <h2><%= @item[:title] %></h2>
 						<% 	case @item[:type]
 								when 'article' then%>
 								<div id="content-header">
-								<%= render 'article_meta', :article => @item %>
+									<%= render 'article_meta', :article => @item %>
+								</div>
+							<% end %>
+							<hr />
+							<div id="content-body">
+								<%= yield %>
+							</div>
+							<div id="content-footer">
+								<div class="share">
+									<script language="javascript">
+										zoneIdentifier="75F7945A08B626A8";
+										var varCheckURL = (("https:" == document.location.protocol) ? "https://" : "http://");
+										document.write(unescape("%3Cscript src='" + varCheckURL + "adcode.technoratimedia.com/bootstrap/tti.js' type='text/javascript'%3E%3C/script%3E"));
+									</script>
+									<hr class="spacer-20"></hr>
+									<a class="a2a_dd" href="http://www.addtoany.com/share_save"><img src="http://static.addtoany.com/buttons/share_save_120_16.gif" width="120" height="16" alt="Share/Save/Bookmark"/></a><script type="text/javascript">a2a_linkname=document.title;a2a_linkurl=location.href;a2a_onclick=1;a2a_prioritize=["delicious","stumbleupon","friendfeed","twitter","dzone","digg","reddit","slashdot","facebook","newsvine","sphere","ping"];</script>
+									<% if @item[:feed] then %>
+										<script type="text/javascript" src="http://static.addtoany.com/menu/page.js"></script>
+										<a class="a2a_dd" href="http://www.addtoany.com/subscribe?linkname=&amp;linkurl=http%3A%2F%2Fwww.h3rald.com%2Frss%2F"><img src="http://static.addtoany.com/buttons/subscribe_120_16.gif" width="120" height="16" alt="Subscribe"/></a><script type="text/javascript">a2a_linkname=document.title;a2a_linkurl="http://www.h3rald.com<%= @item[:feed] %>rss/";a2a_onclick=1;</script><script type="text/javascript" src="http://static.addtoany.com/menu/feed.js"></script>
+									<% end %>
 								</div>
-						<% end %>
-						<hr />
-						<div id="content-body">
-							<%= yield %>
+								<%= render 'article_buttons' if @item[:type] == 'article' %>
+							</div>
 						</div>
-						<div id="content-footer">
-							<div class="share">
-<script language="javascript">
-	zoneIdentifier="75F7945A08B626A8";
-	var varCheckURL = (("https:" == document.location.protocol) ? "https://" : "http://");
-	document.write(unescape("%3Cscript src='" + varCheckURL + "adcode.technoratimedia.com/bootstrap/tti.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<hr class="spacer-20"></hr>
-					<a class="a2a_dd" href="http://www.addtoany.com/share_save"><img src="http://static.addtoany.com/buttons/share_save_120_16.gif" width="120" height="16" alt="Share/Save/Bookmark"/></a><script type="text/javascript">a2a_linkname=document.title;a2a_linkurl=location.href;a2a_onclick=1;a2a_prioritize=["delicious","stumbleupon","friendfeed","twitter","dzone","digg","reddit","slashdot","facebook","newsvine","sphere","ping"];</script>
-					<% if @item[:feed] then %>
-					<script type="text/javascript" src="http://static.addtoany.com/menu/page.js"></script>
-					<a class="a2a_dd" href="http://www.addtoany.com/subscribe?linkname=&amp;linkurl=http%3A%2F%2Fwww.h3rald.com%2Frss%2F"><img src="http://static.addtoany.com/buttons/subscribe_120_16.gif" width="120" height="16" alt="Subscribe"/></a><script type="text/javascript">a2a_linkname=document.title;a2a_linkurl="http://www.h3rald.com<%= @item[:feed] %>rss/";a2a_onclick=1;</script><script type="text/javascript" src="http://static.addtoany.com/menu/feed.js"></script>
-					<% end %>
-				</div>
-							<%= render 'article_buttons' if @item[:type] == 'article' %>
-						</div>
+						<!-- CONTENT END -->
 					</div>
-					<!-- CONTENT END -->
+					<!-- CONTAINER END -->
 				</div>
-				<!-- CONTAINER END -->
-			</div>
-			<div class="ribbon"></div>
-			<!-- MAIN END -->
-			<div id="border-bottom">
+				<div class="ribbon"></div>
+				<!-- MAIN END -->
+				<div id="border-bottom">
 					<% if @item[:type] == 'article' then %>
-					<%= render 'comments' %>
+						<%= render 'comments' %>
 					<% else %>
-					<%= render 'services' %>
+						<%= render 'services' %>
 					<% end %>
 				</div>
 				<div class="clearfooter"></div>
@@ -119,11 +119,16 @@ H3RALD Web Site v8.0.0 <em>"xStatic"</em> &mdash; &copy; 2004-2009 <strong>Fabio Cevasco</strong> &mdash; <a class="link" href="http://creativecommons.org/licenses/by-nc-nd/3.0/">Some rights reserved</a> | <a href="http://validator.w3.org/check?uri=referer" class="link">XHTML 1.1</a> | <a href="http://jigsaw.w3.org/css-validator/" class="link">CSS 2.1</a>
 					</div>
 				</div> <!-- END FOOTER CONTAINER-->
 			</div> <!-- END FOOTER -->
-<script type="text/javascript">
-lloogg_clientid = "2830021149dc1a04";
-</script>
-<script type="text/javascript" src="http://lloogg.com/l.js?c=2830021149dc1a04">
-</script>			
+			<script type="text/javascript">
+				lloogg_clientid = "2830021149dc1a04";
+			</script>
+			<script type="text/javascript" src="http://lloogg.com/l.js?c=2830021149dc1a04"></script>			
+			<script src='http://www.google-analytics.com/ga.js' type='text/javascript'></script>			
+			<script>			
+				var pageTracker = _gat._getTracker("UA-287139-1");
+				pageTracker.setAllowLinker(true); 
+				pageTracker._trackPageview();
+			</script>			
 			<script src="http://www.google.com/jsapi?key=ABQIAAAA6h3j8Jri5D_da53UPbEbThRlq2n1sm52B5HDRR5tm6o8XM18FhTKn3v155RpPeD0kWnWG81QEhhifQ" type="text/javascript"></script>
 			<% if @site.config[:dev] = true then %>
 				<script src="/js/jquery.js" type="text/javascript"></script>
@@ -138,11 +143,11 @@ <script src="/js/compressed.js" type="text/javascript"></script>
 			<% end %>
 			<% if @item[:type] == 'page' then %>
 				<script type="text/javascript">
-				$(document).ready(function() {
-					display_opinions(7);
-					display_tweets(7);
-					display_bookmarks(7);
-					});
+					$(document).ready(function() {
+							display_opinions(7);
+							display_tweets(7);
+							display_bookmarks(7);
+							});
 				</script>
 			<% end %>
 			<% if @item[:type] == 'article' then %>
@@ -151,9 +156,9 @@ <% end %>
 			<% if @item[:github] then %>
 				<script type="text/javascript">
 					$(document).ready(function() {
-						display_commits(5, '<%= @item[:github] %>');
-					});
+							display_commits(5, '<%= @item[:github] %>');
+							});
 				</script>
 			<% end %>
-	</body>
-</html>
+		</body>
+	</html>

all repos — h3rald @ e481dbbaea2449f859f2b4282e8b17c047f95ea8

The sources of https://h3rald.com