summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorguntasgrewal <guntasgrewal@gmail.com>2014-03-25 17:30:10 -0400
committerguntasgrewal <guntasgrewal@gmail.com>2014-03-25 17:30:10 -0400
commit0c22c4bd9a0b4a0b0ff5840c1af41c0b320e3529 (patch)
tree2fc2082814e513ec5d68b22e7fa07d268df6d788 /app/assets/stylesheets
parent8435c0a5ec9889a9da6ede2e24c044d64b279095 (diff)
added match status
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/application.css12
-rw-r--r--app/assets/stylesheets/custom.css.scss53
-rw-r--r--app/assets/stylesheets/scaffolds.css.scss40
-rw-r--r--app/assets/stylesheets/static.css.scss9
-rw-r--r--app/assets/stylesheets/tournaments.css.scss9
5 files changed, 5 insertions, 118 deletions
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index b3f5d46..3192ec8 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -11,15 +11,3 @@
*= 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;
-}
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
deleted file mode 100644
index 1a9b09a..0000000
--- a/app/assets/stylesheets/custom.css.scss
+++ /dev/null
@@ -1,53 +0,0 @@
-@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; }
-}
-
-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/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
index 6700fef..6ec6a8f 100644
--- a/app/assets/stylesheets/scaffolds.css.scss
+++ b/app/assets/stylesheets/scaffolds.css.scss
@@ -1,5 +1,3 @@
-@import "bootstrap";
-
body {
background-color: #fff;
color: #333;
@@ -8,10 +6,6 @@ body {
line-height: 18px;
}
-h1, h2, h3, h4, h5{
- color: #0f0f0f;
-}
-
p, ol, ul, td {
font-family: verdana, arial, helvetica, sans-serif;
font-size: 13px;
@@ -27,11 +21,11 @@ pre {
a {
color: #000;
&:visited {
- color: #000;
+ color: #666;
}
&:hover {
- color: green;
- text-decoration: none;
+ color: #fff;
+ background-color: #000;
}
}
@@ -46,9 +40,8 @@ div {
}
.field_with_errors {
- padding: 1px;
- background-color: #FF4C4C;
- box-shadow: 0px 0px 5px red;
+ padding: 2px;
+ background-color: red;
display: table;
}
@@ -74,26 +67,3 @@ div {
list-style: square;
}
}
-
-.navbar-brand {
- @extend .no-dec;
- a{
- color: white;
- &:hover, &:active, &:focus {
- color: white;
- font-weight: normal;
- text-decoration: none;
- }
- }
-}
-
-footer {
- text-align: center;
- border-top: solid 1px #999999;
- padding-top: 18px;
- margin-top: 18px;
-}
-
-button, input[type="submit"] {
- @extend .btn;
-}
diff --git a/app/assets/stylesheets/static.css.scss b/app/assets/stylesheets/static.css.scss
index d73e77d..5a803c8 100644
--- a/app/assets/stylesheets/static.css.scss
+++ b/app/assets/stylesheets/static.css.scss
@@ -1,12 +1,3 @@
// 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 458897e..e372b90 100644
--- a/app/assets/stylesheets/tournaments.css.scss
+++ b/app/assets/stylesheets/tournaments.css.scss
@@ -1,12 +1,3 @@
// 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;
-}