Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
web-apps
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
web-apps
Commits
4ce4fdae
Commit
4ce4fdae
authored
Mar 17, 2017
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Bug 20029.
parent
d4cc54c1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
4 deletions
+40
-4
apps/common/main/lib/component/MultiSliderGradient.js
apps/common/main/lib/component/MultiSliderGradient.js
+6
-1
apps/common/main/resources/less/multislider-gradient.less
apps/common/main/resources/less/multislider-gradient.less
+34
-3
No files found.
apps/common/main/lib/component/MultiSliderGradient.js
View file @
4ce4fdae
...
...
@@ -63,7 +63,10 @@ define([
'
<div class="slider multi-slider-gradient">
'
,
'
<div class="track"></div>
'
,
'
<% _.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>
'
].
join
(
''
)),
...
...
@@ -98,6 +101,7 @@ define([
me
.
thumbs
[
i
].
thumb
.
on
(
'
dblclick
'
,
null
,
function
()
{
me
.
trigger
(
'
thumbdblclick
'
,
me
);
});
me
.
thumbs
[
i
].
thumbcolor
=
me
.
thumbs
[
i
].
thumb
.
find
(
'
> div
'
);
}
if
(
me
.
styleStr
!==
''
)
{
...
...
@@ -118,6 +122,7 @@ define([
setColorValue
:
function
(
color
,
index
)
{
var
ind
=
(
index
!==
undefined
)
?
index
:
this
.
currentThumb
;
this
.
colorValues
[
ind
]
=
color
;
this
.
thumbs
[
ind
].
thumbcolor
.
css
(
'
background-color
'
,
color
);
this
.
changeGradientStyle
();
},
...
...
apps/common/main/resources/less/multislider-gradient.less
View file @
4ce4fdae
...
...
@@ -4,10 +4,41 @@
.thumb {
top: 18px;
background
-position: @multislide-thumb-offset-x @multislide-thumb-offset-y
;
background
: none
;
&.active {
background-position: @multislide-thumb-offset-x @multislide-thumb-offset-y - 30px;
.thumb-top {
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;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment