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

Merge with 4.10.0

Browse Source
This commit is contained in:
Morten@Thinkpad-X220
2012-10-09 12:29:39 -02:00
parent 2dbc40134c e2283c2310
commit 26b67afd33
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web.UI/umbraco_client/CodeMirror/css/umbracoCustom.css
View File

@@ -1,6 +1,3 @@
body
{
font-size:12px;
font-family:monospace;
line-height:16px;
.CodeMirror, .CodeMirror-scroll {
height: 100%;
}

7
src/umbraco.controls/CodeArea.cs
View File

@@ -84,7 +84,8 @@ namespace umbraco.uicontrols
ClientDependencyLoader.Instance.RegisterDependency(2, "CodeMirror/js/lib/codemirror.css", "UmbracoClient", ClientDependencyType.Css);
ClientDependencyLoader.Instance.RegisterDependency(3, "CodeArea/styles.css", "UmbracoClient", ClientDependencyType.Css);
ClientDependencyLoader.Instance.RegisterDependency(3, "CodeMirror/css/umbracoCustom.css", "UmbracoClient", ClientDependencyType.Css);
ClientDependencyLoader.Instance.RegisterDependency(4, "CodeArea/styles.css", "UmbracoClient", ClientDependencyType.Css);
@@ -252,9 +253,9 @@ namespace umbraco.uicontrols
string[] cssFile = new string[] { "jscolors.css", "umbracoCustom.css" };
switch (CodeBase)
{
{
case EditorType.JavaScript:
parserFiles = new string[] { "tokenizejavascript.js", "parsejavascript.js" };
parserFiles = new string[] { "tokenizejavascript.js", "parsejavascript.js" };
cssFile = new string[] { "jscolors.css", "umbracoCustom.css" };
break;
case EditorType.Css: