Changeset [ad1118e81d28596dad71375499a570b3e4771458] by Graeme Worthy

May 22nd, 2009 @ 11:15 AM

Merge branch 'master' of git://github.com/krrh/greenbuildingbrain

  • 'master' of git://github.com/krrh/greenbuildingbrain: dumped opacity 75% from container class added in maybe important file from merge integrated alex's css into the item view (mostly) made the homepage work well with alex's css updated dashboard with alex's stylesheets, and made infobubbles work on map view

Conflicts:

app/views/items/_recent_comments.html.erb
app/views/items/_stats.html.erb

http://github.com/graemeworthy/g...

Committed by Graeme Worthy

  • M app/controllers/dashboard_controller.rb
  • M app/controllers/homepage_controller.rb
  • M app/controllers/map_controller.rb
  • M app/views/dashboard/index.html.erb
  • M app/views/homepage/index.html.erb
  • M app/views/items/_address.html.erb
  • M app/views/items/_description.html.erb
  • M app/views/items/_picture.html.erb
  • M app/views/items/_project_team.html.erb
  • M app/views/items/_recent_comments.html.erb
  • M app/views/items/_related_links.html.erb
  • M app/views/items/_summary.html.erb
  • M app/views/items/_tags.html.erb
  • M app/views/items/_toc.html.erb
  • M app/views/items/show.html.erb
  • M app/views/layouts/_footer.html.erb
  • M app/views/layouts/_header.html.erb
  • M app/views/layouts/_map_header.html.erb
  • M app/views/layouts/application.html.erb
  • M app/views/layouts/map.html.erb
  • M public/images/GBBlogo.gif
  • M public/images/add_item.gif
  • M public/stylesheets/GBBstyles.css
  • M public/stylesheets/forms.css
  • M public/stylesheets/greenbuildingmap.css
  • M public/stylesheets/grid.css
  • M public/stylesheets/ie.css
  • M public/stylesheets/old_gbb.css
  • M public/stylesheets/print.css
  • M public/stylesheets/reset.css
  • M public/stylesheets/src/blueprint_grid_25+15x18.png
  • M public/stylesheets/src/grid.png
  • M public/stylesheets/typography.css
  • M spec/controllers/dashboard_controller_spec.rb
New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป

The Green Building Brain is an open source and open content tool for collaboration and resource sharing between green building professionals and amateurs.