Permalink
Browse files

Merge remote-tracking branch 'origin/master'

Conflicts:
	views/map.jade
  • Loading branch information...
2 parents 9317125 + 89de2c4 commit d5adeb7d7366b766da1b483fe7d43e5b9a109d47 @jedahan jedahan committed Sep 9, 2011
Showing with 4 additions and 27 deletions.
  1. +4 −0 src/public/stylesheets/screen.css
  2. +0 −27 views/map.jade
@@ -235,6 +235,10 @@ html, body {
height:15px;
}
+#content #sidebar #resources .resource .feeds .feed.change.down .icion_wrapper {
+ background-image:url("../images/icon-arrow-down.png");
+}
+
#content #sidebar #resources .resource .feeds .feed.change .icon_wrapper .label {
position:absolute;
left:-999em;
View
@@ -39,33 +39,6 @@ html
option(value="rank") Rank
option(value="change") Change
ul#resources
- for i in [1, 2, 3]
- li.resource.alive
- h1.car_icon_wrapper
- span.car_icon Car Icon
- span.car_name Car Name
- ul.feeds
- li.feed.mpg
- h1.icon_wrapper
- span.label mpg
- | :
- span.data 55
- li.feed.rpm
- h1.icon_wrapper
- span.label rpm
- | :
- span.data 5000
- li.feed.rank
- h1.icon_wrapper
- span.label rank
- | :
- span.data 1
- li.feed.change
- h1.icon_wrapper
- span.label change
- | :
- span.data 5%
-
#footer
#copyright
p © Bug Labs, Inc. | 2011

0 comments on commit d5adeb7

Please sign in to comment.