Merge pull request #15 from ilendl2/master

foundation tricks changed to grid
chrisdev · May 11, 2012 · 935d925 · 935d925
2 parents 6cd6991 + d62bb66
commit 935d925
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/foundation_theme_site/static/css/site_styles.css b/foundation_theme_site/static/css/site_styles.css
@@ -12,4 +12,13 @@ footer.row li {
 
 h2 {
 	text-align: center;
+}
+
+footer.row a{
+	color: #545454;
+}
+
+footer.row a:hover{
+	color: #00A5FF;
+	text-decoration: none;
 }
diff --git a/foundation_theme_site/templates/_footer.html b/foundation_theme_site/templates/_footer.html
@@ -6,6 +6,10 @@
     	</div>
 
     	<div class="six columns">
-    		<li style="text-align: right; padding-right: 30px;"><span class="glyph social">e</span><span class="glyph social">d</span><span class="glyph social">g</span></li>
+    		<li style="text-align: right;">
+    			<a target="_blank" href="https://www.facebook.com/chrisdevtt"><span class="glyph social">d</span></a>
+    			<a target="_blank" href="https://twitter.com/realchrisdev"><span class="glyph social">e</span></a>
+       			<a target="_blank" href="feed://www.chrisdev.com/blog/feed/all/"><span class="glyph social">c</span></a>
+    		</li>
     	</div>
 </div>
diff --git a/.../templates/designs/foundation_tricks.html → ...te/templates/designs/foundation_grid.html b/.../templates/designs/foundation_tricks.html → ...te/templates/designs/foundation_grid.html
@@ -10,7 +10,7 @@
 
 <div class="container">
 
-	<h2>Foundation Tricks</h2>
+	<h2>Foundation Grid</h2>
 
   <div class="row title">
     <h3>Offsetting Content</h3>

diff --git a/foundation_theme_site/templates/navbar.html b/foundation_theme_site/templates/navbar.html
@@ -16,8 +16,8 @@
     			<li><a href="/column_flip/"><span class="glyph general">c</span>Column Flip</a></li>
     			<li><a href="/gallery_design/"><span class="glyph general">a</span>Gallery Design</a></li>
     			<li><a href="/featured_items/"><span class="glyph general">i</span>Featured Items</a></li>
+    			<li><a href="/foundation_grid/"><span class="glyph general">p</span>Foundation Grid</a></li>
     			<li><a href="/featured_shuffle/"><span class="glyph general">b</span>Featured Shuffle</a></li>
-    			<li><a href="/foundation_tricks/"><span class="glyph general">p</span>Foundation Tricks</a></li>
     		</ul>
     </li> 
     <li class="has-dropdown">

diff --git a/foundation_theme_site/urls.py b/foundation_theme_site/urls.py
@@ -44,8 +44,8 @@
         "template": "designs/featured_items.html",
     }, name="home"),
 
-    url(r"^foundation_tricks/$", direct_to_template, {
-        "template": "designs/foundation_tricks.html",
+    url(r"^foundation_grid/$", direct_to_template, {
+        "template": "designs/foundation_grid.html",
     }, name="home"),
 
     url(r"^how_to_install/$",direct_to_template, {