From 5a9dd11a7c4ba984b1757eec492814ebbe8b0055 Mon Sep 17 00:00:00 2001 From: bjarnef Date: Mon, 23 Nov 2015 01:44:51 +0100 Subject: [PATCH] Change margin-top for triangle and re-order config properties --- .../lib/slider/bootstrap-slider-custom.css | 2 +- src/Umbraco.Web/PropertyEditors/SliderPropertyEditor.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/lib/slider/bootstrap-slider-custom.css b/src/Umbraco.Web.UI.Client/lib/slider/bootstrap-slider-custom.css index 49123b3d81..e7a395d458 100644 --- a/src/Umbraco.Web.UI.Client/lib/slider/bootstrap-slider-custom.css +++ b/src/Umbraco.Web.UI.Client/lib/slider/bootstrap-slider-custom.css @@ -9,7 +9,7 @@ box-shadow: none; border-width: 0 12px 15px 12px !important; margin-left: -12px; - margin-top: -10px !important; + margin-top: -5px !important; } .slider.slider-vertical .slider-tick.triangle, diff --git a/src/Umbraco.Web/PropertyEditors/SliderPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/SliderPropertyEditor.cs index 08f43b151c..16a9cba8d4 100644 --- a/src/Umbraco.Web/PropertyEditors/SliderPropertyEditor.cs +++ b/src/Umbraco.Web/PropertyEditors/SliderPropertyEditor.cs @@ -44,12 +44,12 @@ namespace Umbraco.Web.PropertyEditors [PreValueField("tooltip", "Tooltip", "views/propertyeditors/slider/tooltip.prevalues.html", Description = "Whether to show the tooltip on drag, hide the tooltip, or always show the tooltip. Accepts: 'show', 'hide', or 'always'")] public string Tooltip { get; set; } - [PreValueField("tooltipFormat", "Tooltip format", "textstring", Description = "The value wanted to be displayed in the tooltip. Use {0} and {1} for current values - {1} is only for range slider and if not using tooltip split.")] - public string TooltipFormat { get; set; } - [PreValueField("tooltipSplit", "Tooltip split", "boolean", Description = "If false show one tootip if true show two tooltips one for each handler")] public string TooltipSplit { get; set; } + [PreValueField("tooltipFormat", "Tooltip format", "textstring", Description = "The value wanted to be displayed in the tooltip. Use {0} and {1} for current values - {1} is only for range slider and if not using tooltip split.")] + public string TooltipFormat { get; set; } + [PreValueField("tooltipPosition", "Tooltip position", "textstring", Description = "Position of tooltip, relative to slider. Accepts 'top'/'bottom' for horizontal sliders and 'left'/'right' for vertically orientated sliders. Default positions are 'top' for horizontal and 'right' for vertical slider.")] public string TooltipPosition { get; set; }