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

Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0

Browse Source
This commit is contained in:
Sebastiaan Janssen
2013-12-29 15:08:10 +01:00
parent a49058fe00 dcde00cec1
commit 139df63ddf
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/umbraco_client/tinymce3/themes/umbraco/skins/umbraco/content.css
View File

@@ -1,4 +1,4 @@
body, td, pre {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px; margin:8px;}
body, td, pre {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:8px;}
body {background:#FFF;}
body.mceForceColors {background:#FFF; color:#000;}
h1 {font-size: 2em}

4
src/umbraco.cms/businesslogic/Packager/data.cs
View File

@@ -116,8 +116,8 @@ namespace umbraco.cms.businesslogic.packager
instance.Attributes.Append(xmlHelper.addAttribute(Source, "skinRepoGuid", ""));
XmlElement license = Source.CreateElement("license");
license.InnerText = "MIT license";
license.Attributes.Append(xmlHelper.addAttribute(Source, "url", "http://www.opensource.org/licenses/mit-license.php"));
license.InnerText = "MIT License";
license.Attributes.Append(xmlHelper.addAttribute(Source, "url", "http://opensource.org/licenses/MIT"));
instance.AppendChild(license);
XmlElement author = Source.CreateElement("author");