diff options
| author | Tomer Kimia <tkimia@purdue.edu> | 2014-03-04 19:55:42 -0500 |
|---|---|---|
| committer | Tomer Kimia <tkimia@purdue.edu> | 2014-03-04 19:55:42 -0500 |
| commit | db025e713efc8bfeb43b3fc5d2c54b89e1fa1867 (patch) | |
| tree | 0d73e833efe68b43bdb47c7e2f26a425df71efaa /app/assets | |
| parent | d73a82b74685df29eb37c1a8b250951827dc164b (diff) | |
fixed css conflict
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/custom.css.scss | 33 |
1 files changed, 8 insertions, 25 deletions
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss index 489914b..3c9aef9 100644 --- a/app/assets/stylesheets/custom.css.scss +++ b/app/assets/stylesheets/custom.css.scss @@ -7,19 +7,14 @@ header > nav { #log-buttons { margin-top: 8px; -<<<<<<< HEAD - } - .signup { - @extend .btn; - @extend .btn-success; - } - .signin { - @extend .btn; - @extend .btn-info; - } - .signout { - @extend .btn; - @extend .btn-danger; + 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; } + } } } @@ -44,15 +39,3 @@ 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 |