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/presets/content.reel/content.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/presets/content.reel/content.css')
| -rw-r--r-- | js/panels/presets/content.reel/content.css | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/js/panels/presets/content.reel/content.css b/js/panels/presets/content.reel/content.css index c0ccbad4..409e1960 100644 --- a/js/panels/presets/content.reel/content.css +++ b/js/panels/presets/content.reel/content.css | |||
| @@ -10,9 +10,7 @@ | |||
| 10 | -webkit-box-orient: vertical; | 10 | -webkit-box-orient: vertical; |
| 11 | -webkit-box-flex: 1; | 11 | -webkit-box-flex: 1; |
| 12 | } | 12 | } |
| 13 | .presetsPanel .treeRoot { | 13 | |
| 14 | margin: 0 8px; | ||
| 15 | } | ||
| 16 | .tab-bar { | 14 | .tab-bar { |
| 17 | -webkit-box-flex: 0; | 15 | -webkit-box-flex: 0; |
| 18 | background-color: #282828; | 16 | background-color: #282828; |