diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 16:00:36 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 16:00:36 -0400 |
| commit | 44c8a2709c9eebe75f2d97ef2dee28a6f5966c9f (patch) | |
| tree | 741814e0e98af8ca0921f3036af31da32ec81ab5 | |
| parent | 45c5d311492ef98ed702beaf043d289a705a5e0b (diff) | |
| parent | 5444bc11d478b0a182b196fab77f9e4ad90a99dd (diff) | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | app/assets/stylesheets/scaffolds.css.scss | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/servers.css.scss | 23 | ||||
| -rw-r--r-- | app/views/tournaments/_selected.html.erb | 10 |
3 files changed, 29 insertions, 7 deletions
diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss index 40791e8..509cb19 100644 --- a/app/assets/stylesheets/scaffolds.css.scss +++ b/app/assets/stylesheets/scaffolds.css.scss @@ -108,11 +108,8 @@ button, input[type="submit"] { footer { clear: both; - margin: 0 auto; border-top: solid 1px $orange; padding-top: 10px; text-align: center; - position:absolute; bottom: 0; - width: 100%; }
\ No newline at end of file diff --git a/app/assets/stylesheets/servers.css.scss b/app/assets/stylesheets/servers.css.scss index 4710386..1ff4536 100644 --- a/app/assets/stylesheets/servers.css.scss +++ b/app/assets/stylesheets/servers.css.scss @@ -1,3 +1,26 @@ // Place all the styles related to the servers controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ + +$page-color: #444; +$toolbar-color: black; +$orange: #DD9125; +$darker-orange: #9D4102; +$link-yellow: #FFC50D; + +.edit_server { + + legend { + color: #EEE; + } + color: #FFF; + + input[type="submit"] { + color: $page-color; + } + + li { + list-style: none; + } + +}
\ No newline at end of file diff --git a/app/views/tournaments/_selected.html.erb b/app/views/tournaments/_selected.html.erb index eec8b5e..a4efa4f 100644 --- a/app/views/tournaments/_selected.html.erb +++ b/app/views/tournaments/_selected.html.erb @@ -18,21 +18,23 @@ <% end %> <%= fields_for "tournament[settings]", @tournament.settings do |setting_fields| %> - <% @tournament.settings.each do |setting| %> + <% @game.settings.each do |setting| %> <p> <%= setting_fields.label setting.name %> <br> - <% case setting.stype %> + <% case setting.vartype %> <% when 0 %> <%= setting_fields.text_field( setting.name ) %> <% when 1 %> <%= setting_fields.text_area( setting.name ) %> <% when 2 %> - <%= setting_fields.collection_radio_buttons( setting.name, setting.type_opt.split(','), :first, :last, { item_wrapper_tag: false } ) %> + <%= setting_fields.collection_radio_buttons( setting.name, setting.type_opt.split(','), "first", "last", { item_wrapper_tag: false } ) %> <% when 3 %> - <%= setting_fields.collection_check_boxes( setting.name, setting.type_opt.split(','), :first, :last, { item_wrapper_tag: false } ) %> + <%= setting_fields.collection_check_boxes( setting.name, setting.type_opt.split(','), "first", "last", { item_wrapper_tag: false } ) %> <% when 4 %> + <%= setting_fields.label "true" %> <%= setting_fields.radio_button( setting.name, "true" ) %> + <%= setting_fields.label "false" %> <%= setting_fields.radio_button( setting.name, "false" ) %> <% when 5 %> <%= setting_fields.select( setting.name, setting.type_opt.split(',') ) %> |