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 | 13 | ||||
-rw-r--r-- | app/assets/stylesheets/application.css.less | 8 | ||||
-rw-r--r-- | app/assets/stylesheets/bootstrapify.less | 117 | ||||
-rw-r--r-- | app/assets/stylesheets/brackets.css.scss | 3 | ||||
-rw-r--r-- | app/assets/stylesheets/colors.less | 32 | ||||
-rw-r--r-- | app/assets/stylesheets/games.css.scss | 3 | ||||
-rw-r--r-- | app/assets/stylesheets/main.css.scss | 3 | ||||
-rw-r--r-- | app/assets/stylesheets/matches.css.scss | 3 | ||||
-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/scaffolds.less | 305 | ||||
-rw-r--r-- | app/assets/stylesheets/search.css.scss | 3 | ||||
-rw-r--r-- | app/assets/stylesheets/servers.css.scss | 3 | ||||
-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 | 3 | ||||
-rw-r--r-- | app/assets/stylesheets/users.css.scss | 3 |
18 files changed, 462 insertions, 118 deletions
diff --git a/app/assets/stylesheets/alerts.css.scss b/app/assets/stylesheets/alerts.css.scss deleted file mode 100644 index c01a620..0000000 --- a/app/assets/stylesheets/alerts.css.scss +++ /dev/null @@ -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 deleted file mode 100644 index 3192ec8..0000000 --- a/app/assets/stylesheets/application.css +++ /dev/null @@ -1,13 +0,0 @@ -/* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * 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 . - */ diff --git a/app/assets/stylesheets/application.css.less b/app/assets/stylesheets/application.css.less new file mode 100644 index 0000000..c6020bd --- /dev/null +++ b/app/assets/stylesheets/application.css.less @@ -0,0 +1,8 @@ +/* + * This is a manifest file that'll be compiled into application.css. + */ +/* If you put any styles in this file directly, I will knife you. */ + +@import "colors"; +@import "bootstrapify"; +@import "scaffolds"; diff --git a/app/assets/stylesheets/bootstrapify.less b/app/assets/stylesheets/bootstrapify.less new file mode 100644 index 0000000..eb3b86b --- /dev/null +++ b/app/assets/stylesheets/bootstrapify.less @@ -0,0 +1,117 @@ +/* Copyright (C) 2014 Andrew Murrell + * Copyright (C) 2014 Davis Webb + * Copyright (C) 2014 Guntas Grewal + * Copyright (C) 2014 Luke Shumaker + * Copyright (C) 2014 Nathaniel Foy + * Copyright (C) 2014 Tomer Kimia + * + * This file is part of Leaguer. + * + * Leaguer is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Leaguer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the Affero GNU General Public License + * along with Leaguer. If not, see <http://www.gnu.org/licenses/>. + */ + +@import "bootstrap"; + +// Connect Bootstrap classes to reasonable defaults + +.btn { + &:extend(.btn-default); +} + +button, +*[role="button"], +input[type="submit"], +input[type="reset"], +input[type="button"] { + &:extend(.btn); +} + +.navbar { + form { + &:extend(.navbar-form); + } + .nav { + &:extend(.navbar-nav); + } + ul { + &:extend(.nav); + } +} +form { + // This list of types is taken from the 2014-04-29 draft of + // the HTML5 spec: + // http://www.w3.org/TR/2014/CR-html5-20140429/forms.html#attr-input-type + input[type="text"], + input[type="search"], + input[type="tel"], + input[type="url"], + input[type="email"], + input[type="password"], + input[type="date"], + input[type="time"], + input[type="number"], + input[type="range"], + input[type="color"], + select, textarea { + &:extend(.form-control); + } + label { + &:extend(.control-label); + } +} + +header nav { + &:extend(.navbar); + &:extend(.navbar-default); +} + +.alert:extend(.alert-default) {} +.alert-success, +.alert-info, +.alert-warning, +.alert-danger { &:extend(.alert); } + +.panel-primary, +.panel-success, +.panel-info, +.panel-warning, +.panel-danger { &:extend(.panel); } + +.panel { + h1, h2, h3, h4, h5, h6 { + &:extend(.panel-heading); + &:extend(.panel-title); + } +} + +// Connect built-in Rails classes to the Bootstrap classes. + +form { + .field { + &:extend(.form-group); + .field_with_errors { + display: inline !important; + } + } + .field_with_errors { + &:extend(.has-error); + } +} + +#error_explanation { + &:extend(.panel-danger); + &:extend(.container); + padding-left: 0; + padding-right: 0; +} diff --git a/app/assets/stylesheets/brackets.css.scss b/app/assets/stylesheets/brackets.css.scss deleted file mode 100644 index 481e6e6..0000000 --- a/app/assets/stylesheets/brackets.css.scss +++ /dev/null @@ -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.less b/app/assets/stylesheets/colors.less new file mode 100644 index 0000000..61e1e57 --- /dev/null +++ b/app/assets/stylesheets/colors.less @@ -0,0 +1,32 @@ +/* +@darker-orange: #9D4102; +@link-yellow: #FFC50D; +@orange: #DD9125; +@page-color: #444; +@toolbar-color: black; +*/ + +// See this file for a complete list of variables: +// vendor/bundle/ruby/2.0.0/gems/bootstrap-sass-3.1.1.1/vendor/assets/stylesheets/bootstrap/_variables.less +// Or visit: +// http://getbootstrap.com/customize/#less-variables +/* +@gray-darker: +@gray-dark: +@gray: +@gray-light: +@gray-lighter: + +@brand-primary: +@brand-success: +@brand-info: +@brand-warning: +@brand-danger: +*/ + +/* +@text-color: #DD9125; +@body-bg: #333; +*/ + +@legend-border-color: #ccc; // matches the default @input-border and @btn-default-border diff --git a/app/assets/stylesheets/games.css.scss b/app/assets/stylesheets/games.css.scss deleted file mode 100644 index db1b7bc..0000000 --- a/app/assets/stylesheets/games.css.scss +++ /dev/null @@ -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 deleted file mode 100644 index a0d94c1..0000000 --- a/app/assets/stylesheets/main.css.scss +++ /dev/null @@ -1,3 +0,0 @@ -// 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/ diff --git a/app/assets/stylesheets/matches.css.scss b/app/assets/stylesheets/matches.css.scss deleted file mode 100644 index 4c396e3..0000000 --- a/app/assets/stylesheets/matches.css.scss +++ /dev/null @@ -1,3 +0,0 @@ -// 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/ diff --git a/app/assets/stylesheets/pms.css.scss b/app/assets/stylesheets/pms.css.scss deleted file mode 100644 index 5106093..0000000 --- a/app/assets/stylesheets/pms.css.scss +++ /dev/null @@ -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/scaffolds.less b/app/assets/stylesheets/scaffolds.less new file mode 100644 index 0000000..bbdd989 --- /dev/null +++ b/app/assets/stylesheets/scaffolds.less @@ -0,0 +1,305 @@ +/* Copyright (C) 2014 Andrew Murrell + * Copyright (C) 2014 Davis Webb + * Copyright (C) 2014 Guntas Grewal + * Copyright (C) 2014 Luke Shumaker + * Copyright (C) 2014 Nathaniel Foy + * Copyright (C) 2014 Tomer Kimia + * + * This file is part of Leaguer. + * + * Leaguer is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Leaguer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the Affero GNU General Public License + * along with Leaguer. If not, see <http://www.gnu.org/licenses/>. + */ + +/* Mixins ***********************************************************/ +/* These are just here for other things to @extend. */ +/* Ok, they're really classes, but we don't use them like it. */ + +/* More elegant version of .input-group, which is over-complicated + because it supports all kind of things we don't always need to. + This is useful because it doesn't require extra HTML elements, + where .input-group does. */ +.simple-input-group { + white-space: nowrap; + display: table; + span { + display: table-cell; + } + .btn, .form-control { + display: table-cell !important; + /* .simple-input-group .btn:not(:last-child), + * .simple-input-group .form-control:not(:last-child) { ... } */ + &:not(:last-child) { + @include border-right-radius(0); + } + &:not(:first-child) { + @include border-left-radius(0); + border-left: 0; + } + } +} + +/* IDs **************************************************************/ +/* Specific page elements */ + +#notice { + &:extend(.alert-success); + &:extend(.container); + text-align: center; +} + +#alerts-ajax { + display: none; +} + + +form#search { + &:extend(.navbar-left); + div { + &:extend(.simple-input-group); + } +} + +#user-actions { + &:extend(.navbar-btn); + &:extend(.navbar-right); + &:extend(.simple-input-group); + span { + padding-right: .25em; + } +} + +#error_explanation ul { + list-style: disc outside none; +} + +#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; + } + +} + +#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; + } +} + +/* Classes **********************************************************/ + +/* +.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 { + color: white; + background-color: hsl(0, 69%, 22%); + } +} +*/ + +form.button_to, form.button_to div { + display: inline; +} + +div.field span.help-block { + float: right; + margin-top: 0; + margin-bottom: 0; +} + +/* Elements *********************************************************/ + +footer { + &:extend(.container); + margin-top: 1em; + border-top: solid 1px $hr-border; + text-align: center; +} + +fieldset { + border: solid 1px $legend-border-color; + border-radius: .5em; + padding: 1em; + margin: 1em 0; + legend { + display: block; + margin: 0; + padding: .25em .5em; + width: auto; + border: solid 1px $legend-border-color; + border-radius: .5em; + } +} + +form ul { + list-style: none; +} + +pre { + text-align: left; +} + +/* Misc *************************************************************/ + +.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/search.css.scss b/app/assets/stylesheets/search.css.scss deleted file mode 100644 index 22fd394..0000000 --- a/app/assets/stylesheets/search.css.scss +++ /dev/null @@ -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 deleted file mode 100644 index 4710386..0000000 --- a/app/assets/stylesheets/servers.css.scss +++ /dev/null @@ -1,3 +0,0 @@ -// 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/ diff --git a/app/assets/stylesheets/sessions.css.scss b/app/assets/stylesheets/sessions.css.scss deleted file mode 100644 index 7bef9cf..0000000 --- a/app/assets/stylesheets/sessions.css.scss +++ /dev/null @@ -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 deleted file mode 100644 index 320d00d..0000000 --- a/app/assets/stylesheets/teams.css.scss +++ /dev/null @@ -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 deleted file mode 100644 index e372b90..0000000 --- a/app/assets/stylesheets/tournaments.css.scss +++ /dev/null @@ -1,3 +0,0 @@ -// 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/ diff --git a/app/assets/stylesheets/users.css.scss b/app/assets/stylesheets/users.css.scss deleted file mode 100644 index 1efc835..0000000 --- a/app/assets/stylesheets/users.css.scss +++ /dev/null @@ -1,3 +0,0 @@ -// 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/ |