library-mirrors/dat.gui
1
0
Fork 0
mirror of https://github.com/dataarts/dat.gui.git synced 2024-12-12 04:08:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed an issue with colors based on arrays where the colored tab in the UI was black instead of matching the current color.

Browse Source
This commit is contained in:
Kevin Barabash 2014-10-16 20:18:42 -06:00
parent fc6ec04c48
commit 14cca9bd26
4 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build/dat.gui.js
View File

File diff suppressed because one or more lines are too long

4
src/dat/gui/GUI.js
View File

@ -834,7 +834,11 @@ define([
var li = addRow(gui, container, params.before); var li = addRow(gui, container, params.before);
dom.addClass(li, GUI.CLASS_CONTROLLER_ROW); dom.addClass(li, GUI.CLASS_CONTROLLER_ROW);
if (controller instanceof ColorController) {
dom.addClass(li, "color");
} else {
dom.addClass(li, typeof controller.getValue()); dom.addClass(li, typeof controller.getValue());
}
augmentController(gui, li, controller); augmentController(gui, li, controller);

2
src/dat/gui/style.css
View File

@ -249,6 +249,8 @@
background-image: url(data:image/gif;base64,R0lGODlhBQAFAJEAAP////Pz8////////yH5BAEAAAIALAAAAAAFAAUAAAIIlGIWqMCbWAEAOw==); } background-image: url(data:image/gif;base64,R0lGODlhBQAFAJEAAP////Pz8////////yH5BAEAAAIALAAAAAAFAAUAAAIIlGIWqMCbWAEAOw==); }
.dg .cr.boolean { .dg .cr.boolean {
border-left: 3px solid #806787; } border-left: 3px solid #806787; }
.dg .cr.color {
border-left: 3px solid; }
.dg .cr.function { .dg .cr.function {
border-left: 3px solid #e61d5f; } border-left: 3px solid #e61d5f; }
.dg .cr.number { .dg .cr.number {

4
src/dat/gui/style.scss
View File

@ -135,6 +135,10 @@ $input-color: lighten($background-color, 8.5%);
border-left: 3px solid $boolean-color; border-left: 3px solid $boolean-color;
} }
&.color {
border-left: 3px solid;
}
&.function { &.function {
border-left: 3px solid $function-color; border-left: 3px solid $function-color;
} }