Skip to content

Commit

Permalink
bug #38 Fixed the styles of the form fields when the form contains er…
Browse files Browse the repository at this point in the history
…rors (javiereguiluz)

This PR was merged into the master branch.

Discussion
----------

Fixed the styles of the form fields when the form contains errors

This fixes #37

![form_field_errors](https://cloud.githubusercontent.com/assets/73419/7230732/eb3bfdb0-e770-11e4-8ea1-ed730b2e3979.png)

Commits
-------

bb57946 Fixed the styles of the form fields when the form contains errors
  • Loading branch information
javiereguiluz committed Apr 20, 2015
2 parents 0c0e353 + bb57946 commit 4745b07
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 6 deletions.
16 changes: 13 additions & 3 deletions app/Resources/assets/scss/main.scss
Expand Up @@ -29,7 +29,7 @@ code {
// Text labels
.text-danger,
.text-danger:hover {
color: #E74C3C;
color: $brand-danger;
}

//
Expand Down Expand Up @@ -126,9 +126,19 @@ footer {
// --------------------------------------------------

// Form errors
.form-error {
.form-group.has-error .form-control {
border-color: $brand-danger;
}
.form-group.has-error .control-label {
color: $brand-danger;
}
.form-group.has-error .help-block {
background-color: $brand-danger;
color: #FFF;
font-size: $font-size-base;
padding: 1em;

ul {
color: #FFF;
margin-bottom: 0;
}
}
Expand Down
16 changes: 13 additions & 3 deletions web/css/app.css
Expand Up @@ -6990,7 +6990,7 @@ code {

.text-danger,
.text-danger:hover {
color: #E74C3C; }
color: #e74c3c; }

i {
margin-right: .25em; }
Expand Down Expand Up @@ -7039,9 +7039,19 @@ footer {
margin-bottom: 2em;
padding: 0; }

.form-error ul {
.form-group.has-error .form-control {
border-color: #e74c3c; }

.form-group.has-error .control-label {
color: #e74c3c; }

.form-group.has-error .help-block {
background-color: #e74c3c;
color: #FFF;
margin-bottom: 0; }
font-size: 15px;
padding: 1em; }
.form-group.has-error .help-block ul {
margin-bottom: 0; }

body#homepage {
text-align: center; }
Expand Down

0 comments on commit 4745b07

Please sign in to comment.