diff options
| author | shumakl <shumakl@purdue.edu> | 2014-04-03 12:32:48 -0400 |
|---|---|---|
| committer | shumakl <shumakl@purdue.edu> | 2014-04-03 12:32:48 -0400 |
| commit | 4015a27f66eafee66137bc27a76843bd48139772 (patch) | |
| tree | f2e4347606fa9bdec73ede85d562a7b891c85df2 /app/assets | |
| parent | 8d5325cd6019b784ba2da66d19c41daaadbc19e0 (diff) | |
| parent | 8e3e46b7951120f1ec34949d607a7672ad03f820 (diff) | |
Merge branch 'clean2'
Conflicts:
app/controllers/alerts_controller.rb
app/controllers/application_controller.rb
app/controllers/matches_controller.rb
app/controllers/servers_controller.rb
app/controllers/sessions_controller.rb
app/controllers/tournaments_controller.rb
app/controllers/users_controller.rb
app/models/match.rb
app/models/team.rb
app/models/tournament.rb
app/views/sessions/_form.html.erb
app/views/sessions/index.html.erb
app/views/sessions/index.json.jbuilder
app/views/sessions/show.html.erb
app/views/sessions/show.json.jbuilder
app/views/tournaments/index.html.erb
config/routes.rb
generate.sh
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/remote_usernames.js.coffee | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/remote_usernames.css.scss | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/javascripts/remote_usernames.js.coffee b/app/assets/javascripts/remote_usernames.js.coffee new file mode 100644 index 0000000..24f83d1 --- /dev/null +++ b/app/assets/javascripts/remote_usernames.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/remote_usernames.css.scss b/app/assets/stylesheets/remote_usernames.css.scss new file mode 100644 index 0000000..b9e841e --- /dev/null +++ b/app/assets/stylesheets/remote_usernames.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the remote_usernames controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ |