summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/custom.css.scss
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-03-06 19:56:33 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-03-06 19:56:33 -0500
commita1700f50ee800cfbfb93bd7dfff7b5d79ae2cb2f (patch)
treec9db0b8bdd4818f5ce2ff982657e2aedfda98f8f /app/assets/stylesheets/custom.css.scss
parent706392b7c4520382ddd8f827b31205c6b71f5320 (diff)
parent63830b0f939db5f6911218950525428420c4d467 (diff)
Merge branch 'master2'
Conflicts: app/controllers/tournaments_controller.rb app/models/tournament.rb app/views/tournaments/_selected.html.erb app/views/tournaments/new.html.erb config/routes.rb
Diffstat (limited to 'app/assets/stylesheets/custom.css.scss')
-rw-r--r--app/assets/stylesheets/custom.css.scss19
1 files changed, 10 insertions, 9 deletions
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
index d4c81a0..4ea86d4 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -7,24 +7,25 @@ header > nav {
#log-buttons {
margin-top: 8px;
- form { display: inline; }
- a, input[type="submit"] {
- @extend .btn;
- &.user { @extend .btn-info; }
- &.signup { @extend .btn-success; }
- &.signin { @extend .btn-info; }
- &.signout { @extend .btn-danger; }
- }
+ form { display: inline; }
}
form.search {
@extend .navbar-form;
@extend .navbar-right;
input[type="submit"] {
- @extend .btn-warning;
+ @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;