diff options
| author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
| commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
| tree | 867f8bdd588c8f9076979233ca46a688ff70523e /js/panels/Materials/materials-popup.reel | |
| parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
| parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
| download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/Materials/materials-popup.reel')
| -rwxr-xr-x | js/panels/Materials/materials-popup.reel/materials-popup.css | 15 | ||||
| -rwxr-xr-x | js/panels/Materials/materials-popup.reel/materials-popup.html | 26 |
2 files changed, 18 insertions, 23 deletions
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.css b/js/panels/Materials/materials-popup.reel/materials-popup.css index 2d339411..943d9bcb 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.css +++ b/js/panels/Materials/materials-popup.reel/materials-popup.css | |||
| @@ -21,15 +21,15 @@ | |||
| 21 | background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.5, #1d1d1d), color-stop(0.75, #424242)); | 21 | background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.5, #1d1d1d), color-stop(0.75, #424242)); |
| 22 | border: none; | 22 | border: none; |
| 23 | height: 2px; | 23 | height: 2px; |
| 24 | margin: 4px 0px 4px 0px; | 24 | margin: 4px 0 4px 0; |
| 25 | } | 25 | } |
| 26 | 26 | ||
| 27 | #mp_title { | 27 | .mp_title { |
| 28 | margin: 4px 0px 0px 0px; | 28 | margin: 4px 0 0 0; |
| 29 | text-align: center; | 29 | text-align: center; |
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | #mp_preview { | 32 | .mp_preview { |
| 33 | height: 100px; | 33 | height: 100px; |
| 34 | text-align: center; | 34 | text-align: center; |
| 35 | } | 35 | } |
| @@ -84,12 +84,17 @@ | |||
| 84 | width: 27px !important; | 84 | width: 27px !important; |
| 85 | height: 27px !important; | 85 | height: 27px !important; |
| 86 | overflow:hidden !important; | 86 | overflow:hidden !important; |
| 87 | margin-top: -6px; | ||
| 88 | } | ||
| 89 | |||
| 90 | .mp_properties_list .mp_property:first-child { | ||
| 91 | margin-bottom: 12px; | ||
| 87 | } | 92 | } |
| 88 | 93 | ||
| 89 | .mp_buttons { | 94 | .mp_buttons { |
| 90 | clear:both; | 95 | clear:both; |
| 91 | float: left; | 96 | float: left; |
| 92 | margin: 0px -4px 0px 4px; | 97 | margin: 0 -4px 4px 4px; |
| 93 | width: 97%; | 98 | width: 97%; |
| 94 | } | 99 | } |
| 95 | 100 | ||
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html index 9fdbc00d..d18599d6 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.html +++ b/js/panels/Materials/materials-popup.reel/materials-popup.html | |||
| @@ -88,29 +88,19 @@ | |||
| 88 | </head> | 88 | </head> |
| 89 | 89 | ||
| 90 | <body> | 90 | <body> |
| 91 | 91 | <div data-montage-id="materials_popup" class="materials_popup"> | |
| 92 | <div id="materials_popup" class="materials_popup"> | 92 | <div data-montage-id="mp_title" class="mp_title">Material Name</div> |
| 93 | <div id="mp_title">Material Name</div> | ||
| 94 | |||
| 95 | <hr /> | 93 | <hr /> |
| 96 | 94 | <div data-montage-id="mp_preview" class="mp_preview">Preview Pane</div> | |
| 97 | <div id="mp_preview">Preview Pane</div> | ||
| 98 | |||
| 99 | <hr /> | 95 | <hr /> |
| 100 | 96 | <div data-montage-id="mp_properties_list" class="mp_properties_list"> | |
| 101 | <div id="mp_properties_list" class="mp_properties_list"> | 97 | <div data-montage-id="mp_property" class="mp_property"></div> |
| 102 | <div id="mp_property" class="mp_property"></div> | ||
| 103 | </div> | 98 | </div> |
| 104 | |||
| 105 | <hr /> | 99 | <hr /> |
| 106 | 100 | <div data-montage-id="mp_buttons" class="mp_buttons"> | |
| 107 | <div id="mp_buttons" class="mp_buttons"> | 101 | <button data-montage-id="mp_cancel_btn" class="mp_cancel_btn nj-skinned"></button> |
| 108 | <button id="mp_cancel_btn" class="mp_cancel_btn nj-skinned"></button> | 102 | <button data-montage-id="mp_ok_btn" class="mp_ok_btn nj-skinned"></button> |
| 109 | <button id="mp_ok_btn" class="mp_ok_btn nj-skinned"></button> | ||
| 110 | </div> | 103 | </div> |
| 111 | |||
| 112 | </div> | 104 | </div> |
| 113 | |||
| 114 | </body> | 105 | </body> |
| 115 | |||
| 116 | </html> \ No newline at end of file | 106 | </html> \ No newline at end of file |