Index: applications/mobileblur/static/css/base.css ================================================================== --- applications/mobileblur/static/css/base.css +++ applications/mobileblur/static/css/base.css @@ -517,10 +517,14 @@ body { /* background-color: #f2c84b;*/ color: #493F3E } + +a, a:hover { + text-decoration: none; +} header { background-color: #95392E; padding: 1%; border-bottom: 1px solid #95392E; @@ -534,36 +538,47 @@ #story > header > a { color: white; } -header > a> h2 { +header h2 { /* border-top: 1px solid white;*/ color: white; } #story-list { /* background-color: #f2c84b;*/ } -#story-list > .story > a, .feed > a { - text-decoration: none; +#story-list a, .feed { font-weight: bold; margin-top: 0; } -#story-list > .story > p { + +.story-date { font-size: .75em; + color: #493F3E; + font-weight: normal; +} + +.feed { + color: white; + text-decoration: none; } -#story-list > .story > .read { +.read { color: #D99B48; } -#story-list > .story > .unread, .feed > a { +.unread, .feed .feed-title { color: #C57E3C; } +.ng, .nt, .ps { + color: #493F3E; +} -#story-list > .story, .feed { +#story-list .story, .feed { + text-decoration: none; padding: .5%; border-top: 1px solid #95392E; margin-top: .33%; } @@ -585,10 +600,10 @@ background-color: #95392E; padding: 1%; border-top: 1px solid #95392E; color: white; } -footer > a { +footer a { text-decoration: none; color: white; font-weight: bold; } Index: applications/mobileblur/views/default/index.html ================================================================== --- applications/mobileblur/views/default/index.html +++ applications/mobileblur/views/default/index.html @@ -1,10 +1,12 @@ {{extend 'layout.html'}} {{ for feed in feeds.itervalues(): }} -
- {{ if threshold == -1 and feed["ng"] > 0: }} {{= feed["ng"] }} {{ pass }} - {{ if threshold <= 0 and feed["nt"] > 0: }} {{= feed["nt"] }} {{ pass }} - {{if feed["ps"] > 0: }}{{= feed["ps"] }} {{ pass }} - {{= feed["feed_title"] }}
-
+ +
+ {{ if threshold == -1 and feed["ng"] > 0: }} {{= feed["ng"] }} {{ pass }} + {{ if threshold <= 0 and feed["nt"] > 0: }} {{= feed["nt"] }} {{ pass }} + {{if feed["ps"] > 0: }}{{= feed["ps"] }} {{ pass }} + {{= feed["feed_title"] }} +
+
{{ pass }} Index: applications/mobileblur/views/feeds/view.html ================================================================== --- applications/mobileblur/views/feeds/view.html +++ applications/mobileblur/views/feeds/view.html @@ -4,25 +4,19 @@

{{= feed["feed_title"] }}

Mark feed as read {{ end }}
-{{ -import time -s = time.time() -}} {{ for story in stories: if sum([v for k,v in story["intelligence"].iteritems()]) < threshold: continue }} - {{ print story["read_status"] }} -
- - {{= story["story_title"] }} - -

{{= story["story_date"] }}

-
+ +
+

{{= story["story_title"] }}

+ +
+
{{ pass }} -{{ print time.time() - s }}