diff options
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/ajax.js | 19 | ||||
| -rw-r--r-- | app/assets/javascripts/application.js | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/application.css | 20 | ||||
| -rw-r--r-- | app/assets/stylesheets/custom.css.scss | 54 | ||||
| -rw-r--r-- | app/assets/stylesheets/matches.css.scss | 39 | ||||
| -rw-r--r-- | app/assets/stylesheets/scaffolds.css.scss | 89 | ||||
| -rw-r--r-- | app/assets/stylesheets/static.css.scss | 9 | ||||
| -rw-r--r-- | app/assets/stylesheets/tournaments.css.scss | 80 |
8 files changed, 306 insertions, 7 deletions
diff --git a/app/assets/javascripts/ajax.js b/app/assets/javascripts/ajax.js new file mode 100644 index 0000000..040c100 --- /dev/null +++ b/app/assets/javascripts/ajax.js @@ -0,0 +1,19 @@ +function populate() { + //populate optionArray + //make a form element + var e = document.getElementById("tournament_id"); + var gameType = e.options[e.selectedIndex].text; + if (gameType != "Select a Game Type") { + alert(gameType + " was Selected!"); + //populate optionArray via AJAX + //select * from tournament_settings where gametype = GameType + for(var option in optionArray){ + //identify the number of + ; + } + }; + +//$.ajax(url: "/selected").done (html) -> $("#ajax-form").append html + +} + 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/application.css b/app/assets/stylesheets/application.css index 3192ec8..ab45dd0 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -11,3 +11,23 @@ *= require_self *= require_tree . */ + +#query{ + background-color: white; + border: 2px solid #ED9C28; + border-radius: 5px; + color: #FFF; + font-weight: bold; + height: 30px; +} +.navbar{ + background-color: white; +} + +footer { + clear: both; + margin: 0 auto; + margin-top: 10px; + color: white; + width: 90%; +}
\ No newline at end of file diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss new file mode 100644 index 0000000..febcbb8 --- /dev/null +++ b/app/assets/stylesheets/custom.css.scss @@ -0,0 +1,54 @@ +@import "bootstrap"; + +header > nav { + @extend .navbar; + @extend .navbar-inverse; + color: white; + + #log-buttons { + margin-top: 8px; + form { display: inline; } + } + form.search { + @extend .navbar-form; + @extend .navbar-right; + input[type="submit"] { + @extend .btn-warning; margin-top: -3px; margin-right: 8px; + } + } +} + +a, input[type="submit"] { + @extend .btn; + &.user { @extend .btn-info; } + &.signup { @extend .btn-success; } + &.signin { @extend .btn-info; } + &.signout { @extend .btn-danger; } + &.server { @extend .btn-danger; } +} + +p.errors { + background-color: #FCF8C7; + color: red; + border-radius: 7px; + padding: 10px; +} + +#errorExplanation { + h2 { + font-size: 1em; + color: red; + font-weight: bold; + } + li { + font-size: 1em; + color: red; + font-style: italic; + } + +} + +#notice { + text-align: center; + font-weight: bold; +}
\ No newline at end of file diff --git a/app/assets/stylesheets/matches.css.scss b/app/assets/stylesheets/matches.css.scss index 4c396e3..84430d6 100644 --- a/app/assets/stylesheets/matches.css.scss +++ b/app/assets/stylesheets/matches.css.scss @@ -1,3 +1,42 @@ // 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); +} + +#match-stats { + padding-bottom: 10px; + border-bottom: thick dashed #F0AD4E; +} + +#match-winner { + margin: 0 auto; + text-align: center; + font-size: 2em; +} + +#current-id { + display: none; +}
\ No newline at end of file diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss index 6ec6a8f..02b96a2 100644 --- a/app/assets/stylesheets/scaffolds.css.scss +++ b/app/assets/stylesheets/scaffolds.css.scss @@ -1,9 +1,56 @@ +@import "bootstrap"; + +$page-color: #444; +$toolbar-color: black; + +html{ + height: 100%; +} + body { - background-color: #fff; - color: #333; + background-color: $page-color; + color: $page-color; font-family: verdana, arial, helvetica, sans-serif; font-size: 13px; line-height: 18px; + height: 100%; +} + +.wrapper { + padding-left: 5%; + padding-right: 5%; + margin: 0 auto; + background-color: #fff; + padding-top: 10px; + height: 90%; + box-shadow: 1px 1px 7px orange; + border-radius: 0px 0px 5px 5px; +} + +footer { + clear: both; + margin: 0 auto; + margin-top: 10px; + color: white; + +} + +@media screen and (min-width: 480px) { + .wrapper, footer { + width: 80%; + min-width: 480px; + max-width: 1024px; + } +} + +@media screen and (max-width: 480px) { + .wrapper, footer { + width: 100%; + } +} + +h1, h2, h3, h4, h5{ + color: #030303; } p, ol, ul, td { @@ -21,11 +68,11 @@ pre { a { color: #000; &:visited { - color: #666; + color: #000; } &:hover { - color: #fff; - background-color: #000; + color: green; + text-decoration: none; } } @@ -40,8 +87,9 @@ div { } .field_with_errors { - padding: 2px; - background-color: red; + padding: 1px; + background-color: #FF4C4C; + box-shadow: 0px 0px 5px red; display: table; } @@ -67,3 +115,30 @@ div { list-style: square; } } + + +/* NAVBAR */ + +.navbar-brand { + @extend .no-dec; + a{ + color: white; + &:hover, &:active, &:focus { + color: white; + font-weight: normal; + text-decoration: none; + } + } +} + +.navbar-inverse, header > nav { + background-color: $toolbar-color; + border-color: #0F4070; + border-radius: 0px 0px 5px 5px; + margin-bottom: 0px; + +} + +button, input[type="submit"] { + @extend .btn; +} diff --git a/app/assets/stylesheets/static.css.scss b/app/assets/stylesheets/static.css.scss index 5a803c8..d73e77d 100644 --- a/app/assets/stylesheets/static.css.scss +++ b/app/assets/stylesheets/static.css.scss @@ -1,3 +1,12 @@ // Place all the styles related to the static controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ + +.jumbotron { + background-color: #FFF; + + p { + line-height: 1.5em; + } + +} diff --git a/app/assets/stylesheets/tournaments.css.scss b/app/assets/stylesheets/tournaments.css.scss index e372b90..2074783 100644 --- a/app/assets/stylesheets/tournaments.css.scss +++ b/app/assets/stylesheets/tournaments.css.scss @@ -1,3 +1,83 @@ // Place all the styles related to the tournaments controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ + +p.default-field { + display: inline; +} + +span.default-explanation { + color: gray; + font-style: italic; +} + +#players-needed { + text-align: center; + font-style: italic; +} + +#tournament-side-params { + background: none repeat scroll 0 0 #ADD8E6; + border-radius: 5px; + float: right; + font-size: 7px; + padding: 10px; + + p { + font-size: 10px; + margin-bottom: 5px; + } + +} + +#tournament-users{ + + li { + color: green; + } + + .black { + color: black; + } +} + + +/* Style of a tournament listing div */ +div.tournament-listing { + margin-top: 10px; + border-radius: 5px; + box-shadow: 2px 2px 4px #B8B8B8; + border: 2px solid #AAAAAA; + min-height: 100px; + padding: 4px; + + /* AKA the listing title */ + h3 { + margin-top: 0px; + color: #F0AD4E; + font-weight: bold; + } + + h3:hover { + color: #D09D3E; + } + + /* host of the tournament */ + .host { + font-weight: bold; + } + + .col-md-8 { + padding: 0; + a { + padding: 5px 0 0 0; + } + } +} + +div.leave-buttons { + margin-top: 50px; + form { + display: inline; + } +}
\ No newline at end of file |