diff options
| -rw-r--r-- | app/views/user/_user_listing_single.rhtml | 12 | ||||
| -rw-r--r-- | public/stylesheets/main.css | 65 |
2 files changed, 50 insertions, 27 deletions
diff --git a/app/views/user/_user_listing_single.rhtml b/app/views/user/_user_listing_single.rhtml index 3e5368b54..932ebc898 100644 --- a/app/views/user/_user_listing_single.rhtml +++ b/app/views/user/_user_listing_single.rhtml @@ -1,17 +1,15 @@ <% if @highlight_words.nil? @highlight_words = [] end %> - -<p class="user_listing"> +<div class="user_listing"> + <span class="head"> <%= link_to highlight_words(display_user.name, @highlight_words), user_url(display_user) %> - - <br> - <!--<br>--> + </span> - <span class="user_listing_bottomline"> + <span class="bottomline"> <%= pluralize(display_user.info_requests.size, "request") %> made. <%= pluralize(display_user.track_things.size, "thing") %> tracked. Joined on <%= simple_date(display_user.created_at) %>. </span> -</p> +</div>
\ No newline at end of file diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css index 6a10b02b8..56804e706 100644 --- a/public/stylesheets/main.css +++ b/public/stylesheets/main.css @@ -217,8 +217,10 @@ h4, h5, h6 /* XXX Francis put this here so he could check highlighting worked */ .highlight { - background-color: #490C0F; - color: #fff; + background-color: #F0F0F0; + border-color: #A3A3A3; + border-width: 1px; + border-style: dotted; } dl { line-height: 1.2em; } @@ -258,10 +260,7 @@ dd { margin: 0.6em 0 2em 4em; width: 30em; } clear: none; padding: 0 0 0 0; border: none; -} - - #find_information span.head { margin: 0 0 0em 0px; } - +} #find_information span.bottomline { width: 22em; @@ -274,11 +273,18 @@ dd { margin: 0.6em 0 2em 4em; width: 30em; } float: none; background-image: none; padding: 0em 0em 0em 0em; } + #find_information span.head /* make request page sidebar override (picking up .request_listing span.head) */ + { + background-image: none; + padding: 12px 0 0 0px; + margin: 0 0 0em 0; + } /*--------------------------------- content : full lists */ .request_listing, -.body_listing +.body_listing, +.user_listing { font-size: 0.8em; margin-top: 1.5em; @@ -297,16 +303,18 @@ dd { margin: 0.6em 0 2em 4em; width: 30em; } } .request_listing a, - .body_listing a + .body_listing a, + .user_listing a { text-decoration: none; } - span.head + span.head { display: block; font-size: 1.4em; padding: 12px 0 0 0; + font-weight: bold; } - #request_list span.head /* full page request list only */ + .request_listing span.head /* full page request list only */ { min-height: 41px; margin: 0 0 0.3em 0; @@ -315,19 +323,36 @@ dd { margin: 0.6em 0 2em 4em; width: 30em; } background-repeat: no-repeat; background-position: 4px 0px; } + .body_listing span.head /* full page request list only */ + { + min-height: 41px; + margin: 0 0 0.3em 0; + padding: 8px 0 0 42px; + background-image: url(../images/navimg/auth-icon.png); + background-repeat: no-repeat; + background-position: 4px 0px; + } + .user_listing span.head /* full page request list only */ + { + min-height: 41px; + margin: 0 0 0.3em 0; + padding: 8px 0 0 42px; + background-image: url(../images/navimg/user-icon.png); + background-repeat: no-repeat; + background-position: 4px 0px; + } + span.bottomline { display: block; - padding: 6em 0 0.7em 0px; - /* Francis' FF 3 beta wasn't picking up no-repeat from #request_list span.bottomline; does this fix it??? */ - background-repeat: no-repeat; - background-position: left center; + padding: 10px 0 0 42px; + } - #request_list span.bottomline /* full page request list only */ + .request_listing span.bottomline + /* full page request list only */ { width: 30em; - padding: 10px 0 0 42px; margin: 0 0 0.6em 0; background-repeat: no-repeat; background-position: left center; @@ -351,8 +376,6 @@ dd { margin: 0.6em 0 2em 4em; width: 30em; } /* Alert */ span.bottomline.icon_requires_admin { background-image: url(../images/navimg/status-icons-attn.png);} -.body_listing .bottomline -{ padding: 0px 0 0 0px; margin: 0 0 0em 0; clear: both;} span.bottomline a {} @@ -366,7 +389,8 @@ dd { margin: 0.6em 0 2em 4em; width: 30em; } color: #3F3F3F; overflow: hidden; } - #request_list span.desc /* full page request list only */ + .request_listing span.desc + /* full page request list only */ { width: 23em; background-image: url(../images/navimg/quote-open.png); @@ -376,7 +400,8 @@ dd { margin: 0.6em 0 2em 4em; width: 30em; } } .body_listing span.desc - { background-image: none; float: left; clear: both; padding: 0px 0 0 0px;} + { background-image: none; float: left; clear: both; padding: 0px 0 0 42px;} + #list_sidebar |