diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-01-18 01:00:40 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-01-18 01:00:40 +0200 |
| commit | b7614c714eda948a2db5d7bf507e61e1e7b457da (patch) | |
| tree | 0b178841b1db5c7b1ece041416e3d7bb126c0616 | |
| parent | c9ea5f1316473f5ae33b24b673631f421b90a063 (diff) | |
| download | gitlab-ce-b7614c714eda948a2db5d7bf507e61e1e7b457da.tar.gz | |
error messages restyled
| -rw-r--r-- | app/assets/stylesheets/application.css | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/style.scss | 8 | ||||
| -rw-r--r-- | app/controllers/deploy_keys_controller.rb | 8 |
3 files changed, 9 insertions, 8 deletions
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index f811293185e..5a1fb42f69d 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -9,4 +9,3 @@ *= require_self *= require common */ - diff --git a/app/assets/stylesheets/style.scss b/app/assets/stylesheets/style.scss index 053ce0bb80a..9acb8d0ea47 100644 --- a/app/assets/stylesheets/style.scss +++ b/app/assets/stylesheets/style.scss @@ -310,8 +310,7 @@ body.login-page{background-color: #f1f1f1; padding-top: 10%} input[type="password"], textarea { - border: 1px solid #FFBBBB; - background: #fff4f6; + border: 1px solid #D30 !important; } } /* eo Errors */ @@ -711,13 +710,14 @@ body, button, input, select, textarea { .errors_holder { - background:#FBB; + background:#D30; + color:#fff; border:1px solid $lite_border_color; @include round-borders-all(4px); padding:5px; list-style:none; font-weight: bold; - text-shadow: 0 -1px 0 rgba(255, 255, 255, 0.25); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); li { padding:10px; diff --git a/app/controllers/deploy_keys_controller.rb b/app/controllers/deploy_keys_controller.rb index ae3feb7256f..9d4e0483d65 100644 --- a/app/controllers/deploy_keys_controller.rb +++ b/app/controllers/deploy_keys_controller.rb @@ -27,9 +27,11 @@ class DeployKeysController < ApplicationController def create @key = @project.deploy_keys.new(params[:key]) - @key.save - - redirect_to project_deploy_keys_path(@project) + if @key.save + redirect_to project_deploy_keys_path(@project) + else + render "new" + end end def destroy |