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

Merge remote-tracking branch 'kevinb7/master'

Browse Source
This commit is contained in:
Tomas Korcak 2015-08-14 15:42:50 +02:00
commit 9847b3faa7
6 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -41,6 +41,7 @@ This will create a namespaced, unminified build of dat.GUI at `build/dat.gui.mai
### 0.6.0 ### 0.6.0
* Using common.js * Using common.js
* Using webpack for build * Using webpack for build
* Fixed an issue with colors based on arrays - https://github.com/dataarts/dat.gui/pull/57
### 0.5 ### 0.5
* Moved to requirejs for dependency management. * Moved to requirejs for dependency management.

6
build/dat.gui.js
View File

File diff suppressed because one or more lines are too long

4
build/dat.gui.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -825,7 +825,11 @@ function add(gui, object, property, params) {
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;
} }