From 93def731ef3ce8151b6aab37d922338c7d208054 Mon Sep 17 00:00:00 2001 From: Morten Christensen Date: Fri, 5 Jul 2013 10:51:19 +0200 Subject: [PATCH] Fixes #U4-2466 --- .../umbraco_client/tags/css/jquery.tagsinput.css | 5 +++++ src/umbraco.controls/DatePicker/DateTimePicker.cs | 4 ---- src/umbraco.editorControls/tags/DataEditor.cs | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web.UI/umbraco_client/tags/css/jquery.tagsinput.css b/src/Umbraco.Web.UI/umbraco_client/tags/css/jquery.tagsinput.css index c595e249f9..3af1d36e55 100644 --- a/src/Umbraco.Web.UI/umbraco_client/tags/css/jquery.tagsinput.css +++ b/src/Umbraco.Web.UI/umbraco_client/tags/css/jquery.tagsinput.css @@ -1,3 +1,8 @@ +/* From jquery-ui.custom.css */ +.ui-autocomplete { position: absolute; cursor: default; } +/* workarounds */ +* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ + div.tagsinput { border:1px solid #CCC; background: #FFF; padding:5px; width:300px; height:100px; overflow-y: auto;} div.tagsinput span.tag { border: 1px solid #a5d24a; -moz-border-radius:2px; -webkit-border-radius:2px; display: block; float: left; padding: 5px; text-decoration:none; background: #cde69c; color: #638421; margin-right: 5px; margin-bottom:5px;font-family: helvetica; font-size:13px;} div.tagsinput span.tag a { font-weight: bold; color: #82ad2b; text-decoration:none; font-size: 11px; } diff --git a/src/umbraco.controls/DatePicker/DateTimePicker.cs b/src/umbraco.controls/DatePicker/DateTimePicker.cs index 5c453649e1..4df20fbb9d 100644 --- a/src/umbraco.controls/DatePicker/DateTimePicker.cs +++ b/src/umbraco.controls/DatePicker/DateTimePicker.cs @@ -1,11 +1,7 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using ClientDependency.Core; using System.Web.UI; using System.Web.UI.WebControls; -using umbraco.IO; using System.Web.UI.HtmlControls; namespace umbraco.uicontrols.DatePicker diff --git a/src/umbraco.editorControls/tags/DataEditor.cs b/src/umbraco.editorControls/tags/DataEditor.cs index 4281e1f12a..22c9fd423b 100644 --- a/src/umbraco.editorControls/tags/DataEditor.cs +++ b/src/umbraco.editorControls/tags/DataEditor.cs @@ -62,7 +62,6 @@ namespace umbraco.editorControls.tags base.OnInit(e); // register all dependencies - only registered once - ClientDependencyLoader.Instance.RegisterDependency("ui/ui-lightness/jquery-ui.custom.css", "UmbracoClient", ClientDependencyType.Css); ClientDependencyLoader.Instance.RegisterDependency("css/umbracoGui.css", "UmbracoRoot", ClientDependencyType.Css); ClientDependencyLoader.Instance.RegisterDependency("tags/css/jquery.tagsinput.css", "UmbracoClient", ClientDependencyType.Css); ClientDependencyLoader.Instance.RegisterDependency("tags/js/jquery.tagsinput.min.js", "UmbracoClient", ClientDependencyType.Javascript);