Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix Bug 20029.

Browse source
This commit is contained in:
Julia Radzhabova 2017-03-17 16:03:54 +03:00
parent d4cc54c116
commit 4ce4fdaeb7
2 changed files with 40 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/common/main/lib/component/MultiSliderGradient.js
View file

@ -63,7 +63,10 @@ define([
'<div class="slider multi-slider-gradient">', '<div class="slider multi-slider-gradient">',
'<div class="track"></div>', '<div class="track"></div>',
'<% _.each(items, function(item) { %>', '<% _.each(items, function(item) { %>',
'<div class="thumb img-commonctrl" style=""></div>', '<div class="thumb img-commonctrl" style="">',
'<div class="thumb-top"></div>',
'<div class="thumb-bottom"></div>',
'</div>',
'<% }); %>', '<% }); %>',
'</div>' '</div>'
].join('')), ].join('')),
@ -98,6 +101,7 @@ define([
me.thumbs[i].thumb.on('dblclick', null, function() { me.thumbs[i].thumb.on('dblclick', null, function() {
me.trigger('thumbdblclick', me); me.trigger('thumbdblclick', me);
}); });
me.thumbs[i].thumbcolor = me.thumbs[i].thumb.find('> div');
} }
if (me.styleStr!=='') { if (me.styleStr!=='') {
@ -118,6 +122,7 @@ define([
setColorValue: function(color, index) { setColorValue: function(color, index) {
var ind = (index!==undefined) ? index : this.currentThumb; var ind = (index!==undefined) ? index : this.currentThumb;
this.colorValues[ind] = color; this.colorValues[ind] = color;
this.thumbs[ind].thumbcolor.css('background-color', color);
this.changeGradientStyle(); this.changeGradientStyle();
}, },

37
apps/common/main/resources/less/multislider-gradient.less
View file

@ -4,10 +4,41 @@
.thumb { .thumb {
top: 18px; top: 18px;
background-position: @multislide-thumb-offset-x @multislide-thumb-offset-y; background: none;
&.active { .thumb-top {
background-position: @multislide-thumb-offset-x @multislide-thumb-offset-y - 30px; position: absolute;
top: 2px;
left: 2px;
width: 9px;
height: 9px;
background-color: #ffffff;
-moz-transform: rotate(45deg);
-ms-transform: rotate(45deg);
-webkit-transform: rotate(45deg);
-o-transform: rotate(45deg);
transform: rotate(45deg);
border-top: solid 1px @gray-darker;
border-left: solid 1px @gray-darker;
border-radius: 0 3px;
box-sizing: content-box;
}
.thumb-bottom {
position: absolute;
top: 6px;
left: 1px;
width: 10px;
height: 8px;
background-color: #ffffff;
border: solid 1px @gray-darker;
border-top: none;
border-radius: 2px;
box-sizing: content-box;
}
&.active .thumb-bottom {
border-bottom-width: 2px;
} }
} }