Download as
Browse Code »

Commit b7614c714eda948a2db5d7bf507e61e1e7b457da

Authored by Dmitriy Zaporozhets
1 parent c9ea5f13
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

error messages restyled

Showing 3 changed files with 9 additions and 8 deletions   Show diff stats
app/assets/stylesheets/application.css
  Diff comments   View file @b7614c7
@@ -9,4 +9,3 @@ @@ -9,4 +9,3 @@
9 *= require_self 9 *= require_self
10 *= require common 10 *= require common
11 */ 11 */
12 -  
app/assets/stylesheets/style.scss
  Diff comments   View file @b7614c7
@@ -310,8 +310,7 @@ body.login-page{background-color: #f1f1f1; padding-top: 10%} @@ -310,8 +310,7 @@ body.login-page{background-color: #f1f1f1; padding-top: 10%}
310 input[type="password"], 310 input[type="password"],
311 textarea 311 textarea
312 { 312 {
313 - border: 1px solid #FFBBBB;  
314 - background: #fff4f6; 313 + border: 1px solid #D30 !important;
315 } 314 }
316 } 315 }
317 /* eo Errors */ 316 /* eo Errors */
@@ -711,13 +710,14 @@ body, button, input, select, textarea { @@ -711,13 +710,14 @@ body, button, input, select, textarea {
711 710
712 711
713 .errors_holder { 712 .errors_holder {
714 - background:#FBB; 713 + background:#D30;
  714 + color:#fff;
715 border:1px solid $lite_border_color; 715 border:1px solid $lite_border_color;
716 @include round-borders-all(4px); 716 @include round-borders-all(4px);
717 padding:5px; 717 padding:5px;
718 list-style:none; 718 list-style:none;
719 font-weight: bold; 719 font-weight: bold;
720 - text-shadow: 0 -1px 0 rgba(255, 255, 255, 0.25); 720 + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
721 721
722 li { 722 li {
723 padding:10px; 723 padding:10px;
app/controllers/deploy_keys_controller.rb
  Diff comments   View file @b7614c7
@@ -27,9 +27,11 @@ class DeployKeysController < ApplicationController @@ -27,9 +27,11 @@ class DeployKeysController < ApplicationController
27 27
28 def create 28 def create
29 @key = @project.deploy_keys.new(params[:key]) 29 @key = @project.deploy_keys.new(params[:key])
30 - @key.save  
31 -  
32 - redirect_to project_deploy_keys_path(@project) 30 + if @key.save
  31 + redirect_to project_deploy_keys_path(@project)
  32 + else
  33 + render "new"
  34 + end
33 end 35 end
34 36
35 def destroy 37 def destroy