diff options
author | nfoy <nfoy@purdue.edu> | 2014-04-06 20:20:41 -0400 |
---|---|---|
committer | nfoy <nfoy@purdue.edu> | 2014-04-06 20:20:41 -0400 |
commit | f06e7769ec201f17adc87251da63075a86ce1a94 (patch) | |
tree | afc75dc1489590285bdfbf290004efcf1a6208ee /app/assets | |
parent | 7b5bf825a8174712f3ef6e9ea7f6180e7d230f99 (diff) | |
parent | f3c395c56a644d976aa9a5608300557600bc683e (diff) |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Conflicts:
app/views/matches/show.html.erb
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/application.js | 3 | ||||
-rw-r--r-- | app/assets/stylesheets/matches.css.scss | 24 |
2 files changed, 27 insertions, 0 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index d6925fa..cb6edeb 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -14,3 +14,6 @@ //= require jquery_ujs //= require turbolinks //= require_tree . +//= require 'drag.js' +//= require 'dragsort.js' +//= require 'coordinates.js' diff --git a/app/assets/stylesheets/matches.css.scss b/app/assets/stylesheets/matches.css.scss index 4c396e3..3ef9170 100644 --- a/app/assets/stylesheets/matches.css.scss +++ b/app/assets/stylesheets/matches.css.scss @@ -1,3 +1,27 @@ // Place all the styles related to the matches controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ +#boxes li { + cursor: move; + position: relative; + float: left; + margin: 5px; + width: 180px; + height: 240px; + border: 1px solid rgb(0, 0, 0); + text-align: center; + padding-top: 10px; + background-color: rgb(238, 238, 255); +} +#numeric li { + cursor: move; + position: relative; + float: left; + margin: 5px; + width: 180px; + height: 240px; + border: 1px solid rgb(0, 0, 0); + text-align: center; + padding-top: 10px; + background-color: rgb(238, 238, 255); +}
\ No newline at end of file |