Permalink
Commits on Dec 29, 2010
  1. Corrected issue with "View All Projects" link on main page. Corrected…

    jordan@futurefridays.com jordan@futurefridays.com
    jordan@futurefridays.com authored and jordan@futurefridays.com committed Dec 29, 2010
    … height of Amazon Payments div to prevent footer from being misaligned.
Commits on Dec 28, 2010
  1. additional ui tweaks

    bitwelder committed Dec 28, 2010
  2. slight adjustments

    bitwelder committed Dec 28, 2010
  3. Merge branch 'master' into edit_org_page

    jordan@futurefridays.com jordan@futurefridays.com
    jordan@futurefridays.com authored and jordan@futurefridays.com committed Dec 28, 2010
    Conflicts:
    	public/stylesheets/sass/screen.scss
  4. commit to allow merge.

    jordan@futurefridays.com jordan@futurefridays.com
    jordan@futurefridays.com authored and jordan@futurefridays.com committed Dec 28, 2010
  5. Edited css to style page for editing an organization

    jordan@futurefridays.com jordan@futurefridays.com
    jordan@futurefridays.com authored and jordan@futurefridays.com committed Dec 28, 2010
  6. more edits

    jordan@futurefridays.com jordan@futurefridays.com
    jordan@futurefridays.com authored and jordan@futurefridays.com committed Dec 28, 2010
  7. edits

    jordan@futurefridays.com jordan@futurefridays.com
    jordan@futurefridays.com authored and jordan@futurefridays.com committed Dec 28, 2010
  8. Changed margins between forms. Can be edited further if needed.

    jordan@futurefridays.com jordan@futurefridays.com
    jordan@futurefridays.com authored and jordan@futurefridays.com committed Dec 28, 2010
  9. Merge branch 'master' into admin_edit_project_view

    jordan@futurefridays.com jordan@futurefridays.com
    jordan@futurefridays.com authored and jordan@futurefridays.com committed Dec 28, 2010
  10. Merge branch 'master' into edit_org_page

    jordan@futurefridays.com jordan@futurefridays.com
    jordan@futurefridays.com authored and jordan@futurefridays.com committed Dec 28, 2010
    Conflicts:
    	public/stylesheets/sass/screen.scss
Commits on Dec 27, 2010
  1. Merge branch 'master' into project-page-redesign

    bitwelder committed Dec 27, 2010
    Conflicts:
    	app/views/projects/show.html.haml
  2. added some breaks

    bitwelder committed Dec 27, 2010
  3. jquery-ui support images

    bitwelder committed Dec 27, 2010
  4. merge Gemfile

    bitwelder committed Dec 27, 2010
  5. Merge branch 'master' into cancan

    bitwelder committed Dec 27, 2010
    Conflicts:
    	Gemfile
Commits on Dec 22, 2010
  1. fix button link

    bitwelder committed Dec 22, 2010
  2. remove old links

    bitwelder committed Dec 22, 2010
Commits on Dec 20, 2010
  1. Changed site-wide font to pixel size 12. Corrected any divs or areas …

    jordan@futurefridays.com jordan@futurefridays.com
    jordan@futurefridays.com authored and jordan@futurefridays.com committed Dec 20, 2010
    …that resulted in overflow. Changed font-size of RSSInclude box, removed padding from feed box to better align it with the other landing page div tops but it's not perfect. User-end appears to be clean, admin end appeared to bear no affect from the change.
Commits on Dec 17, 2010
  1. remove hassle reference

    bitwelder authored and patshaughnessy committed Dec 14, 2010
Commits on Dec 16, 2010
  1. Edited show.html.haml for displaying project details after an edit. U…

    jordan@futurefridays.com jordan@futurefridays.com
    jordan@futurefridays.com authored and jordan@futurefridays.com committed Dec 16, 2010
    …sed mostly breaks (which is hack-y but it's a simple fix. Should work out fine.
  2. Edited the Admin Edit Project form to appear as a list and styled wit…

    jordan@futurefridays.com jordan@futurefridays.com
    jordan@futurefridays.com authored and jordan@futurefridays.com committed Dec 16, 2010
    …h CSS.
  3. Edited scss to style admin organization details view.

    jordan@futurefridays.com jordan@futurefridays.com
    jordan@futurefridays.com authored and jordan@futurefridays.com committed Dec 16, 2010
  4. Restyled the right cols layout of images and social buttons.

    wm committed Dec 14, 2010
    Also restyled the header a little.
  5. Added a new medium style for Photo for use on the project page.

    wm committed Dec 13, 2010
    Updated the left_col, project_img, and project_information style to match new
    mocks.
Commits on Dec 14, 2010