Merge branch 'master' of github.com:domify/registry

Conflicts:
	app/assets/stylesheets/shared/general.sass
This commit is contained in:
Martin Lensment 2015-04-21 13:23:50 +03:00
commit dbbc6b3bff
58 changed files with 552 additions and 322 deletions

View file

@ -39,3 +39,15 @@
.no-border
border: 0px !important
.errors
color: #A94442
// vertical allign with other fields
.typeahead
margin-left: 5px
// fix medium screen size label position
@media (min-width: 768px) and (max-width: 991px)
.control-label
text-align: left !important