diff options
author | DavisLWebb <davislwebb@ymail.com> | 2014-03-06 17:45:22 -0500 |
---|---|---|
committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-06 17:45:22 -0500 |
commit | 0c1299795a492e6296eb8e15bca576ea5139be6b (patch) | |
tree | 3921daf8c26d656b12b20ee22be63c97fa20f6fa /app/assets/stylesheets | |
parent | 110d67f433c091a3b739c5bbebe110d963efaa73 (diff) | |
parent | fe7d5ad458b4cabd8fd57b47f81abc56dd8532ad (diff) |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Conflicts:
app/controllers/sessions_controller.rb
app/views/sessions/new.html.erb
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/custom.css.scss | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss index ab86ce9..4ea86d4 100644 --- a/app/assets/stylesheets/custom.css.scss +++ b/app/assets/stylesheets/custom.css.scss @@ -7,14 +7,7 @@ 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; @@ -25,6 +18,14 @@ header > nav { } } +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; |