public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-21 05:45:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:samuelclay/NewsBlur

Browse source
This commit is contained in:
Samuel Clay 2010-08-11 22:53:24 -04:00
commit f09e6ac62e
2 changed files with 67 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
media/css/reader.css
View file

@ -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 {

15
templates/reader/feeds.xhtml
View file

@ -269,6 +269,7 @@
<ul class="left-center" id="feed_list"></ul>
<div id="NB-feeds-progress">
<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>
@ -279,8 +280,10 @@
</div>
<div class="NB-feeds-progress-bar"></div>
</div>
</div>
<div class="NB-taskbar left-south">
<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>
@ -288,9 +291,8 @@
</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>
<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>
@ -299,6 +301,7 @@
<div class="NB-intelligence-slider"></div>
</div>
</div>
</div>
</div>
@ -314,7 +317,8 @@
<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>
@ -345,6 +349,7 @@
</ul>
</div>
</div>
{% if not user.is_authenticated %}
<div class="NB-callout-ftux-signup NB-callout">