Skip to content

Commit

Permalink
doc fixes for html opacity and shader code
Browse files Browse the repository at this point in the history
  • Loading branch information
unconed committed Oct 6, 2015
1 parent b1c0bc3 commit 83fe9d4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docs/intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ For example, a 2D rectangular view containing an array of points, drawn as a con

![MathBox](http://acko.net/files/mathbox2/graph.png)

[Download MathBox](http://acko.net/files/mathbox2/mathbox-0.0.3.zip) (ZIP). See [README](/unconed/mathbox) for more info.
[Download MathBox](http://acko.net/files/mathbox2/mathbox-0.0.3.zip) (ZIP). See [README](/README.md) for more info.

*Note: Open `examples/empty.html` in your text editor and browser to follow along. You can also use the [JSBin](http://jsbin.com/hasuhaw/edit?html,output), but you'll want to turn off "Auto-run" in the top right.*

Expand Down
4 changes: 2 additions & 2 deletions docs/primitives.md
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@
* *html* = `"<"` (select) - HTML data source
* *id* = `null` (nullable string) - Unique ID, e.g. `sampler`
* *offset* = `[0, -20]` (vec2) - 2D offset
* *opacity* = `undefined` (1) - Opacity
* *opacity* = `1` (positive number) - Opacity
* *outline* = `2` (number) - Outline size
* *pointerEvents* = `false` (bool) - Allow pointer events
* *points* = `"<"` (select) - Points data source
Expand Down Expand Up @@ -821,7 +821,7 @@
*Custom shader snippet*

* *classes* = `[]` (string array) - Custom classes, e.g. `["big"]`
* *code* = `` (string) - Shader code
* *code* = `""` (string) - Shader code
* *id* = `null` (nullable string) - Unique ID, e.g. `sampler`
* *language* = `"glsl"` (string) - Shader language
* *sources* = `null` (nullable select) - Sampler sources, e.g. `["#pressure", "#divergence"]`
Expand Down
4 changes: 2 additions & 2 deletions src/docs/traits.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ Traits =
background: ["Outline background", "color", '"rgb(255, 255, 255)"']

overlay:
opacity: ["Opacity", 1]
opacity: ["Opacity", "positive number", 1]
zIndex: ["Z-Index (2D stacking)", "positive int", "0"]
dom:
points: ["Points data source", "select", '"<"']
Expand All @@ -216,7 +216,7 @@ Traits =
shader:
sources: ["Sampler sources", "nullable select", null, '["#pressure", "#divergence"]']
language: ["Shader language", "string", '"glsl"']
code: ["Shader code", "string", ""]
code: ["Shader code", "string", '""']
uniforms: ["Shader uniform objects (three.js style)", "nullable object", null, "{ time: { type: 'f', value: 3 }}"]
include:
shader: ["Shader to use", "select", '"<"']
Expand Down

0 comments on commit 83fe9d4

Please sign in to comment.