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

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

Browse Source
This commit is contained in:
Shannon
2013-07-09 11:48:03 +10:00
parent 868edee5e6 42eb82e6ca
commit fdabd945dc
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web.UI/umbraco_client/tags/css/jquery.tagsinput.css
View File

@@ -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; }

4
src/umbraco.controls/DatePicker/DateTimePicker.cs
View File

@@ -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

1
src/umbraco.editorControls/tags/DataEditor.cs
View File

@@ -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);