Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 21:30:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12241 from 1P-Cusack/FogBugz/Case_4315_okbutton

Browse source 
[Case 4315] Edit menu color picker OK button is hard to use in HMD
This commit is contained in:
Melissa Brown 2018-02-01 16:52:07 -08:00 committed by GitHub
commit bf5b875382
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
scripts/system/html/css/colpick.css
View file

@ -26,6 +26,7 @@ colpick Color Picker / colpick.com
/*Color selection box with gradients*/
.colpick_color {
position: absolute;
touch-action: none;
left: 7px;
top: 7px;
width: 156px;
@ -84,6 +85,7 @@ colpick Color Picker / colpick.com
/*Vertical hue bar*/
.colpick_hue {
position: absolute;
touch-action: none;
top: 6px;
left: 175px;
width: 19px;
@ -94,6 +96,7 @@ colpick Color Picker / colpick.com
/*Hue bar sliding indicator*/
.colpick_hue_arrs {
position: absolute;
touch-action: none;
left: -8px;
width: 35px;
height: 7px;
@ -101,6 +104,7 @@ colpick Color Picker / colpick.com
}
.colpick_hue_larr {
position:absolute;
touch-action: none;
width: 0;
height: 0;
border-top: 6px solid transparent;
@ -109,6 +113,7 @@ colpick Color Picker / colpick.com
}
.colpick_hue_rarr {
position:absolute;
touch-action: none;
right:0;
width: 0;
height: 0;
@ -119,6 +124,7 @@ colpick Color Picker / colpick.com
/*New color box*/
.colpick_new_color {
position: absolute;
touch-action: none;
left: 207px;
top: 6px;
width: 60px;
@ -129,6 +135,7 @@ colpick Color Picker / colpick.com
/*Current color box*/
.colpick_current_color {
position: absolute;
touch-action: none;
left: 277px;
top: 6px;
width: 60px;
@ -139,6 +146,7 @@ colpick Color Picker / colpick.com
/*Input field containers*/
.colpick_field, .colpick_hex_field {
position: absolute;
touch-action: none;
height: 20px;
width: 60px;
overflow:hidden;
@ -198,6 +206,7 @@ colpick Color Picker / colpick.com
/*Text inputs*/
.colpick_field input, .colpick_hex_field input {
position: absolute;
touch-action: none;
right: 11px;
margin: 0;
padding: 0;
@ -217,6 +226,7 @@ colpick Color Picker / colpick.com
/*Field up/down arrows*/
.colpick_field_arrs {
position: absolute;
touch-action: none;
top: 0;
right: 0;
width: 9px;
@ -225,6 +235,7 @@ colpick Color Picker / colpick.com
}
.colpick_field_uarr {
position: absolute;
touch-action: none;
top: 5px;
width: 0;
height: 0;
@ -234,6 +245,7 @@ colpick Color Picker / colpick.com
}
.colpick_field_darr {
position: absolute;
touch-action: none;
bottom:5px;
width: 0;
height: 0;
@ -244,6 +256,7 @@ colpick Color Picker / colpick.com
/*Submit/Select button*/
.colpick_submit {
position: absolute;
touch-action: none;
left: 207px;
top: 149px;
width: 130px;

32
scripts/system/html/js/entityProperties.js
View file

@ -1308,15 +1308,15 @@ function loaded() {
colorScheme: 'dark',
layout: 'hex',
color: '000000',
submit: false, // We don't want to have a submission button
onShow: function(colpick) {
$('#property-color-control2').attr('active', 'true');
},
onHide: function(colpick) {
$('#property-color-control2').attr('active', 'false');
},
onSubmit: function(hsb, hex, rgb, el) {
onChange: function(hsb, hex, rgb, el) {
$(el).css('background-color', '#' + hex);
$(el).colpickHide();
emitColorPropertyUpdate('color', rgb.r, rgb.g, rgb.b);
}
}));
@ -1332,15 +1332,15 @@ function loaded() {
colorScheme: 'dark',
layout: 'hex',
color: '000000',
submit: false, // We don't want to have a submission button
onShow: function(colpick) {
$('#property-light-color').attr('active', 'true');
},
onHide: function(colpick) {
$('#property-light-color').attr('active', 'false');
},
onSubmit: function(hsb, hex, rgb, el) {
onChange: function(hsb, hex, rgb, el) {
$(el).css('background-color', '#' + hex);
$(el).colpickHide();
emitColorPropertyUpdate('color', rgb.r, rgb.g, rgb.b);
}
}));
@ -1387,15 +1387,15 @@ function loaded() {
colorScheme: 'dark',
layout: 'hex',
color: '000000',
submit: false, // We don't want to have a submission button
onShow: function(colpick) {
$('#property-text-text-color').attr('active', 'true');
},
onHide: function(colpick) {
$('#property-text-text-color').attr('active', 'false');
},
onSubmit: function(hsb, hex, rgb, el) {
onChange: function(hsb, hex, rgb, el) {
$(el).css('background-color', '#' + hex);
$(el).colpickHide();
$(el).attr('active', 'false');
emitColorPropertyUpdate('textColor', rgb.r, rgb.g, rgb.b);
}
@ -1411,15 +1411,15 @@ function loaded() {
colorScheme: 'dark',
layout: 'hex',
color: '000000',
submit: false, // We don't want to have a submission button
onShow: function(colpick) {
$('#property-text-background-color').attr('active', 'true');
},
onHide: function(colpick) {
$('#property-text-background-color').attr('active', 'false');
},
onSubmit: function(hsb, hex, rgb, el) {
onChange: function(hsb, hex, rgb, el) {
$(el).css('background-color', '#' + hex);
$(el).colpickHide();
emitColorPropertyUpdate('backgroundColor', rgb.r, rgb.g, rgb.b);
}
}));
@ -1436,15 +1436,15 @@ function loaded() {
colorScheme: 'dark',
layout: 'hex',
color: '000000',
submit: false, // We don't want to have a submission button
onShow: function(colpick) {
$('#property-zone-key-light-color').attr('active', 'true');
},
onHide: function(colpick) {
$('#property-zone-key-light-color').attr('active', 'false');
},
onSubmit: function(hsb, hex, rgb, el) {
onChange: function(hsb, hex, rgb, el) {
$(el).css('background-color', '#' + hex);
$(el).colpickHide();
emitColorPropertyUpdate('color', rgb.r, rgb.g, rgb.b, 'keyLight');
}
}));
@ -1505,15 +1505,15 @@ function loaded() {
colorScheme: 'dark',
layout: 'hex',
color: '000000',
submit: false, // We don't want to have a submission button
onShow: function(colpick) {
$('#property-zone-haze-color').attr('active', 'true');
},
onHide: function(colpick) {
$('#property-zone-haze-color').attr('active', 'false');
},
onSubmit: function(hsb, hex, rgb, el) {
onChange: function(hsb, hex, rgb, el) {
$(el).css('background-color', '#' + hex);
$(el).colpickHide();
emitColorPropertyUpdate('hazeColor', rgb.r, rgb.g, rgb.b, 'haze');
}
}));
@ -1530,15 +1530,15 @@ function loaded() {
colorScheme: 'dark',
layout: 'hex',
color: '000000',
submit: false, // We don't want to have a submission button
onShow: function(colpick) {
$('#property-zone-haze-glare-color').attr('active', 'true');
},
onHide: function(colpick) {
$('#property-zone-haze-glare-color').attr('active', 'false');
},
onSubmit: function(hsb, hex, rgb, el) {
onChange: function(hsb, hex, rgb, el) {
$(el).css('background-color', '#' + hex);
$(el).colpickHide();
emitColorPropertyUpdate('hazeGlareColor', rgb.r, rgb.g, rgb.b, 'haze');
}
}));
@ -1572,15 +1572,15 @@ function loaded() {
colorScheme: 'dark',
layout: 'hex',
color: '000000',
submit: false, // We don't want to have a submission button
onShow: function(colpick) {
$('#property-zone-skybox-color').attr('active', 'true');
},
onHide: function(colpick) {
$('#property-zone-skybox-color').attr('active', 'false');
},
onSubmit: function(hsb, hex, rgb, el) {
onChange: function(hsb, hex, rgb, el) {
$(el).css('background-color', '#' + hex);
$(el).colpickHide();
emitColorPropertyUpdate('color', rgb.r, rgb.g, rgb.b, 'skybox');
}
}));