will/Open-Source-Access-Control-Web-Interface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made some changes to the css and asset compiling settings

Browse Source
This commit is contained in:
Will Bradley 2013-01-25 07:48:13 -07:00
parent bb7b2aeca5
commit 6d0a7b165a
5 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/stylesheets/application.css
View File

@ -11,9 +11,3 @@
*= require_self *= require_self
*= require_tree . *= require_tree .
*/ */
table { border-spacing: 0; }
td, th { padding: 0.5em; }
.col_highlight { background-color: #ccc; }
dt { font-weight: bold; }
.notice { color: green; }
.alert { color: red; }

8
app/assets/stylesheets/scaffolds.css.scss
View File

@ -67,3 +67,11 @@ div {
list-style: square; list-style: square;
} }
} }
table { border-spacing: 0; }
td, th { padding: 0.5em; }
.col_highlight { background-color: #ccc; }
dt { font-weight: bold; }
.notice { color: green; }
.alert { color: red; }

6
app/views/users/_form.html.erb
View File

@ -46,11 +46,11 @@
</div> </div>
<div class="field"> <div class="field">
<%= f.label :member_level, "Desired Member Level" %><br /> <%= f.label :member_level, "Desired Member Level" %><br />
<%= f.select :member_level, [["None",0],["Unable",1],["Volunteer",10],["Associate",25],["Basic",50],["Plus",100]] %> <%= f.select :member_level, [[nil],["None",0],["Unable",1],["Volunteer",10],["Associate",25],["Basic",50],["Plus",100]] %>
</div> </div>
<div class="field"> <div class="field">
<%= f.label :payment_method %><br /> <%= f.label :payment_method %><br />
<%= f.select :payment_method, [["PayPal"],["Dwolla"],["Bill Pay"],["Check"],["Cash"],["Other"]] %> <%= f.select :payment_method, [[nil],["PayPal"],["Dwolla"],["Bill Pay"],["Check"],["Cash"],["Other"]] %>
</div> </div>
<div class="field"> <div class="field">
<%= f.label :phone %><br /> <%= f.label :phone %><br />
@ -80,7 +80,7 @@
<% end %> <% end %>
<div class="field"> <div class="field">
<%= f.label :member, "Member?" %><br /> <%= f.label :member, "Member?" %><br />
<%= f.select :member, [["No",0],["Inactive",1],["Volunteer",10],["Associate",25],["Basic",50],["Plus",100]] %> <%= f.select :member, [[nil],["No",0],["Inactive",1],["Volunteer",10],["Associate",25],["Basic",50],["Plus",100]] %>
</div> </div>
<div class="field"> <div class="field">
<%= f.label :instructor, "Instructor?" %><br /> <%= f.label :instructor, "Instructor?" %><br />

6
config/application.rb
View File

@ -4,9 +4,9 @@ require 'rails/all'
if defined?(Bundler) if defined?(Bundler)
# If you precompile assets before deploying to production, use this line # If you precompile assets before deploying to production, use this line
Bundler.require(*Rails.groups(:assets => %w(development test))) #Bundler.require(*Rails.groups(:assets => %w(development test)))
# If you want your assets lazily compiled in production, use this line # If you want your assets lazily compiled in production, use this line
# Bundler.require(:default, :assets, Rails.env) Bundler.require(:default, :assets, Rails.env)
end end
module Dooraccess module Dooraccess
@ -54,6 +54,6 @@ module Dooraccess
config.assets.enabled = true config.assets.enabled = true
# Version of your assets, change this if you want to expire all your assets # Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0' config.assets.version = '1.1'
end end
end end

4
config/environments/production.rb
View File

@ -2,7 +2,7 @@ Dooraccess::Application.configure do
# Settings specified here will take precedence over those in config/application.rb # Settings specified here will take precedence over those in config/application.rb
# Code is not reloaded between requests # Code is not reloaded between requests
config.cache_classes = true config.cache_classes = false
# Full error reports are disabled and caching is turned on # Full error reports are disabled and caching is turned on
config.consider_all_requests_local = false config.consider_all_requests_local = false
@ -15,7 +15,7 @@ Dooraccess::Application.configure do
config.assets.compress = true config.assets.compress = true
# Fallback to assets pipeline if a precompiled asset is missed # Fallback to assets pipeline if a precompiled asset is missed
config.assets.compile = true config.assets.compile = false
# Generate digests for assets URLs # Generate digests for assets URLs
config.assets.digest = true config.assets.digest = true