summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/custom.css.scss
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/stylesheets/custom.css.scss')
-rw-r--r--app/assets/stylesheets/custom.css.scss13
1 files changed, 13 insertions, 0 deletions
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
index 906780e..489914b 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -7,6 +7,7 @@ header > nav {
#log-buttons {
margin-top: 8px;
+<<<<<<< HEAD
}
.signup {
@extend .btn;
@@ -43,3 +44,15 @@ p.errors {
}
+=======
+ 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; }
+ }
+ }
+}
+>>>>>>> 6db29eb669a85e5b0aac7a1e8879781a1cb77772