summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrewMurrell <amurrel@purdue.edu>2014-04-22 01:53:15 -0400
committerAndrewMurrell <amurrel@purdue.edu>2014-04-22 01:53:15 -0400
commita0c6b18233551454f3eb9f73a23c0dee43fd2cfa (patch)
tree4c80ac7f78e6269aeffb2887d16c4a68d34f87f3
parent257f6393e81ffaef00bb4a738973eaacba02d21e (diff)
parent9c0e7d91ec76c44ca63f87b2bcd46ff16cacc38b (diff)
Merge branch 'master' of http://github.com/LukeShu/leaguer
-rw-r--r--app/assets/images/bg.pngbin0 -> 2725 bytes
-rw-r--r--app/assets/stylesheets/application.css6
-rw-r--r--app/assets/stylesheets/custom.css.scss61
-rw-r--r--app/assets/stylesheets/matches.css.scss12
-rw-r--r--app/assets/stylesheets/scaffolds.css.scss140
-rw-r--r--app/assets/stylesheets/static.css.scss1
-rw-r--r--app/assets/stylesheets/tournaments.css.scss16
-rw-r--r--app/assets/stylesheets/users.css.scss7
-rw-r--r--app/views/matches/index.html.erb2
-rw-r--r--app/views/sessions/new.html.erb2
-rw-r--r--app/views/tournaments/index.html.erb6
11 files changed, 135 insertions, 118 deletions
diff --git a/app/assets/images/bg.png b/app/assets/images/bg.png
new file mode 100644
index 0000000..91c77c8
--- /dev/null
+++ b/app/assets/images/bg.png
Binary files differ
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index ab45dd0..ebb963c 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -13,15 +13,13 @@
*/
#query{
- background-color: white;
+ background-color: #303030;
border: 2px solid #ED9C28;
border-radius: 5px;
color: #FFF;
font-weight: bold;
height: 30px;
-}
-.navbar{
- background-color: white;
+ padding: 0px 5px;
}
footer {
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
index febcbb8..d7f1698 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -18,37 +18,60 @@ header > nav {
}
}
+
a, input[type="submit"] {
@extend .btn;
&.user { @extend .btn-info; }
&.signup { @extend .btn-success; }
- &.signin { @extend .btn-info; }
+ &.signin { @extend .btn-warning; }
&.signout { @extend .btn-danger; }
&.server { @extend .btn-danger; }
+ font-weight: bold !important;
+}
+
+
+input[type="text"], input[type="password"]{
+ border: 3px inset #A5A5A5;
+ -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);
+ padding: 8px;
+ background: rgba(0,0,0,0.5);
+ margin: 0 0 5px 0;
}
p.errors {
- background-color: #FCF8C7;
+ background-color: rgba(0,0,0,0.5);;
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;
+#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;
+ }
} \ No newline at end of file
diff --git a/app/assets/stylesheets/matches.css.scss b/app/assets/stylesheets/matches.css.scss
index 84430d6..66da68e 100644
--- a/app/assets/stylesheets/matches.css.scss
+++ b/app/assets/stylesheets/matches.css.scss
@@ -39,4 +39,16 @@
#current-id {
display: none;
+}
+
+
+
+/**** INDEX PAGE - TABLE AND GRAPH ****/
+#matches-table {
+ @extend .table;
+ color: #FFF;
+
+ form {
+ color: #333;
+ }
} \ No newline at end of file
diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
index 02b96a2..40791e8 100644
--- a/app/assets/stylesheets/scaffolds.css.scss
+++ b/app/assets/stylesheets/scaffolds.css.scss
@@ -2,13 +2,16 @@
$page-color: #444;
$toolbar-color: black;
+$orange: #DD9125;
+$darker-orange: #9D4102;
+$link-yellow: #FFC50D;
html{
height: 100%;
}
body {
- background-color: $page-color;
+ background: asset-url("bg.png", image) repeat scroll 0 0 $page-color;
color: $page-color;
font-family: verdana, arial, helvetica, sans-serif;
font-size: 13px;
@@ -16,47 +19,38 @@ body {
height: 100%;
}
-.wrapper {
- padding-left: 5%;
- padding-right: 5%;
- margin: 0 auto;
- background-color: #fff;
- padding-top: 10px;
- height: 90%;
- box-shadow: 1px 1px 7px orange;
- border-radius: 0px 0px 5px 5px;
+h1, h2, h3, h4, h5, p{
+ color: $orange;
}
-footer {
- clear: both;
- margin: 0 auto;
- margin-top: 10px;
- color: white;
-
+h1, h2, h3, h4, h5 {
+ text-shadow: 0px 0px 2px $darker-orange;
}
-@media screen and (min-width: 480px) {
- .wrapper, footer {
- width: 80%;
- min-width: 480px;
- max-width: 1024px;
- }
+p, ol, ul, td {
+ font-family: verdana, arial, helvetica, sans-serif;
+ font-size: 13px;
+ line-height: 18px;
}
-@media screen and (max-width: 480px) {
- .wrapper, footer {
- width: 100%;
- }
-}
+/* NAVBAR */
-h1, h2, h3, h4, h5{
- color: #030303;
+.navbar-brand {
+ @extend .no-dec;
+ a{
+ color: white;
+ &:hover, &:active, &:focus {
+ color: white;
+ font-weight: normal;
+ text-decoration: none;
+ }
+ }
}
-p, ol, ul, td {
- font-family: verdana, arial, helvetica, sans-serif;
- font-size: 13px;
- line-height: 18px;
+.navbar-inverse, header > nav {
+ background-color: $toolbar-color;
+ border-radius: 0px 0px 5px 5px;
+ box-shadow: 0px 0px 5px black;
}
pre {
@@ -66,12 +60,9 @@ pre {
}
a {
- color: #000;
- &:visited {
- color: #000;
- }
- &:hover {
- color: green;
+ color: $link-yellow;
+ &:hover {
+ color: #FFEF00;
text-decoration: none;
}
}
@@ -83,7 +74,17 @@ div {
}
#notice {
- color: green;
+ 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;
+ }
}
.field_with_errors {
@@ -93,52 +94,25 @@ div {
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;
- }
+.wrapper {
+ width: 80%;
+ margin: 0 auto;
+ margin-top: 10px;
}
-
-/* NAVBAR */
-
-.navbar-brand {
- @extend .no-dec;
- a{
- color: white;
- &:hover, &:active, &:focus {
- color: white;
- font-weight: normal;
- text-decoration: none;
- }
- }
+button, input[type="submit"] {
+ @extend .btn;
}
-.navbar-inverse, header > nav {
- background-color: $toolbar-color;
- border-color: #0F4070;
- border-radius: 0px 0px 5px 5px;
- margin-bottom: 0px;
-}
-button, input[type="submit"] {
- @extend .btn;
-}
+footer {
+ clear: both;
+ margin: 0 auto;
+ border-top: solid 1px $orange;
+ padding-top: 10px;
+ text-align: center;
+ position:absolute;
+ bottom: 0;
+ width: 100%;
+} \ No newline at end of file
diff --git a/app/assets/stylesheets/static.css.scss b/app/assets/stylesheets/static.css.scss
index d73e77d..14443f3 100644
--- a/app/assets/stylesheets/static.css.scss
+++ b/app/assets/stylesheets/static.css.scss
@@ -4,6 +4,7 @@
.jumbotron {
background-color: #FFF;
+ box-shadow: 1px 1px 20px black;
p {
line-height: 1.5em;
diff --git a/app/assets/stylesheets/tournaments.css.scss b/app/assets/stylesheets/tournaments.css.scss
index 2074783..41d6023 100644
--- a/app/assets/stylesheets/tournaments.css.scss
+++ b/app/assets/stylesheets/tournaments.css.scss
@@ -17,7 +17,7 @@ span.default-explanation {
}
#tournament-side-params {
- background: none repeat scroll 0 0 #ADD8E6;
+ background: none repeat scroll 0 0 rgba(0,0,0,0.5);
border-radius: 5px;
float: right;
font-size: 7px;
@@ -33,23 +33,24 @@ span.default-explanation {
#tournament-users{
li {
- color: green;
+ color: #10A010;
}
.black {
- color: black;
+ color: white;
}
}
/* Style of a tournament listing div */
div.tournament-listing {
- margin-top: 10px;
+ margin: 10px 0px;
border-radius: 5px;
- box-shadow: 2px 2px 4px #B8B8B8;
- border: 2px solid #AAAAAA;
+ box-shadow: 0px 0px 3px #B8B8B8;
+ background-color: rgba(0, 0, 0, 0.6);
+ border: 1px solid #AAAAAA;
min-height: 100px;
- padding: 4px;
+ padding: 8px 4px;
/* AKA the listing title */
h3 {
@@ -65,6 +66,7 @@ div.tournament-listing {
/* host of the tournament */
.host {
font-weight: bold;
+ color: #FFF;
}
.col-md-8 {
diff --git a/app/assets/stylesheets/users.css.scss b/app/assets/stylesheets/users.css.scss
index 1efc835..3453a55 100644
--- a/app/assets/stylesheets/users.css.scss
+++ b/app/assets/stylesheets/users.css.scss
@@ -1,3 +1,10 @@
// 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/
+
+
+/*** FOR NEW USER - AKA SIGN UP ***/
+.simple_captcha {
+ background-color: rgba(255, 255, 255, 0.7);
+ margin: 10px 0px;
+} \ No newline at end of file
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb
index 08d5fd6..03427d8 100644
--- a/app/views/matches/index.html.erb
+++ b/app/views/matches/index.html.erb
@@ -1,7 +1,7 @@
<h1><%= @tournament.name %> - Matches</h1>
-<table class="table">
+<table id="matches-table" class="table">
<thead>
<tr>
<th>Name</th>
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index b4acf77..ff27762 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -14,7 +14,7 @@
<%= f.password_field :password %>
</p>
<p>
- <%= f.submit "Sign in", class: "btn btn-large btn-primary" %>
+ <%= f.submit "Log in", class: "signin" %>
</p>
<% end %>
diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb
index 7957042..eef9577 100644
--- a/app/views/tournaments/index.html.erb
+++ b/app/views/tournaments/index.html.erb
@@ -5,8 +5,8 @@
<%# Each tournament has a div for its listing %>
<% @tournaments.each do |t| %>
<div class="row tournament-listing">
- <div class="col-md-2 "><%= image_tag 'http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(t.hosts.first.email) + '?s=100&d=mm' %></div>
- <div class="col-md-8">
+ <div class="col-md-2 col-sm-3 col-xs-6"><%= image_tag 'http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(t.hosts.first.email) + '?s=100&d=mm' %></div>
+ <div class="col-md-8 col-sm-7 col-xs-6">
<%# "header" %>
<%= link_to(t) do %><h3><%= t.name %></h3><% end %>
<div class="row" style="margin-left:2%;">
@@ -23,7 +23,7 @@
</div>
</div>
</div>
- <div class="col-md-2">
+ <div class="col-md-2 col-sm-2 col-xs-2">
<% if signed_in? %>
<% if !t.players.include?(current_user) %>
<%= form_tag(tournament_path(t), method: "put") do %>