From 8c5772072066eb57cda4b0b8953aebe3af33ca2d Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 1 May 2014 17:01:48 -0400 Subject: condense the stylesheets --- app/assets/stylesheets/alerts.css.scss | 0 app/assets/stylesheets/application.css | 12 - app/assets/stylesheets/application.css.scss | 8 + .../stylesheets/application/bootstrapify.scss | 91 ------- app/assets/stylesheets/application/main.css.scss | 251 ------------------- app/assets/stylesheets/bootstrapify.scss | 91 +++++++ app/assets/stylesheets/brackets.css.scss | 0 app/assets/stylesheets/colors.css.scss | 23 +- app/assets/stylesheets/games.css.scss | 0 app/assets/stylesheets/main.css.scss | 0 app/assets/stylesheets/matches.css.scss | 36 --- app/assets/stylesheets/pms.css.scss | 0 app/assets/stylesheets/scaffolds.scss | 270 +++++++++++++++++++++ app/assets/stylesheets/search.css.scss | 0 app/assets/stylesheets/servers.css.scss | 0 app/assets/stylesheets/sessions.css.scss | 0 app/assets/stylesheets/teams.css.scss | 0 app/assets/stylesheets/tournaments.css.scss | 0 app/assets/stylesheets/users.css.scss | 0 app/views/layouts/application.html.erb | 1 - 20 files changed, 390 insertions(+), 393 deletions(-) delete mode 100644 app/assets/stylesheets/alerts.css.scss delete mode 100644 app/assets/stylesheets/application.css create mode 100644 app/assets/stylesheets/application.css.scss delete mode 100644 app/assets/stylesheets/application/bootstrapify.scss delete mode 100644 app/assets/stylesheets/application/main.css.scss create mode 100644 app/assets/stylesheets/bootstrapify.scss delete mode 100644 app/assets/stylesheets/brackets.css.scss delete mode 100644 app/assets/stylesheets/games.css.scss delete mode 100644 app/assets/stylesheets/main.css.scss delete mode 100644 app/assets/stylesheets/matches.css.scss delete mode 100644 app/assets/stylesheets/pms.css.scss create mode 100644 app/assets/stylesheets/scaffolds.scss delete mode 100644 app/assets/stylesheets/search.css.scss delete mode 100644 app/assets/stylesheets/servers.css.scss delete mode 100644 app/assets/stylesheets/sessions.css.scss delete mode 100644 app/assets/stylesheets/teams.css.scss delete mode 100644 app/assets/stylesheets/tournaments.css.scss delete mode 100644 app/assets/stylesheets/users.css.scss diff --git a/app/assets/stylesheets/alerts.css.scss b/app/assets/stylesheets/alerts.css.scss deleted file mode 100644 index e69de29..0000000 diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css deleted file mode 100644 index 4c4405c..0000000 --- a/app/assets/stylesheets/application.css +++ /dev/null @@ -1,12 +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. - * - *= require_self - *= require ./application/main - */ - -/* If you put any styles in this file directly, I will knife you. */ diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss new file mode 100644 index 0000000..c6020bd --- /dev/null +++ b/app/assets/stylesheets/application.css.scss @@ -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/application/bootstrapify.scss b/app/assets/stylesheets/application/bootstrapify.scss deleted file mode 100644 index 08421f9..0000000 --- a/app/assets/stylesheets/application/bootstrapify.scss +++ /dev/null @@ -1,91 +0,0 @@ -@import "bootstrap"; - -// Connect Bootstrap classes to reasonable defaults - -.btn { - @extend .btn-default; -} - -button, -a[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 { @extend .alert; } -.alert-info { @extend .alert; } -.alert-warning { @extend .alert; } -.alert-danger { @extend .alert; } - -.panel-primary { @extend .panel; } -.panel-success { @extend .panel; } -.panel-info { @extend .panel; } -.panel-warning { @extend .panel; } -.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 { - @extend .has-error; - display: inline; - } -} - -#error_explanation { - @extend .panel-danger; - @extend .container; - padding-left: 0; - padding-right: 0; -} diff --git a/app/assets/stylesheets/application/main.css.scss b/app/assets/stylesheets/application/main.css.scss deleted file mode 100644 index 655700d..0000000 --- a/app/assets/stylesheets/application/main.css.scss +++ /dev/null @@ -1,251 +0,0 @@ -// 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.scss -/* -$gray-darker: lighten(#000, 13.5%) !default; // #222 -$gray-dark: lighten(#000, 20%) !default; // #333 -$gray: lighten(#000, 33.5%) !default; // #555 -$gray-light: lighten(#000, 60%) !default; // #999 -$gray-lighter: lighten(#000, 93.5%) !default; // #eee - -$brand-primary: #428bca !default; -$brand-success: #5cb85c !default; -$brand-info: #5bc0de !default; -$brand-warning: #f0ad4e !default; -$brand-danger: #d9534f !default; -*/ -$legend-border-color: #ccc; // matches the default $input-border and $btn-default-border -@import "bootstrapify"; - -/* 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; - .btn, .form-control { - display: table-cell; - &:not(:last-child) { - float: left; - @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-right; - @extend .simple-input-group; -} - -#user-actions { - @extend .navbar-btn; - @extend .navbar-left; - @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; - } - -} - -/* 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[role="button"] { - display: inline; -} - -/* 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/bootstrapify.scss b/app/assets/stylesheets/bootstrapify.scss new file mode 100644 index 0000000..08421f9 --- /dev/null +++ b/app/assets/stylesheets/bootstrapify.scss @@ -0,0 +1,91 @@ +@import "bootstrap"; + +// Connect Bootstrap classes to reasonable defaults + +.btn { + @extend .btn-default; +} + +button, +a[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 { @extend .alert; } +.alert-info { @extend .alert; } +.alert-warning { @extend .alert; } +.alert-danger { @extend .alert; } + +.panel-primary { @extend .panel; } +.panel-success { @extend .panel; } +.panel-info { @extend .panel; } +.panel-warning { @extend .panel; } +.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 { + @extend .has-error; + display: inline; + } +} + +#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 e69de29..0000000 diff --git a/app/assets/stylesheets/colors.css.scss b/app/assets/stylesheets/colors.css.scss index 7ab3024..8e0b3de 100644 --- a/app/assets/stylesheets/colors.css.scss +++ b/app/assets/stylesheets/colors.css.scss @@ -1,5 +1,24 @@ +/* $darker-orange: #9D4102; $link-yellow: #FFC50D; $orange: #DD9125; -/*$page-color: #444;*/ -/*$toolbar-color: black;*/ +$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.scss +/* +$gray-darker: lighten(#000, 13.5%) !default; // #222 +$gray-dark: lighten(#000, 20%) !default; // #333 +$gray: lighten(#000, 33.5%) !default; // #555 +$gray-light: lighten(#000, 60%) !default; // #999 +$gray-lighter: lighten(#000, 93.5%) !default; // #eee + +$brand-primary: #428bca !default; +$brand-success: #5cb85c !default; +$brand-info: #5bc0de !default; +$brand-warning: #f0ad4e !default; +$brand-danger: #d9534f !default; +*/ +$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 e69de29..0000000 diff --git a/app/assets/stylesheets/main.css.scss b/app/assets/stylesheets/main.css.scss deleted file mode 100644 index e69de29..0000000 diff --git a/app/assets/stylesheets/matches.css.scss b/app/assets/stylesheets/matches.css.scss deleted file mode 100644 index e3ad6e7..0000000 --- a/app/assets/stylesheets/matches.css.scss +++ /dev/null @@ -1,36 +0,0 @@ -#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 deleted file mode 100644 index e69de29..0000000 diff --git a/app/assets/stylesheets/scaffolds.scss b/app/assets/stylesheets/scaffolds.scss new file mode 100644 index 0000000..8fe3cc9 --- /dev/null +++ b/app/assets/stylesheets/scaffolds.scss @@ -0,0 +1,270 @@ +/* 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; + .btn, .form-control { + display: table-cell; + &:not(:last-child) { + float: left; + @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-right; + @extend .simple-input-group; +} + +#user-actions { + @extend .navbar-btn; + @extend .navbar-left; + @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[role="button"] { + display: inline; +} + +/* 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 e69de29..0000000 diff --git a/app/assets/stylesheets/servers.css.scss b/app/assets/stylesheets/servers.css.scss deleted file mode 100644 index e69de29..0000000 diff --git a/app/assets/stylesheets/sessions.css.scss b/app/assets/stylesheets/sessions.css.scss deleted file mode 100644 index e69de29..0000000 diff --git a/app/assets/stylesheets/teams.css.scss b/app/assets/stylesheets/teams.css.scss deleted file mode 100644 index e69de29..0000000 diff --git a/app/assets/stylesheets/tournaments.css.scss b/app/assets/stylesheets/tournaments.css.scss deleted file mode 100644 index e69de29..0000000 diff --git a/app/assets/stylesheets/users.css.scss b/app/assets/stylesheets/users.css.scss deleted file mode 100644 index e69de29..0000000 diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 7cb7e0f..92ca6ad 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -4,7 +4,6 @@ Leaguer <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %> - <%= stylesheet_link_tag "#{params[:controller]}", media: "all", "data-turbolinks-track" => true %> <%= javascript_include_tag "application", "data-turbolinks-track" => true %> <%= javascript_include_tag "#{params[:controller]}", "data-turbolinks-track" => true %> -- cgit v1.2.3