summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorguntasgrewal <guntasgrewal@gmail.com>2014-04-06 20:09:54 -0400
committerguntasgrewal <guntasgrewal@gmail.com>2014-04-06 20:09:54 -0400
commitf3c395c56a644d976aa9a5608300557600bc683e (patch)
tree83cb961a721fa8c50903c70bb08ae14dd15ca58c /app/assets/stylesheets
parent7575d8cc70a28b323db0486ed06ab8af33b1f21a (diff)
parentf85943114dba527a1f87abb03229553472f57c0c (diff)
solved merge conflicts
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/custom.css.scss1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
index 1a9b09a..febcbb8 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -24,6 +24,7 @@ a, input[type="submit"] {
&.signup { @extend .btn-success; }
&.signin { @extend .btn-info; }
&.signout { @extend .btn-danger; }
+ &.server { @extend .btn-danger; }
}
p.errors {