Permalink
Browse files

Merge branch 'master' into custom

Conflicts:
	app/assets/stylesheets/comfortable_mexican_sofa/form.css
  • Loading branch information...
2 parents 74c4216 + 2ec4cb7 commit f4ab51cfc8fae05640696be96dc0f3e8e55303ca @mateusg committed Apr 27, 2012
Showing with 1 addition and 0 deletions.
  1. +1 −0 app/assets/stylesheets/comfortable_mexican_sofa/form.css
@@ -25,6 +25,7 @@
#cms_body .form_element .value input[type='datetime'],
#cms_body .form_element .value input[type='number'],
#cms_body .form_element .value input[type='email'],
+#cms_body .form_element .value input[type='url'],
#cms_body .form_element .value select,
#cms_body .form_element .value textarea {
border: 0px;

0 comments on commit f4ab51c

Please sign in to comment.