increase slider on mobile. improve look of slider in dark mode
This commit is contained in:
parent
9b89c3b819
commit
4d96fc7cd2
4 changed files with 34 additions and 9 deletions
|
|
@ -5,7 +5,7 @@ Full docs @ https://docs.grid.space/projects/kiri-moto
|
||||||
|
|
||||||
# Release 3.6
|
# Release 3.6
|
||||||
|
|
||||||
* mobile pinch zoom and layer slider improvements
|
* mobile pinch zoom and layer slider usability improvements
|
||||||
* update CLI to work in CAM mode and add working samples
|
* update CLI to work in CAM mode and add working samples
|
||||||
* improved FDM preview rendering speed and reduced memory usage
|
* improved FDM preview rendering speed and reduced memory usage
|
||||||
* threaded task and message passing performance improvements
|
* threaded task and message passing performance improvements
|
||||||
|
|
|
||||||
|
|
@ -2049,11 +2049,18 @@ gapp.register("kiri.init", [], (root, exports) => {
|
||||||
}
|
}
|
||||||
|
|
||||||
// slider setup
|
// slider setup
|
||||||
const slbar = 30;
|
const mobile = moto.space.info.mob;
|
||||||
|
const slbar = mobile ? 80 : 30;
|
||||||
const slbar2 = slbar * 2;
|
const slbar2 = slbar * 2;
|
||||||
const slider = ui.sliderRange;
|
const slider = ui.sliderRange;
|
||||||
const drag = { };
|
const drag = { };
|
||||||
|
|
||||||
|
if (mobile) {
|
||||||
|
ui.slider.classList.add('slider-mobile');
|
||||||
|
ui.sliderLo.classList.add('slider-mobile');
|
||||||
|
ui.sliderHi.classList.add('slider-mobile');
|
||||||
|
}
|
||||||
|
|
||||||
function pxToInt(txt) {
|
function pxToInt(txt) {
|
||||||
return txt ? parseInt(txt.substring(0,txt.length-2)) : 0;
|
return txt ? parseInt(txt.substring(0,txt.length-2)) : 0;
|
||||||
}
|
}
|
||||||
|
|
@ -2081,7 +2088,7 @@ gapp.register("kiri.init", [], (root, exports) => {
|
||||||
drag.hiat = pxToInt(ui.sliderHold.style.marginRight);
|
drag.hiat = pxToInt(ui.sliderHold.style.marginRight);
|
||||||
drag.mdmax = drag.width - slbar - drag.loat;
|
drag.mdmax = drag.width - slbar - drag.loat;
|
||||||
drag.himax = drag.width - slbar - drag.mdat;
|
drag.himax = drag.width - slbar - drag.mdat;
|
||||||
let cancel_drag = tracker.onmouseup = (ev) => {
|
let cancel_drag = tracker.ontouchend = tracker.onmouseup = (ev) => {
|
||||||
if (ev) {
|
if (ev) {
|
||||||
ev.stopPropagation();
|
ev.stopPropagation();
|
||||||
ev.preventDefault();
|
ev.preventDefault();
|
||||||
|
|
|
||||||
|
|
@ -1444,7 +1444,8 @@ gapp.register("moto.space", [], (root, exports) => {
|
||||||
ver: ctx.getParameter(ctx.VERSION),
|
ver: ctx.getParameter(ctx.VERSION),
|
||||||
ven: ctx.getParameter(ctx.VENDOR),
|
ven: ctx.getParameter(ctx.VENDOR),
|
||||||
glr: ctx.getParameter(ctx.RENDERER),
|
glr: ctx.getParameter(ctx.RENDERER),
|
||||||
pla: nav.platform
|
pla: nav.platform,
|
||||||
|
mob: nav.maxTouchPoints > 1 || (/android/i.test(nav.userAgent))
|
||||||
};
|
};
|
||||||
|
|
||||||
initialized = true;
|
initialized = true;
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
--bg-gray: rgba(0,0,0,0.25);
|
--bg-gray: rgba(0,0,0,0.25);
|
||||||
--gradbar: linear-gradient(to right, #ddd, #666, #ddd);
|
--gradbar: linear-gradient(to right, #ddd, #666, #ddd);
|
||||||
--holdbar: linear-gradient(to top, rgba(100,100,100,0.1), rgba(255,255,255,1), rgba(100,100,100,0.1));
|
--holdbar: linear-gradient(to top, rgba(100,100,100,0.1), rgba(255,255,255,1), rgba(100,100,100,0.1));
|
||||||
|
--holdbar-dk: linear-gradient(to top, rgba(100,100,100,0.1), rgba(255,255,255,0.25), rgba(100,100,100,0.1));
|
||||||
--holdbar-sf: linear-gradient(to top, rgba(200,200,200,0.1), rgba(255,255,255,1), rgba(200,200,200,0.1)) !important;
|
--holdbar-sf: linear-gradient(to top, rgba(200,200,200,0.1), rgba(255,255,255,1), rgba(200,200,200,0.1)) !important;
|
||||||
--highlight: rgba(126,153,183,0.4);
|
--highlight: rgba(126,153,183,0.4);
|
||||||
--main-color: rgba(126,153,183,1);
|
--main-color: rgba(126,153,183,1);
|
||||||
|
|
@ -1531,6 +1532,9 @@ th, tr, td, label {
|
||||||
bottom: 3px;
|
bottom: 3px;
|
||||||
pointer-events: all;
|
pointer-events: all;
|
||||||
}
|
}
|
||||||
|
#slider.slider-mobile {
|
||||||
|
height: 40px !important;
|
||||||
|
}
|
||||||
#slider {
|
#slider {
|
||||||
display: none;
|
display: none;
|
||||||
height: 30px;
|
height: 30px;
|
||||||
|
|
@ -1552,15 +1556,16 @@ th, tr, td, label {
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
#slider-max {
|
.dark #slider-center {
|
||||||
background-color: #ccc;
|
background-image: var(--holdbar-dk);
|
||||||
border-top-right-radius: 10px;
|
|
||||||
border-bottom-right-radius: 10px;
|
|
||||||
margin-left: 3px;
|
|
||||||
}
|
}
|
||||||
#slider-center {
|
#slider-center {
|
||||||
background-image: var(--holdbar);
|
background-image: var(--holdbar);
|
||||||
}
|
}
|
||||||
|
.dark #slider-zero, .dark #slider-max {
|
||||||
|
background-color: #555;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
#slider-zero {
|
#slider-zero {
|
||||||
z-index: 10;
|
z-index: 10;
|
||||||
margin-right: 3px;
|
margin-right: 3px;
|
||||||
|
|
@ -1568,6 +1573,15 @@ th, tr, td, label {
|
||||||
border-top-left-radius: 10px;
|
border-top-left-radius: 10px;
|
||||||
border-bottom-left-radius: 10px;
|
border-bottom-left-radius: 10px;
|
||||||
}
|
}
|
||||||
|
#slider-max {
|
||||||
|
background-color: #ccc;
|
||||||
|
border-top-right-radius: 10px;
|
||||||
|
border-bottom-right-radius: 10px;
|
||||||
|
margin-left: 3px;
|
||||||
|
}
|
||||||
|
.dark #slider-hold {
|
||||||
|
background-color: rgba(255,255,255,0.25);
|
||||||
|
}
|
||||||
#slider-hold {
|
#slider-hold {
|
||||||
background-color: rgba(0,0,0,0.15);
|
background-color: rgba(0,0,0,0.15);
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
|
@ -1575,6 +1589,9 @@ th, tr, td, label {
|
||||||
right: 0;
|
right: 0;
|
||||||
top: 0;
|
top: 0;
|
||||||
}
|
}
|
||||||
|
#slider-hold .slider-mobile {
|
||||||
|
width: 40px !important;
|
||||||
|
}
|
||||||
#slider-hold .handle {
|
#slider-hold .handle {
|
||||||
width: 15px;
|
width: 15px;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue