Changeset [898845ef9f65d60a4432b1754016af0cfb380f2a] by Kalin Harvey
Revision 898845ef9f65d60a4432b1754016af0cfb380f2a,
committed by Kalin Harvey
· February 17th, 2010 @ 11:58 PM
Merge branch 'dcs_portal' of git://github.com/alexgreen/greenbuildingbrain
- 'dcs_portal' of git://github.com/alexgreen/greenbuildingbrain: changes to footer layout and sponsor page changes to spoonsor page. layout changes to search button adjust homepage thumbnail cols to isabel's specs IE fixes some IE fixes from prior to kalin's ie8 js
Conflicts:
app/controllers/dashboard_controller.rb
http://github.com/greenbuilding/greenbuildingbrain/commit/898845ef9...
16 changed files
-
A
public/images/gg-sponsor_logos.png -
A
public/images/gg-sponsor_page-logos.png -
M
app/controllers/dashboard_controller.rb -
M
app/views/dashboard/_buildings.html.erb -
M
app/views/dashboard/_infrastructure.html.erb -
M
app/views/dashboard/_showcase2010.html.erb -
M
app/views/dashboard/index.html.erb -
M
app/views/items/_gallery.html.erb -
M
app/views/items/show.html.erb -
M
app/views/layouts/_gg_nav_menu.html.erb -
M
app/views/layouts/_header.html.erb -
M
app/views/layouts/application.html.erb -
M
app/views/static/about.html.erb -
M
app/views/static/sponsors.html.erb -
M
public/stylesheets/gg.css -
M
public/stylesheets/ie7-ag.css