diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index f811293185ea1b8ed32536573c1ec88eb1008875..5a1fb42f69d034a9799eb4bfce982ad2670ab80a 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 053ce0bb80a0d3d17622dfe567c47a0809e04835..9acb8d0ea47cfd9c3a689e34c3ed167444ee684c 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 ae3feb7256f7f61379d87b77a329dd1517176c07..9d4e0483d65d47b864eddbb9790bc0cbb7240326 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