From 20fc02053a680e096f0ea40148650375acf53687 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Tue, 9 Oct 2012 12:25:36 -0200 Subject: [PATCH] Made CodeMirror 100% height again --- .../umbraco_client/CodeMirror/css/umbracoCustom.css | 7 ++----- src/umbraco.controls/CodeArea.cs | 7 ++++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Web.UI/umbraco_client/CodeMirror/css/umbracoCustom.css b/src/Umbraco.Web.UI/umbraco_client/CodeMirror/css/umbracoCustom.css index b5fbe5f4f4..89ee4921ba 100644 --- a/src/Umbraco.Web.UI/umbraco_client/CodeMirror/css/umbracoCustom.css +++ b/src/Umbraco.Web.UI/umbraco_client/CodeMirror/css/umbracoCustom.css @@ -1,6 +1,3 @@ -body -{ - font-size:12px; - font-family:monospace; - line-height:16px; +.CodeMirror, .CodeMirror-scroll { + height: 100%; } \ No newline at end of file diff --git a/src/umbraco.controls/CodeArea.cs b/src/umbraco.controls/CodeArea.cs index a6adc8e4d6..7d3c9e1392 100644 --- a/src/umbraco.controls/CodeArea.cs +++ b/src/umbraco.controls/CodeArea.cs @@ -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: