From df1cda1faab97f4c424efdcf8b6822f98b73adb8 Mon Sep 17 00:00:00 2001 From: guntasgrewal Date: Sun, 27 Apr 2014 20:47:31 -0400 Subject: Made some CSS changes all over the website. Added an alert icon.still need ajax to work with it --- app/assets/stylesheets/custom.css.scss | 15 ++++++++++++++- app/assets/stylesheets/scaffolds.css.scss | 4 ++-- app/assets/stylesheets/tournaments.css.scss | 1 + 3 files changed, 17 insertions(+), 3 deletions(-) (limited to 'app/assets') 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 { -- cgit v1.2.3