diff options
| author | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
| commit | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch) | |
| tree | 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /scss/imports/themes/_test.scss | |
| parent | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff) | |
| parent | 40c6eb2c06b34f65a74d59ef9687251952858bab (diff) | |
| download | ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz | |
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts:
js/components/gradientpicker.reel/gradientpicker.js
js/components/tools-properties/text-properties.reel/text-properties.js
js/document/views/base.js
js/document/views/design.js
js/helper-classes/3D/StageLine.js
js/helper-classes/3D/draw-utils.js
js/lib/drawing/world.js
js/lib/geom/circle.js
js/lib/geom/line.js
js/lib/geom/rectangle.js
js/lib/geom/shape-primitive.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/flag-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/water-material.js
js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
js/panels/Materials/materials-popup.reel/materials-popup.html
js/panels/Materials/materials-popup.reel/materials-popup.js
js/tools/LineTool.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'scss/imports/themes/_test.scss')
| -rwxr-xr-x | scss/imports/themes/_test.scss | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scss/imports/themes/_test.scss b/scss/imports/themes/_test.scss index 0767c300..4e8b914a 100755 --- a/scss/imports/themes/_test.scss +++ b/scss/imports/themes/_test.scss | |||
| @@ -39,13 +39,13 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 39 | } | 39 | } |
| 40 | 40 | ||
| 41 | .docAreaBackground { | 41 | .docAreaBackground { |
| 42 | color: black; | 42 | color: black; |
| 43 | background: black; | 43 | background: black; |
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | .mainStageBackground { | 46 | .mainStageBackground { |
| 47 | color: white; | 47 | color: white; |
| 48 | background: gray; | 48 | background: gray; |
| 49 | } | 49 | } |
| 50 | 50 | ||
| 51 | .stageContentShadow { | 51 | .stageContentShadow { |
| @@ -55,9 +55,9 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | .panelBackground { | 57 | .panelBackground { |
| 58 | color: white; | 58 | color: white; |
| 59 | /*border: solid 1px #333;*/ | 59 | /*border: solid 1px #333;*/ |
| 60 | background: rgba(41,41,41,1); | 60 | background: rgba(41,41,41,1); |
| 61 | } | 61 | } |
| 62 | 62 | ||
| 63 | .panelCollapseControlBackground { | 63 | .panelCollapseControlBackground { |