summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorguntasgrewal <guntasgrewal@gmail.com>2014-04-27 20:47:31 -0400
committerguntasgrewal <guntasgrewal@gmail.com>2014-04-27 20:47:31 -0400
commitdf1cda1faab97f4c424efdcf8b6822f98b73adb8 (patch)
treec933cf5bd79cf71b84718a2dcd7e634c9c188cd1 /app/assets
parent6b2aca5d0eba38fff00d5922655c6d8cb9c2f7ea (diff)
Made some CSS changes all over the website. Added an alert icon.still need ajax to work with it
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/custom.css.scss15
-rw-r--r--app/assets/stylesheets/scaffolds.css.scss4
-rw-r--r--app/assets/stylesheets/tournaments.css.scss1
3 files changed, 17 insertions, 3 deletions
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
index 6e54043..9e9e63a 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -24,6 +24,17 @@ header > nav {
}
}
+.btn-custom-orange {
+ color: white;
+ background-color: rgb(255, 69, 0);
+ border-color: rgb(255, 69, 0);
+}
+.btn-custom-foxtrot {
+ color: white;
+ background-color: hsl(0, 69%, 22%) !important;
+}
+
+
a, input[type="submit"] {
@extend .btn;
@@ -31,7 +42,9 @@ a, input[type="submit"] {
&.signup { @extend .btn-success; }
&.signin { @extend .btn-warning; }
&.signout { @extend .btn-danger; }
- &.server { @extend .btn-danger; }
+ &.server { @extend .btn-warning; }
+ &.create-alert {@extend .btn-custom-orange;}
+ &.alerts { @extend .navbar-right; @extend .glyphicon; @extend .glyphicon-exclamation-sign; @extend .btn-custom-foxtrot;}
font-weight: bold !important;
}
diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
index eb1f751..3c485b5 100644
--- a/app/assets/stylesheets/scaffolds.css.scss
+++ b/app/assets/stylesheets/scaffolds.css.scss
@@ -62,8 +62,8 @@ pre {
a {
color: $link-yellow;
&:hover {
- color: #FFEF00;
- text-decoration: none;
+ color: white;
+
}
}
diff --git a/app/assets/stylesheets/tournaments.css.scss b/app/assets/stylesheets/tournaments.css.scss
index cc55253..42afd38 100644
--- a/app/assets/stylesheets/tournaments.css.scss
+++ b/app/assets/stylesheets/tournaments.css.scss
@@ -30,6 +30,7 @@ span.default-explanation {
}
+
#tournament-users{
li {