From 49bd2173324595cb426e640dc36bfd884f4f2c35 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Wed, 11 Aug 2010 22:44:40 -0400
Subject: [PATCH] Better looking taskbar divider. Now adds depth and shadow
 ebtween the feed list and taskbar.

---
 media/css/reader.css         |  15 +++--
 templates/reader/feeds.xhtml | 107 ++++++++++++++++++-----------------
 2 files changed, 67 insertions(+), 55 deletions(-)

diff --git a/media/css/reader.css b/media/css/reader.css
index 74577efda..7b6ae1a3a 100644
--- a/media/css/reader.css
+++ b/media/css/reader.css
@@ -355,7 +355,6 @@ a img {
     padding: 0;
     width: auto !important;
     height: auto !important;
-    border-bottom: 1px solid #777D86;
 }
 
 #feed_list ul.folder {
@@ -515,7 +514,7 @@ a img {
   bottom: 0;
   display: none;
   background-color: #505050;
-  border-top: 1px solid #E0E0E0;
+  border-top: 1px solid #777D86;
   border-bottom: 1px solid #101010;
   color: #fff;
   text-shadow: 0 1px 0 #202020;
@@ -523,6 +522,10 @@ a img {
   z-index: 1;
 }
 
+.NB-feeds-progress-container {
+  border-top: 1px solid #E0E0E0;
+}
+
 #NB-feeds-progress .NB-feeds-progress-close {
   width: 11px;
   height: 11px;
@@ -1088,11 +1091,15 @@ background: transparent;
 /* = Task Bar = */
 /* ============ */
 
-.NB-taskbar {
+.NB-taskbar-container {
     background: #e0e0e0 url('../img/reader/taskbar_background.png') repeat-x top left;
+    border-top: 1px solid #777D86;
+    z-index: 10;
+}
+
+.NB-taskbar {
     position: relative;
     border-top: 1px solid #F0F0F0;
-    z-index: 10;
 }
 
 .NB-taskbar .NB-task-view-page-to-feed-arrow {
diff --git a/templates/reader/feeds.xhtml b/templates/reader/feeds.xhtml
index c8b4c2c42..d50f8786e 100644
--- a/templates/reader/feeds.xhtml
+++ b/templates/reader/feeds.xhtml
@@ -269,35 +269,38 @@
     <ul class="left-center" id="feed_list"></ul>
     
     <div id="NB-feeds-progress">
-      <div class="NB-feeds-progress-close"></div>
-      <div class="NB-feeds-progress-title">Fetching your feeds</div>
-      <div class="NB-feeds-progress-percentage"></div>
-      <div class="NB-feeds-progress-counts">
-        <span class="NB-feeds-progress-counts-fetched"></span>
-        /
-        <span class="NB-feeds-progress-counts-total"></span>
+      <div class="NB-feeds-progress-container">
+        <div class="NB-feeds-progress-close"></div>
+        <div class="NB-feeds-progress-title">Fetching your feeds</div>
+        <div class="NB-feeds-progress-percentage"></div>
+        <div class="NB-feeds-progress-counts">
+          <span class="NB-feeds-progress-counts-fetched"></span>
+          /
+          <span class="NB-feeds-progress-counts-total"></span>
+        </div>
+        <div class="NB-feeds-progress-bar"></div>
       </div>
-      <div class="NB-feeds-progress-bar"></div>
     </div>
     
-    <div class="NB-taskbar left-south">
-      <div class="NB-callout-ftux NB-callout">
-        <div class="NB-callout-container">
-          <div class="NB-callout-text"></div>
-          <div class="NB-callout-arrow"></div>
+    <div class="NB-taskbar-container left-south">
+      <div class="NB-taskbar">
+        <div class="NB-callout-ftux NB-callout">
+          <div class="NB-callout-container">
+            <div class="NB-callout-text"></div>
+            <div class="NB-callout-arrow"></div>
+          </div>
+        </div>
+        <ul class="taskbar_nav taskbar_nav_feeds">
+          <li class="task_button task_button_menu NB-task-add"></li>
+          <li class="task_button task_button_menu NB-task-manage NB-disabled"></li>
+        </ul>
+        <div class="NB-taskbar-intelligence">
+          <div class="NB-taskbar-intelligence-indicator NB-taskbar-intelligence-negative"></div>
+          <div class="NB-taskbar-intelligence-indicator NB-taskbar-intelligence-neutral"></div>
+          <div class="NB-taskbar-intelligence-indicator NB-taskbar-intelligence-positive"></div>
+          <div class="NB-intelligence-slider"></div>
         </div>
       </div>
-    	<ul class="taskbar_nav taskbar_nav_feeds">
-    		<li class="task_button task_button_menu NB-task-add">
-    		<li class="task_button task_button_menu NB-task-manage NB-disabled">
-    		</li>
-    	</ul>
-    	<div class="NB-taskbar-intelligence">
-    	  <div class="NB-taskbar-intelligence-indicator NB-taskbar-intelligence-negative"></div>
-    	  <div class="NB-taskbar-intelligence-indicator NB-taskbar-intelligence-neutral"></div>
-    	  <div class="NB-taskbar-intelligence-indicator NB-taskbar-intelligence-positive"></div>
-    	 <div class="NB-intelligence-slider"></div>
-    	</div>
     </div>
 
 </div>
@@ -314,36 +317,38 @@
     <div id="story_titles" class="right-north"></div>
 
     <div class="content-pane">
-        <div id="story_taskbar" class="NB-taskbar content-north">
+        <div id="story_taskbar" class="NB-taskbar-container content-north">
+          <div class="NB-taskbar">
           
-          <ul class="taskbar_nav taskbar_nav_view">
-            <li class="task_button task_button_view task_view_page NB-active"><span class="NB-task-title">Original</span>
-              <div class="NB-task-view-page-to-feed-arrow"></div>
-            </li>
-            <li class="task_button task_button_view task_view_feed"><span class="NB-task-title">Feed</span></li>
-            <li class="task_button task_button_view task_view_story"><span class="NB-task-title">Story</span></li>
-          </ul>
+            <ul class="taskbar_nav taskbar_nav_view">
+              <li class="task_button task_button_view task_view_page NB-active"><span class="NB-task-title">Original</span>
+                <div class="NB-task-view-page-to-feed-arrow"></div>
+              </li>
+              <li class="task_button task_button_view task_view_feed"><span class="NB-task-title">Feed</span></li>
+              <li class="task_button task_button_view task_view_story"><span class="NB-task-title">Story</span></li>
+            </ul>
 
-          <ul class="taskbar_nav taskbar_nav_return">
-            <li class="task_button task_return">
-              <span class="NB-task-title">
-                <div>Return to</div>
-                <div>Original</div>
-              </span>
-            </li>
-          </ul>
+            <ul class="taskbar_nav taskbar_nav_return">
+              <li class="task_button task_return">
+                <span class="NB-task-title">
+                  <div>Return to</div>
+                  <div>Original</div>
+                </span>
+              </li>
+            </ul>
 
-          <ul class="taskbar_nav taskbar_nav_story first">
-            <li class="task_button task_button_story task_story_previous"></li>
-            <li class="task_button task_button_story task_story_next_unread task_story_next_positive">
-              <span class="NB-task-title">Next Unread</span>
-            </li>
-            <li class="task_button task_button_story task_story_next"></li>
-            {% if not user.is_authenticated %}
-              <li class="task_button task_button_signup"></li>
-            {% endif %}
-          </ul>
-          
+            <ul class="taskbar_nav taskbar_nav_story first">
+              <li class="task_button task_button_story task_story_previous"></li>
+              <li class="task_button task_button_story task_story_next_unread task_story_next_positive">
+                <span class="NB-task-title">Next Unread</span>
+              </li>
+              <li class="task_button task_button_story task_story_next"></li>
+              {% if not user.is_authenticated %}
+                <li class="task_button task_button_signup"></li>
+              {% endif %}
+            </ul>
+            
+          </div>
         </div>
           
         {% if not user.is_authenticated %}