Skip to content

Commit

Permalink
Merge branch 'ahancer-dev' of github.com:Laki7877/col-sp-ui into ahan…
Browse files Browse the repository at this point in the history
…cer-dev
  • Loading branch information
terragou committed Mar 1, 2016
2 parents 3316d7f + 3183506 commit 2b8ce61
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion public/assets/css/screen.css
Original file line number Diff line number Diff line change
Expand Up @@ -15319,6 +15319,12 @@ ng-transclude.has-error .form-control {
outline: 0;
}

/* line 270, ../../../assets/screen.scss */
.color-warning {
color: #8a6d3b;
line-height: 16px;
}

@keyframes shake {
0% {
transform: translateX(0);
Expand Down Expand Up @@ -15359,7 +15365,7 @@ ng-transclude.has-error .form-control {
-webkit-transform: translateX(0);
}
}
/* line 288, ../../../assets/screen.scss */
/* line 293, ../../../assets/screen.scss */
.shake {
-webkit-animation: shake 400ms ease-in-out;
animation: shake 400ms ease-in-out;
Expand Down

0 comments on commit 2b8ce61

Please sign in to comment.