@@ -1,9 +1,7 @@ <div class="event_detail <%= event_class(event) %>"> <h2><%= event.name %></h2> -<p class="date"><%= event.date.strftime("%a %e %b") %></p> -<span class="counter"><%= event.number_of_days_remaining %></span> Days remaining -<br> -<span class="counter"><%= event.preceeding_lessons.size %></span> Lessons remaining beforehand -<br> -<span class="counter"><%= event.preceeding_events.size %></span> Events remaining beforehand +<div class="date"><%= event.date.strftime("%a %e %b") %></div> +<div><span class="counter"><%= event.number_of_days_remaining %></span> Days remaining</div> +<div><span class="counter"><%= event.preceeding_lessons.size %></span> Lessons remaining beforehand</div> +<div><span class="counter"><%= event.preceeding_events.size %></span> Events remaining beforehand</div> </div> \ No newline at end of file app/views/events/_event_detail.html.erb @@ -3,8 +3,12 @@ #header {height: 100px;} /*Primary and secondary event colourings*/ -.primary{color: #140F06; background: #FFFFFF url(images/ui-bg_fine-grain_15_ffffff_60x60.png) repeat scroll 50% 50%; border: 1px solid #140F06;} -.secondary{color: #FFFFFF; background: #654b24 url(images/ui-bg_fine-grain_65_654b24_60x60.png) 50% 50% repeat; } +.secondary{border: 1px solid #b2a266; background: #f7f3de url(images/ui-bg_fine-grain_15_f7f3de_60x60.png) 50% 50% repeat; color: #3a3427; } +.primary{border: 1px solid #681818; background: #b83400 url(images/ui-bg_fine-grain_68_b83400_60x60.png) 50% 50% repeat; color: #ffffff; } + + + + /*weekly div */ div#weekly table {border-collapse: collapse;} /*odd but works in IE as well*/ @@ -19,7 +23,9 @@ div#weekly div#next_event{float:left; width: 400px;} /*Event detail box*/ .event_detail{padding:10px;} - +.event_detail h2{margin:0;} +.event_detail div{margin-bottom:4px;} +.counter{border: 1px solid #b2a266; background: #f7f3de url(images/ui-bg_fine-grain_15_f7f3de_60x60.png) 50% 50% repeat; color: #3a3427; } .counter{font-size: x-large; border: 1px solid black; padding: 0 4px 0 4px;} /*daily div*/ public/stylesheets/shared.css a4669ca2a93a9f74b3f33efda984ba9255d5bea1 Wildfalcon laurie@wildfalcon.com http://github.com/wildfalcon/masterplan/commit/58a76557c4071e46ea97b806cf8df5bae937f8e6 58a76557c4071e46ea97b806cf8df5bae937f8e6 2009-11-11T10:26:10-08:00 2009-11-11T10:26:10-08:00 Added better colouring to primary and secondary events 4684dc296644c1916d663206d03f53a817bb90ac Wildfalcon laurie@wildfalcon.com