diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/custom.css.scss | 39 | ||||
| -rw-r--r-- | app/assets/stylesheets/scaffolds.css.scss | 5 | ||||
| -rw-r--r-- | app/views/common/_error_messages.html.erb | 2 | ||||
| -rw-r--r-- | app/views/games/index.html.erb | 6 |
4 files changed, 45 insertions, 7 deletions
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss index 0599a93..489914b 100644 --- a/app/assets/stylesheets/custom.css.scss +++ b/app/assets/stylesheets/custom.css.scss @@ -7,6 +7,44 @@ 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; + } +} + +p.errors { + background-color: #FCF8C7; + color: red; + border-radius: 7px; + padding: 10px; +} + +#errorExplanation { + h2 { + font-size: 1em; + color: red; + font-weight: bold; + } + li { + font-size: 1em; + color: red; + font-style: italic; + } + +} + +======= form { display: inline; } a, input[type="submit"] { @extend .btn; @@ -17,3 +55,4 @@ header > nav { } } } +>>>>>>> 6db29eb669a85e5b0aac7a1e8879781a1cb77772 diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss index e4b33b3..07c7676 100644 --- a/app/assets/stylesheets/scaffolds.css.scss +++ b/app/assets/stylesheets/scaffolds.css.scss @@ -44,8 +44,9 @@ div { } .field_with_errors { - padding: 2px; - background-color: red; + padding: 1px; + background-color: #FF4C4C; + box-shadow: 0px 0px 5px red; display: table; } diff --git a/app/views/common/_error_messages.html.erb b/app/views/common/_error_messages.html.erb index c9fdd51..731f62c 100644 --- a/app/views/common/_error_messages.html.erb +++ b/app/views/common/_error_messages.html.erb @@ -1,7 +1,7 @@ <%# http://railscasts.com/episodes/211-validations-in-rails-3 %> <% if target.errors.any? %> <div id="errorExplanation"> - <h2><%= pluralize(target.errors.count, "error") %> prohibited this record from being saved:</h2> + <h2><%= pluralize(target.errors.count, "error") %> prohibited this form from being submitted:</h2> <ul> <% target.errors.full_messages.each do |msg| %> <li><%= msg %></li> diff --git a/app/views/games/index.html.erb b/app/views/games/index.html.erb index ac362cd..7ee69d1 100644 --- a/app/views/games/index.html.erb +++ b/app/views/games/index.html.erb @@ -32,8 +32,6 @@ <br> -<<<<<<< HEAD -<%= link_to 'New Game', new_game_path %> -======= + <%= link_to 'New Game', new_game_path, {:class => "btn btn-warning"} %> ->>>>>>> aca85cf084702c29014a17eafb090421061fae8b + |