Styled Proofs:

For Model, organized layout

For Views, general formatting

For Controller, refactored approved?

For Coffeescript, extracted general code to global.js.coffee

For Mailer, refactored to use hash and abstracted into smaller methods

Also, moved format_time into ApplicationsController and formatted Controllers that used it accordingly
Styled Proofs:

For Model, organized layout

For Views, general formatting

For Controller, refactored approved?

For Coffeescript, extracted general code to global.js.coffee

For Mailer, refactored to use hash and abstracted into smaller methods

Also, moved format_time into ApplicationsController and formatted Controllers that used it accordingly
Merge branch 'style-project-nick' into style-project
Refactored/Styled some of Quotes:

For Views, general formatting and added TODOs for inline CSS and Javascript

For Model, shortened #line_items_subtotal, #line_items_total_tax, and #line_items_total_with_tax
Refactored/Styled Users:

For Model, removed TODOs

For Views, general formatting

For Controller, made flash[:alert] ternary and flash[:notice] text to locale

For Mailer, made controller pass a hash rather than three variables

Also, added ; when missing in js.erb views
Global/General Changes:

Moved third party javascripts/stylesheets to vendor

Moved global css into its own file

Organized global.js.coffee

Changed ajax add/remove classes to new format 'js-'

Refactored time_format to display_time and enforced it globally

Removed random TODO in cssParser.js

Moved imprintable_variant_select text to locale

Shorted #imprintable_info in Job Model

Moved #get_salesperson_id and #get_store_id from Order Helper to Order Model

Checked format of escape_javascript rendering in js.erb views
Global/General Changes:

Moved third party javascripts/stylesheets to vendor

Moved global css into its own file

Organized global.js.coffee

Changed ajax add/remove classes to new format 'js-'

Refactored time_format to display_time and enforced it globally

Removed random TODO in cssParser.js

Moved imprintable_variant_select text to locale

Shorted #imprintable_info in Job Model

Moved #get_salesperson_id and #get_store_id from Order Helper to Order Model

Checked format of escape_javascript rendering in js.erb views
Merge branch 'style-project' of https://github.com/AnnArborTees/softwear-crm into style-project-david

Conflicts:
	app/assets/javascripts/quotes.js.coffee
	app/controllers/quotes_controller.rb
	app/models/quote.rb
	app/models/user.rb
	app/views/quotes/_quote_select.html.erb