Skip to content

Commit

Permalink
Merge pull request #40 from ruslanchek/master
Browse files Browse the repository at this point in the history
Small fixes
  • Loading branch information
ruslanchek committed Feb 27, 2015
2 parents 393c0a4 + 61bd52a commit a60f979
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 0 deletions.
17 changes: 17 additions & 0 deletions css/screen.css
Original file line number Diff line number Diff line change
Expand Up @@ -4069,6 +4069,7 @@ html, body {
line-height: 36px;
position: relative;
outline: none;
margin: 0;
border-radius: 5px;
-webkit-transition: opacity 0.2s;
transition: opacity 0.2s;
Expand Down Expand Up @@ -4489,6 +4490,22 @@ select:disabled,
textarea:disabled {
opacity: 0.25;
cursor: default; }
input::-webkit-input-placeholder,
select::-webkit-input-placeholder,
textarea::-webkit-input-placeholder{
color: #aab2bc; }
input::-moz-placeholder,
select::-moz-placeholder,
textarea::-moz-placeholder{
color: #aab2bc; }
input:-ms-input-placeholder,
select:-ms-input-placeholder,
textarea:-ms-input-placeholder{
color: #aab2bc; }
input::placeholder,
select::placeholder,
textarea::placeholder {
color: #aab2bc; }

.select {
height: 40px;
Expand Down
1 change: 1 addition & 0 deletions sass/components/button.sass
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
line-height: $height-component-default
position: relative
outline: none
margin: 0
border-radius: $border-radius
transition: opacity .2s
box-sizing: border-box
Expand Down
3 changes: 3 additions & 0 deletions sass/components/form.sass
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ textarea
opacity: .25
cursor: default

&::placeholder
color: $color-medium-gray-dark

.select
height: 40px
position: relative
Expand Down

0 comments on commit a60f979

Please sign in to comment.