diff options
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/alerts.css.scss | 3 | ||||
-rw-r--r-- | app/assets/stylesheets/application.css | 7 | ||||
-rw-r--r-- | app/assets/stylesheets/application/scaffolds.css.scss | 325 | ||||
-rw-r--r-- | app/assets/stylesheets/brackets.css.scss | 3 | ||||
-rw-r--r-- | app/assets/stylesheets/colors.css.scss | 5 | ||||
-rw-r--r-- | app/assets/stylesheets/games.css.scss | 3 | ||||
-rw-r--r-- | app/assets/stylesheets/main.css.scss | 10 | ||||
-rw-r--r-- | app/assets/stylesheets/matches.css.scss | 39 | ||||
-rw-r--r-- | app/assets/stylesheets/pms.css.scss | 3 | ||||
-rw-r--r-- | app/assets/stylesheets/scaffolds.css.scss | 69 | ||||
-rw-r--r-- | app/assets/stylesheets/search.css.scss | 3 | ||||
-rw-r--r-- | app/assets/stylesheets/servers.css.scss | 8 | ||||
-rw-r--r-- | app/assets/stylesheets/sessions.css.scss | 3 | ||||
-rw-r--r-- | app/assets/stylesheets/teams.css.scss | 3 | ||||
-rw-r--r-- | app/assets/stylesheets/tournaments.css.scss | 44 | ||||
-rw-r--r-- | app/assets/stylesheets/users.css.scss | 8 |
16 files changed, 433 insertions, 103 deletions
diff --git a/app/assets/stylesheets/alerts.css.scss b/app/assets/stylesheets/alerts.css.scss index c01a620..e69de29 100644 --- a/app/assets/stylesheets/alerts.css.scss +++ b/app/assets/stylesheets/alerts.css.scss @@ -1,3 +0,0 @@ -// Place all the styles related to the alerts controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 3192ec8..1c8b233 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -5,9 +5,8 @@ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path. * - * You're free to add application-wide styles to this file and they'll appear at the top of the - * compiled file, but it's generally better to create a new file per style scope. - * *= require_self - *= require_tree . + *= require_tree ./application */ + +/* If you put any styles in this file directly, I will knife you. */ diff --git a/app/assets/stylesheets/application/scaffolds.css.scss b/app/assets/stylesheets/application/scaffolds.css.scss new file mode 100644 index 0000000..ae26907 --- /dev/null +++ b/app/assets/stylesheets/application/scaffolds.css.scss @@ -0,0 +1,325 @@ +@import "bootstrap"; +@import "colors"; + +/* Layout ***********************************************************/ + +html { + body { + background: asset-url("bg.png", image) repeat scroll 0 0 $toolbar-color; + color: $page-color; + font-family: verdana, arial, helvetica, sans-serif; + font-size: 13px; + line-height: 18px; + + header > nav { + @extend .navbar; + @extend .navbar-inverse; + color: white; + + .navbar-brand { + @extend .no-dec; + a{ + color: white; + &:hover, &:active, &:focus { + color: white; + font-weight: normal; + text-decoration: none; + } + } + } + + #log-buttons { + margin-top: 8px; + form { display: inline; } + #alerts-ajax { + display: none; + } + } + + form.search { + @extend .navbar-form; + float: right; + input[type="submit"] { + @extend .btn-warning; + } + input[type="text"], input[type="search"] { + background-color: #303030; + border: 2px solid #ED9C28; + border-radius: 5px; + color: #FFF; + font-weight: bold; + height: 30px; + padding: 0px 5px; + } + } + } + + #notice { + background-color: rgba(0,0,0,0.5); + border-radius: 7px; + padding: 10px; + width: 80%; + margin: 0px auto; + text-align: center; + + p { + color: lightgreen !important; + font-weight: bold; + } + } + + .wrapper { + width: 80%; + margin: 10px auto 0; + } + + footer { + clear: both; + border-top: solid 1px $orange; + text-align: center; + margin: 0 auto; + width: 90%; + } + } +} + +/* General styles ***************************************************/ + +h1, h2, h3, h4, h5, p, li, label{ + color: $orange; +} + +h1, h2, h3, h4, h5 { + text-shadow: 0px 0px 2px $darker-orange; +} + +p, ol, ul, td { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 13px; + line-height: 18px; +} + +fieldset { + border: solid 1px $orange; + border-radius: .5em; + padding: 1em; + margin: 1em 0; + legend { + color: $orange; + display: block; + margin: 0; + padding: .25em .5em; + width: auto; + border: solid 1px $orange; + border-radius: .5em; + } +} + +a, button, input[type="submit"] { + @extend .btn; + &.user { @extend .btn-info; } + &.signup { @extend .btn-success; } + &.signin { @extend .btn-warning; } + &.signout { @extend .btn-danger; } + &.server { @extend .btn-warning; } + &.create-alert { + color: white; + background-color: rgb(255, 69, 0); + border-color: rgb(255, 69, 0); + } + &.alerts { + @extend .navbar-right; + @extend .glyphicon; + @extend .glyphicon-exclamation-sign; + color: white; + background-color: hsl(0, 69%, 22%) !important; + } + font-weight: bold !important; +} + +input, textarea{ + -webkit-box-shadow: inset 0 0 8px rgba(0,0,0,0.1), 0 0 16px rgba(0,0,0,0.1); + -moz-box-shadow: inset 0 0 8px rgba(0,0,0,0.1), 0 0 16px rgba(0,0,0,0.1); + box-shadow: inset 0 0 8px rgba(0,0,0,0.1), 0 0 16px rgba(0,0,0,0.1); + + border: 3px inset #A5A5A5; + padding: 8px; + color: $orange !important; + background: rgba(0,0,0,0.5); + margin: 0 0 5px 0; +} + +select { + background-color: #333; + padding: 5px; + border: none; + color: $orange !important; +} + +pre { + text-align: left; + background-color: #eee; + padding: 10px; + font-size: 11px; +} + +a { + color: $link-yellow; + &:hover { + color: white; + + } +} + +p, li { + color: #DD9125; +} + +td, th { + color: #DD9125; +} + +svg { + min-width: 600px; +} + +div.field, div.actions { + margin-bottom: 10px; +} + +#error_explanation { + width: 450px; + border: 2px solid red; + padding: 7px; + padding-bottom: 0; + margin-bottom: 20px; + background-color: #f0f0f0; + h2 { + text-align: left; + font-weight: bold; + padding: 5px 5px 5px 15px; + font-size: 12px; + margin: -7px; + margin-bottom: 0px; + background-color: #c00; + color: #fff; + } + ul li { + font-size: 12px; + list-style: square; + } +} +.field_with_errors { + padding: 1px; + background-color: #FF4C4C; + box-shadow: 0px 0px 5px red; + display: table; +} +.errors { + background-color: rgba(0,0,0,0.5);; + color: red; + border-radius: 7px; + padding: 10px; +} + +/* Specific styles **************************************************/ + +.tournament-listing { + margin: 10px 0px; + border-radius: 5px; + box-shadow: 0px 0px 3px #B8B8B8; + background-color: rgba(0, 0, 0, 0.6); + border: 1px solid #AAAAAA; + min-height: 100px; + padding: 8px 4px; + + div.row { + margin-left: 2%; + } + p.message { + margin-top: 10px; + } + + /* 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; + color: #FFF; + } + + .col-md-8 { + padding: 0; + a { + padding: 5px 0 0 0; + } + } + + .t-game{ + font-weight: bold; + text-align: center; + } + + .t-image{ + display: block; + margin:auto; + } +} + + +.user-listing { + margin: 10px 0px; + border-radius: 5px; + box-shadow: 0px 0px 3px #B8B8B8; + background-color: rgba(0, 0, 0, 0.6); + border: 1px solid #AAAAAA; + min-height: 100px; + padding: 8px 4px; + display: inline-table; + + /* AKA the listing title */ + h3 { + margin-top: 0px; + color: #F0AD4E; + font-weight: bold; + } + + h3:hover { + color: #D09D3E; + } + + .things { + padding: 0px 10px; + } + + p { + margin: 0; + } + div.row { + margin-left: 2%; + } +} + +// Limitation: Only one box can be expanded at a time +.collapsible { + .collapsed { display: block; } + .expanded { display: none; } + &:target { + .collapsed { display: none; } + .expanded { display: block; } + } +} + +.simple_captcha { + background-color: rgba(255, 255, 255, 0.7); + margin: 10px 0px; +} diff --git a/app/assets/stylesheets/brackets.css.scss b/app/assets/stylesheets/brackets.css.scss index 481e6e6..e69de29 100644 --- a/app/assets/stylesheets/brackets.css.scss +++ b/app/assets/stylesheets/brackets.css.scss @@ -1,3 +0,0 @@ -// Place all the styles related to the brackets controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/colors.css.scss b/app/assets/stylesheets/colors.css.scss new file mode 100644 index 0000000..c875caa --- /dev/null +++ b/app/assets/stylesheets/colors.css.scss @@ -0,0 +1,5 @@ +$darker-orange: #9D4102; +$link-yellow: #FFC50D; +$orange: #DD9125; +$page-color: #444; +$toolbar-color: black; diff --git a/app/assets/stylesheets/games.css.scss b/app/assets/stylesheets/games.css.scss index db1b7bc..e69de29 100644 --- a/app/assets/stylesheets/games.css.scss +++ b/app/assets/stylesheets/games.css.scss @@ -1,3 +0,0 @@ -// Place all the styles related to the games controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/main.css.scss b/app/assets/stylesheets/main.css.scss index a0d94c1..15f5ac5 100644 --- a/app/assets/stylesheets/main.css.scss +++ b/app/assets/stylesheets/main.css.scss @@ -1,3 +1,13 @@ // Place all the styles related to the main controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ + +.jumbotron { + background-color: #FFF; + box-shadow: 1px 1px 20px black; + width: 93%; + + p { + line-height: 1.5em; + } +} diff --git a/app/assets/stylesheets/matches.css.scss b/app/assets/stylesheets/matches.css.scss index 4c396e3..e3ad6e7 100644 --- a/app/assets/stylesheets/matches.css.scss +++ b/app/assets/stylesheets/matches.css.scss @@ -1,3 +1,36 @@ -// 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/ +#peer_review_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); +} + +// Nothing uses this one right now +#peer_review_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); +} + +/**** INDEX PAGE - TABLE AND GRAPH ****/ +#matches-table { + @extend .table; + color: #FFF; + + form { + color: #333; + } +} diff --git a/app/assets/stylesheets/pms.css.scss b/app/assets/stylesheets/pms.css.scss index 5106093..e69de29 100644 --- a/app/assets/stylesheets/pms.css.scss +++ b/app/assets/stylesheets/pms.css.scss @@ -1,3 +0,0 @@ -// Place all the styles related to the pms controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss deleted file mode 100644 index 6ec6a8f..0000000 --- a/app/assets/stylesheets/scaffolds.css.scss +++ /dev/null @@ -1,69 +0,0 @@ -body { - background-color: #fff; - color: #333; - font-family: verdana, arial, helvetica, sans-serif; - font-size: 13px; - line-height: 18px; -} - -p, ol, ul, td { - font-family: verdana, arial, helvetica, sans-serif; - font-size: 13px; - line-height: 18px; -} - -pre { - background-color: #eee; - padding: 10px; - font-size: 11px; -} - -a { - color: #000; - &:visited { - color: #666; - } - &:hover { - color: #fff; - background-color: #000; - } -} - -div { - &.field, &.actions { - margin-bottom: 10px; - } -} - -#notice { - color: green; -} - -.field_with_errors { - padding: 2px; - background-color: red; - display: table; -} - -#error_explanation { - width: 450px; - border: 2px solid red; - padding: 7px; - padding-bottom: 0; - margin-bottom: 20px; - background-color: #f0f0f0; - h2 { - text-align: left; - font-weight: bold; - padding: 5px 5px 5px 15px; - font-size: 12px; - margin: -7px; - margin-bottom: 0px; - background-color: #c00; - color: #fff; - } - ul li { - font-size: 12px; - list-style: square; - } -} diff --git a/app/assets/stylesheets/search.css.scss b/app/assets/stylesheets/search.css.scss index 22fd394..e69de29 100644 --- a/app/assets/stylesheets/search.css.scss +++ b/app/assets/stylesheets/search.css.scss @@ -1,3 +0,0 @@ -// Place all the styles related to the search controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/servers.css.scss b/app/assets/stylesheets/servers.css.scss index 4710386..bb20956 100644 --- a/app/assets/stylesheets/servers.css.scss +++ b/app/assets/stylesheets/servers.css.scss @@ -1,3 +1,5 @@ -// 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/ +.edit_server { + li { + list-style: none; + } +} diff --git a/app/assets/stylesheets/sessions.css.scss b/app/assets/stylesheets/sessions.css.scss index 7bef9cf..e69de29 100644 --- a/app/assets/stylesheets/sessions.css.scss +++ b/app/assets/stylesheets/sessions.css.scss @@ -1,3 +0,0 @@ -// Place all the styles related to the sessions controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/teams.css.scss b/app/assets/stylesheets/teams.css.scss index 320d00d..e69de29 100644 --- a/app/assets/stylesheets/teams.css.scss +++ b/app/assets/stylesheets/teams.css.scss @@ -1,3 +0,0 @@ -// Place all the styles related to the teams controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/tournaments.css.scss b/app/assets/stylesheets/tournaments.css.scss index e372b90..0b8aa99 100644 --- a/app/assets/stylesheets/tournaments.css.scss +++ b/app/assets/stylesheets/tournaments.css.scss @@ -1,3 +1,47 @@ // 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/ + +@import "colors"; + +#players-needed { + text-align: center; + font-style: italic; +} + +#tournament-side-params { + background: none repeat scroll 0 0 rgba(0,0,0,0.5); + border-radius: 5px; + float: right; + font-size: 7px; + padding: 10px; + + p { + font-size: 10px; + margin-bottom: 5px; + } + +} + +ul#tournament-users { + list-style: none; + padding: 0; + margin: 0; + li { + // Make the bullet green, but the text white + padding-left: 1em; + text-indent: -.7em; + &:before { + content: "• "; + color: #10A010; + } + color: white; + } +} + +div.leave-buttons { + margin-top: 50px; + form { + display: inline; + } +} diff --git a/app/assets/stylesheets/users.css.scss b/app/assets/stylesheets/users.css.scss index 1efc835..790aa5f 100644 --- a/app/assets/stylesheets/users.css.scss +++ b/app/assets/stylesheets/users.css.scss @@ -1,3 +1,5 @@ -// Place all the styles related to the users controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ +.new_user, .edit_user { + li { + list-style: none; + } +} |