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 /js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html | |
| 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 'js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html')
| -rwxr-xr-x | js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html index a65fd32f..28876d29 100755 --- a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html +++ b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!doctype html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
| 4 | All Rights Reserved. | 4 | All Rights Reserved. |
| @@ -30,9 +30,9 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 30 | </copyright> --> | 30 | </copyright> --> |
| 31 | <html> | 31 | <html> |
| 32 | <head> | 32 | <head> |
| 33 | <meta http-equiv="Content-type" content="text/html; charset=utf-8"> | 33 | <meta http-equiv="Content-type" content="text/html; charset=utf-8"> |
| 34 | <title>ComputedStyleSubPanel</title> | 34 | <title>ComputedStyleSubPanel</title> |
| 35 | <link href="computed-style-sub-panel.css" type="text/css" rel="stylesheet"> | 35 | <link href="computed-style-sub-panel.css" type="text/css" rel="stylesheet"> |
| 36 | <script type="text/montage-serialization"> | 36 | <script type="text/montage-serialization"> |
| 37 | { | 37 | { |
| 38 | "owner": { | 38 | "owner": { |
| @@ -45,27 +45,27 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 45 | } | 45 | } |
| 46 | } | 46 | } |
| 47 | 47 | ||
| 48 | } | 48 | } |
| 49 | </script> | 49 | </script> |
| 50 | 50 | ||
| 51 | </head> | 51 | </head> |
| 52 | <body> | 52 | <body> |
| 53 | <div data-montage-id="nj-css-panel-computed" class="nj-css-panel-computed"> | 53 | <div data-montage-id="nj-css-panel-computed" class="nj-css-panel-computed"> |
| 54 | <div data-montage-id="nj-css-filter-panel" class="nj-css-filter-panel"> | 54 | <div data-montage-id="nj-css-filter-panel" class="nj-css-filter-panel"> |
| 55 | <input data-montage-id="nj-css-filter" class="nj-skinned nj-css-filter-input" type="search"> | 55 | <input data-montage-id="nj-css-filter" class="nj-skinned nj-css-filter-input" type="search"> |
| 56 | <select data-montage-id="nj-css-group-select" class="nj-skinned nj-css-group-select"> | 56 | <select data-montage-id="nj-css-group-select" class="nj-skinned nj-css-group-select"> |
| 57 | <option value="all">All</option> | 57 | <option value="all">All</option> |
| 58 | <option value="summary" selected>Summary</option> | 58 | <option value="summary" selected>Summary</option> |
| 59 | <option value="background">Background</option> | 59 | <option value="background">Background</option> |
| 60 | <option value="dimensions">Dimensions</option> | 60 | <option value="dimensions">Dimensions</option> |
| 61 | <option value="border">Border</option> | 61 | <option value="border">Border</option> |
| 62 | <option value="font">Font</option> | 62 | <option value="font">Font</option> |
| 63 | <option value="layout">Layout</option> | 63 | <option value="layout">Layout</option> |
| 64 | </select> | 64 | </select> |
| 65 | </div> | 65 | </div> |
| 66 | <div class="nj-sub-panel"> | 66 | <div class="nj-sub-panel"> |
| 67 | <dl data-montage-id="nj-css-computed-list" class="nj-css-style-list nj-css-computed-list"></dl> | 67 | <dl data-montage-id="nj-css-computed-list" class="nj-css-style-list nj-css-computed-list"></dl> |
| 68 | </div> | 68 | </div> |
| 69 | </div> | 69 | </div> |
| 70 | </body> | 70 | </body> |
| 71 | </html> | 71 | </html> |