Changeset [d33428bd1e7da852b5f53a43af4468e053fe3494] by Kalin Harvey
Revision d33428bd1e7da852b5f53a43af4468e053fe3494,
committed by Kalin Harvey
· June 9th, 2009 @ 10:23 PM
Merge branch 'master' of git@github.com:greenbuilding/greenbuildingbrain
- 'master' of git@github.com:greenbuilding/greenbuildingbrain: moved 'description' title into .description div show Zion in Buildings for Demo tomorrow. in stats list, value is not indented wider descripton field better map view grey background on tags alex's css, as well as a complete redo of map-view improved related links
Conflicts:
app/views/dashboard/index.html.erb
12 changed files
-
M
app/models/item.rb -
M
app/views/dashboard/index.html.erb -
M
app/views/items/_description.html.erb -
M
app/views/items/_edit_description.html.erb -
M
app/views/items/_related_links.html.erb -
M
app/views/items/_tags.html.erb -
M
app/views/layouts/map.html.erb -
M
app/views/map/index.js.rjs -
M
public/markdown.html -
M
public/stylesheets/GBBstyles.css -
M
public/stylesheets/grid.css -
M
public/stylesheets/old_gbb.css