diff options
| author | John Mayhew | 2012-04-02 16:28:39 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-04-02 16:28:39 -0700 |
| commit | b4155fb4c33675a8a7cd37473513718043fdf0ba (patch) | |
| tree | 3d8c802473f2395d53d599ec9d8b70b60a4db50c /js/panels/Materials/materials-library-panel.reel/materials-library-panel.css | |
| parent | 5ba9aeac94c86049423fd5d4b37b277263939c13 (diff) | |
| parent | c6de22bf42be90b403491b5f87b1818d9020310c (diff) | |
| download | ninja-b4155fb4c33675a8a7cd37473513718043fdf0ba.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/helper-classes/RDGE/rdge-compiled.js
js/helper-classes/RDGE/runtime/GLRuntime.js
js/helper-classes/RDGE/src/core/script/MeshManager.js
js/helper-classes/RDGE/src/core/script/engine.js
js/helper-classes/RDGE/src/core/script/fx/ssao.js
js/helper-classes/RDGE/src/core/script/init_state.js
js/helper-classes/RDGE/src/core/script/run_state.js
js/helper-classes/RDGE/src/core/script/scenegraphNodes.js
js/helper-classes/RDGE/src/core/script/utilities.js
js/helper-classes/RDGE/src/tools/compile-rdge-core.bat
js/helper-classes/RDGE/src/tools/compile-rdge-core.sh
js/helper-classes/RDGE/src/tools/rdge-compiled.js
js/lib/drawing/world.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/deform-material.js
js/lib/rdge/materials/flat-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/linear-gradient-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-blur-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/relief-tunnel-material.js
js/lib/rdge/materials/square-tunnel-material.js
js/lib/rdge/materials/star-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/tunnel-material.js
js/lib/rdge/materials/twist-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/uber-material.js
js/lib/rdge/materials/water-material.js
js/lib/rdge/materials/z-invert-material.js
js/preloader/Preloader.js
Diffstat (limited to 'js/panels/Materials/materials-library-panel.reel/materials-library-panel.css')
| -rwxr-xr-x | js/panels/Materials/materials-library-panel.reel/materials-library-panel.css | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css index 07488da1..fe88ebf6 100755 --- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css +++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | width: 97%; | 23 | width: 97%; |
| 24 | } | 24 | } |
| 25 | 25 | ||
| 26 | #ml_buttons button { | 26 | #ml_buttons .nj-skinned{ |
| 27 | height: 22px; | 27 | height: 22px; |
| 28 | overflow: hidden; | 28 | overflow: hidden; |
| 29 | display: block; | 29 | display: block; |
| @@ -31,17 +31,17 @@ | |||
| 31 | margin: 0px 1px; | 31 | margin: 0px 1px; |
| 32 | } | 32 | } |
| 33 | 33 | ||
| 34 | #materialsLibraryPanel-ml_add_btn { | 34 | #ml_add_btn { |
| 35 | float: left; | 35 | float: left; |
| 36 | width: 60px; | 36 | width: 60px; |
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | #materialsLibraryPanel-ml_copy_btn { | 39 | #ml_copy_btn { |
| 40 | float: left; | 40 | float: left; |
| 41 | width: 60px; | 41 | width: 60px; |
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | #materialsLibraryPanel-ml_delete_btn { | 44 | #ml_delete_btn { |
| 45 | float: right; | 45 | float: right; |
| 46 | width: 60px; | 46 | width: 60px; |
| 47 | } \ No newline at end of file | 47 | } \ No newline at end of file |