mirror of
https://github.com/dataarts/dat.gui.git
synced 2024-12-12 04:08:27 +00:00
Merge remote-tracking branch 'kevinb7/master'
This commit is contained in:
commit
9847b3faa7
@ -41,6 +41,7 @@ This will create a namespaced, unminified build of dat.GUI at `build/dat.gui.mai
|
||||
### 0.6.0
|
||||
* Using common.js
|
||||
* Using webpack for build
|
||||
* Fixed an issue with colors based on arrays - https://github.com/dataarts/dat.gui/pull/57
|
||||
|
||||
### 0.5
|
||||
* Moved to requirejs for dependency management.
|
||||
|
File diff suppressed because one or more lines are too long
4
build/dat.gui.min.js
vendored
4
build/dat.gui.min.js
vendored
File diff suppressed because one or more lines are too long
@ -825,7 +825,11 @@ function add(gui, object, property, params) {
|
||||
var li = addRow(gui, container, params.before);
|
||||
|
||||
dom.addClass(li, GUI.CLASS_CONTROLLER_ROW);
|
||||
dom.addClass(li, typeof controller.getValue());
|
||||
if (controller instanceof ColorController) {
|
||||
dom.addClass(li, "color");
|
||||
} else {
|
||||
dom.addClass(li, typeof controller.getValue());
|
||||
}
|
||||
|
||||
augmentController(gui, li, controller);
|
||||
|
||||
|
@ -249,6 +249,8 @@
|
||||
background-image: url(data:image/gif;base64,R0lGODlhBQAFAJEAAP////Pz8////////yH5BAEAAAIALAAAAAAFAAUAAAIIlGIWqMCbWAEAOw==); }
|
||||
.dg .cr.boolean {
|
||||
border-left: 3px solid #806787; }
|
||||
.dg .cr.color {
|
||||
border-left: 3px solid; }
|
||||
.dg .cr.function {
|
||||
border-left: 3px solid #e61d5f; }
|
||||
.dg .cr.number {
|
||||
|
@ -135,6 +135,10 @@ $input-color: lighten($background-color, 8.5%);
|
||||
border-left: 3px solid $boolean-color;
|
||||
}
|
||||
|
||||
&.color {
|
||||
border-left: 3px solid;
|
||||
}
|
||||
|
||||
&.function {
|
||||
border-left: 3px solid $function-color;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user