yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Nicholas-Westby-7.1.5' into 7.2.0

Browse Source
This commit is contained in:
Shannon
2014-08-25 17:02:12 +10:00
parent ab092b8814 16a4e425cb
commit da8469e4e4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/less/helveticons.less
View File

@@ -981,7 +981,7 @@ i.small{
.icon-movie:before {
content: "\e135";
}
.icon-map-loaction:before {
.icon-map-location:before {
content: "\e136";
}
.icon-map-alt:before {

4
src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs
View File

@@ -3,8 +3,8 @@ using Umbraco.Core.PropertyEditors;
namespace Umbraco.Web.PropertyEditors
{
[PropertyEditor(Constants.PropertyEditors.TextboxMultipleAlias, "Textarea", "textarea", IsParameterEditor = true)]
[PropertyEditor(Constants.PropertyEditors.TextboxMultipleAlias, "Textarea", "textarea", IsParameterEditor = true, ValueType = "TEXT")]
public class TextAreaPropertyEditor : PropertyEditor
{
}
}
}