diff options
| author | tkimia <tkimia@purdue.edu> | 2014-04-06 21:16:24 -0400 |
|---|---|---|
| committer | tkimia <tkimia@purdue.edu> | 2014-04-06 21:16:24 -0400 |
| commit | 0afd45939facfc9bdbc7481e649af0ab89b7b029 (patch) | |
| tree | 435229467dd4adfd0612d081cce8ef75b6a4644b /app/assets/stylesheets/matches.css.scss | |
| parent | 0f982ba511d4f38322f69a6aaed768181b4e2852 (diff) | |
| parent | f06e7769ec201f17adc87251da63075a86ce1a94 (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Conflicts:
app/assets/stylesheets/matches.css.scss
Diffstat (limited to 'app/assets/stylesheets/matches.css.scss')
| -rw-r--r-- | app/assets/stylesheets/matches.css.scss | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/app/assets/stylesheets/matches.css.scss b/app/assets/stylesheets/matches.css.scss index e0bed85..3ef9170 100644 --- a/app/assets/stylesheets/matches.css.scss +++ b/app/assets/stylesheets/matches.css.scss @@ -1,11 +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/ - -#match-tree{ - float: right; +#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); } - -#hovered-info-text { - +#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 |