diff --git a/app/assets/stylesheets/active_admin.css.scss b/app/assets/stylesheets/active_admin.css.scss index 0f919ef5..ece7e4e5 100644 --- a/app/assets/stylesheets/active_admin.css.scss +++ b/app/assets/stylesheets/active_admin.css.scss @@ -20,7 +20,7 @@ // // Notice that Active Admin CSS rules are nested within a // 'body.active_admin' selector to prevent conflicts with -// other pages in the app. It is best to wrap your changes in a +// other pages in the app. It is best to wrap your changes in a // namespace so they are properly recognized. You have options // if you e.g. want different styles for different namespaces: // diff --git a/app/assets/stylesheets/colors.css.scss b/app/assets/stylesheets/colors.css.scss index 9e029d4d..e58d3f16 100644 --- a/app/assets/stylesheets/colors.css.scss +++ b/app/assets/stylesheets/colors.css.scss @@ -9,4 +9,4 @@ $cmLightGrey: #c8c8c8; $cmOffBlack: #292929; $lightYellow: #ffffcc; -$red: #ff0000; \ No newline at end of file +$red: #ff0000; diff --git a/app/assets/stylesheets/foundation-icons.css b/app/assets/stylesheets/foundation-icons.css index cde8021d..3984b13b 100644 --- a/app/assets/stylesheets/foundation-icons.css +++ b/app/assets/stylesheets/foundation-icons.css @@ -1,4 +1,4 @@ -/* +/* * Foundation Icons v 3.0 * Made by ZURB 2013 http://zurb.com/playground/foundation-icon-fonts-3 * MIT License diff --git a/app/views/admin/user_locations/_user_locations_map.html.erb b/app/views/admin/user_locations/_user_locations_map.html.erb index 19aa3c40..3673a829 100644 --- a/app/views/admin/user_locations/_user_locations_map.html.erb +++ b/app/views/admin/user_locations/_user_locations_map.html.erb @@ -1,6 +1,6 @@

Registered Users by Sign-in Location

