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 --- .../stylesheets/application/bootstrapify.scss | 91 -------- app/assets/stylesheets/application/main.css.scss | 251 --------------------- 2 files changed, 342 deletions(-) delete mode 100644 app/assets/stylesheets/application/bootstrapify.scss delete mode 100644 app/assets/stylesheets/application/main.css.scss (limited to 'app/assets/stylesheets/application') 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; -} -- cgit v1.2.3-2-g168b