[openstreetmap-website] Clean rebase (#13)

Tom MacWright reply+i-3174906-13999be43a27ccfccb5a63cff5cf2c248608e567-1419053 at reply.github.com
Fri Feb 10 16:57:33 GMT 2012


Rebased & cleaned commits from the other pull; this unifies the RTL and LTR work, and fixes semicolon style, though a few examples of the random K&R style exist throughout the styles.

You can merge this Pull Request by running:

  git pull https://github.com/tmcw/openstreetmap-website clean-rebase

Or you can view, comment on it, or merge it online at:

  https://github.com/openstreetmap/openstreetmap-website/pull/13

-- Commit Summary --

* Cleanup style
* Don't check the ACL unless we're creating a new user
* Add convenience methods to make ACL use simpler
* Style fixes: add space between colon and value

-- File Changes --

M app/assets/stylesheets/common.css.scss (165)
M app/assets/stylesheets/large.css (2)
M app/assets/stylesheets/ltr.css.scss (21)
M app/assets/stylesheets/rtl.css.scss (24)
M app/controllers/trace_controller.rb (2)
M app/controllers/user_controller.rb (6)
M app/models/acl.rb (8)
M app/views/layouts/site.html.erb (10)
M app/views/site/index.html.erb (2)

-- Patch Links --

  https://github.com/openstreetmap/openstreetmap-website/pull/13.patch
  https://github.com/openstreetmap/openstreetmap-website/pull/13.diff

--- 
Reply to this email directly or view it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/13



More information about the rails-dev mailing list