- + <%= yield :scripts %>
diff --git a/app/views/devise/menu/_login_items.html.erb b/app/views/devise/menu/_login_items.html.erb index d80b7b73..04116efc 100644 --- a/app/views/devise/menu/_login_items.html.erb +++ b/app/views/devise/menu/_login_items.html.erb @@ -1,5 +1,5 @@ <% if user_signed_in? %> - <%= link_to('Logout', destroy_user_session_path, :method => :delete) %> + <%= link_to('Logout', destroy_user_session_path, :method => :delete) %> <% else %> - <%= link_to('Login', new_user_session_path) %> + <%= link_to('Login', new_user_session_path) %> <% end %> diff --git a/app/views/devise/registrations/_profile.html.erb b/app/views/devise/registrations/_profile.html.erb index 92ff55fc..0b06fa82 100644 --- a/app/views/devise/registrations/_profile.html.erb +++ b/app/views/devise/registrations/_profile.html.erb @@ -36,7 +36,7 @@
<%= f.button :submit, "Update my Email Preferences", :class => "tiny radius button" %>
- <% end %> + <% end %> diff --git a/app/views/devise/registrations/_services.html.erb b/app/views/devise/registrations/_services.html.erb index faf3ce6e..cdc8c099 100644 --- a/app/views/devise/registrations/_services.html.erb +++ b/app/views/devise/registrations/_services.html.erb @@ -4,21 +4,21 @@
<% if current_user.services.exists? %>
The following <%= @services.count == 1 ? 'account is' : 'services are' %> connected with your CodeMontage account:
- - <% @services.each do |service| %> -
+ + <% @services.each do |service| %> +
<%= image_tag "#{service.provider}_64.png", :size => "64x64" %>
-
Login: <%= service.ulogin.to_s != '' ? service.ulogin : 'not set' %>
+
Login: <%= service.ulogin.to_s != '' ? service.ulogin : 'not set' %>
Email: <%= service.uemail != '' ? service.uemail : 'not set' %>
<% @services.count == 1 ? @msg = 'Removing this service might lock you out of your account if you do not know your CodeMontage email and password' : @msg = '' %> <%= link_to "Remove this service", service, :confirm => 'Are you sure you want to remove this authentication service? ' + @msg, :method => :delete, :class => "remove" %>
-
+
<% end %> - + <% else %>
There are currently no external services connected with your CodeMontage account. We recommend adding <%= link_to "Github", "/auth/github" %>.
<% end %> diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index fe93a64b..635c0cdf 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -11,7 +11,7 @@ <%= f.button :submit, "Sign up", :class => "small radius button" %>
<% end %> - + <%= link_to "Sign in", new_session_path(resource_name) %> | <%= link_to "Forgot your password?", new_password_path(resource_name) %> @@ -22,4 +22,4 @@
<%= link_to ' Sign up with GitHub'.html_safe, "/auth/github", :class => "large radius index button home-signup" %> -
\ No newline at end of file + diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb index eab783a4..33b1120f 100644 --- a/app/views/devise/shared/_links.erb +++ b/app/views/devise/shared/_links.erb @@ -22,4 +22,4 @@ <%- resource_class.omniauth_providers.each do |provider| %> <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %>
<% end -%> -<% end -%> \ No newline at end of file +<% end -%> diff --git a/app/views/home/about.html.erb b/app/views/home/about.html.erb index 48cabdcb..4693cb5b 100644 --- a/app/views/home/about.html.erb +++ b/app/views/home/about.html.erb @@ -20,7 +20,7 @@
Our Team
Major Contributors
- +
@@ -81,7 +81,7 @@
  • <%= link_to ' '.html_safe + 'theresafreet', 'http://twitter.com/theresafreet', :target => '_blank' %>
  • <%= link_to ' '.html_safe + 'tfreet', 'http://github.com/tfreet', :target => '_blank' %>
    • -
    +
    <%= link_to (image_tag "https://secure.gravatar.com/avatar/8cee3c0153dde40e14dc6794295d5ee9?s=420&d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png", :alt => "Nathan Hurst", :size => "150x150"), 'http://nahurst.com', :target => '_blank' %>
    diff --git a/app/views/home/code_good_day.html.erb b/app/views/home/code_good_day.html.erb index 34c588a2..d8e0805f 100644 --- a/app/views/home/code_good_day.html.erb +++ b/app/views/home/code_good_day.html.erb @@ -1,7 +1,7 @@

    #CodeGoodSunday

    - +

    Use your powers for good.

    @@ -12,7 +12,7 @@
    - +

    Join us for the #CodeGoodSunday TwitterChat and tell us about the open source projects you're excited about. Here’s how:

    @@ -22,7 +22,7 @@
  • Join us on Twitter the last Sunday of the month @ 4PM EST and use the hashtag #CodeGoodSunday to tell us what open source projects you're working on!
    • - +

    FAQ

    How does a TwitterChat work?

    @@ -50,7 +50,7 @@
    -

    For questions, tweet or with the hashtag #CodeGoodSunday.

    +

    For questions, tweet or with the hashtag #CodeGoodSunday.

    See you Sunday!

    diff --git a/app/views/home/code_of_conduct.html.erb b/app/views/home/code_of_conduct.html.erb index 3e8064bd..08edd650 100644 --- a/app/views/home/code_of_conduct.html.erb +++ b/app/views/home/code_of_conduct.html.erb @@ -44,4 +44,4 @@ <% end %> <% end %> -

    If you experience or witness any harassment at these events, please contact one of the organizers listed above.

    \ No newline at end of file +

    If you experience or witness any harassment at these events, please contact one of the organizers listed above.

    diff --git a/app/views/home/dashboard/_projects.html.erb b/app/views/home/dashboard/_projects.html.erb index d87e824d..4ca8797e 100644 --- a/app/views/home/dashboard/_projects.html.erb +++ b/app/views/home/dashboard/_projects.html.erb @@ -9,5 +9,5 @@

    Looking for something else? Browse more <%= link_to "projects to change the world", projects_path %>.

    <% else %>

    No favorites yet? We'd recommend <%= %>. Or, browse more <%= link_to "projects to change the world", projects_path %>.

    - <% end %> + <% end %>
    diff --git a/app/views/home/developers_for_good.html.erb b/app/views/home/developers_for_good.html.erb index 911aa4d6..cdef7a86 100644 --- a/app/views/home/developers_for_good.html.erb +++ b/app/views/home/developers_for_good.html.erb @@ -1,9 +1,9 @@

    Developers for Good

    - +

    Developers for Good began in January 2010 in New York City when founder Vanessa Hurst grew frustrated that her software release schedule conflicted with soup kitchen volunteer opportunities and went searching for a better way to change the world.

    Thanks to a pilot program with Catchafire, a skills-based volunteering startup, she was able to volunteer her database skills. Vanessa was moved by the amount of value created - the nonprofit organization (The OpEd Project) saved thousands of dollars, she got to practice what she loves, and the staff is now more effective thanks to better technology.

    Technology is one of the top needs for non-profits and social mission organizations, but NGO social networks tend to have no overlap with developers and thus underfunded, accidental techies end up scraping together technical solutions.

    Developers for Good brings motivated technologists of all skill levels together with social entrepreneurs so together they can improve the world.

    Connect with the Developers for Good community through Twitter, Facebook, one-on-one Ohours conversations, or our monthly in-person Meetup.

    - \ No newline at end of file + diff --git a/app/views/home/our_jobs.html.erb b/app/views/home/our_jobs.html.erb index 0df67126..f3c383d5 100644 --- a/app/views/home/our_jobs.html.erb +++ b/app/views/home/our_jobs.html.erb @@ -1,11 +1,11 @@

    Jobs

    - +
    CodeMontage is making humanitarian software development the standard in professional development for coders.
    - +

    We believe coders make the best superheroes, and that empowering coders to improve themselves while improving the world is as cool as it gets. If you agree, <%= mail_to "jobs@codemontage.com", " drop us a line",:subject => "I want to help make superheroes!" %> and tell us about the moment you realized coders could be superheroes.

    We're always on the lookout for passionate people who are smart, get things done, solve hard problems, and explain their solutions.

    - +

    Some of the specific problems we're working to solve:

    - +

    Specifically, there are some roles and skill sets we'd love more of:

    - \ No newline at end of file + diff --git a/app/views/jobs/index.html.erb b/app/views/jobs/index.html.erb index 91320ebc..3d325497 100644 --- a/app/views/jobs/index.html.erb +++ b/app/views/jobs/index.html.erb @@ -2,7 +2,7 @@

    Jobs You've Been Looking For

    - +

    Wonder if you can make a difference with most of your time, instead of just your free time? Check out the full-time, paid opportunities below at companies that want to help you make a bigger impact on the world.

    @@ -13,7 +13,7 @@
    <%= link_to job.title, job.apply_url %> at <%= link_to job.organization.name, job.organization.url %>
    -
    <%= "{ " + job.technology_list.to_s + " }" unless !job.technology_list.present? %>
    +
    <%= "{ " + job.technology_list.to_s + " }" unless !job.technology_list.present? %>
    diff --git a/app/views/layouts/_google_analytics.html.erb b/app/views/layouts/_google_analytics.html.erb index d776901d..cec32bfd 100644 --- a/app/views/layouts/_google_analytics.html.erb +++ b/app/views/layouts/_google_analytics.html.erb @@ -1,6 +1,6 @@