diff options
| author | Ananya Sen | 2012-02-03 09:57:41 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-03 09:57:41 -0800 |
| commit | c093dd13a84ce6eb3e00a672c38a808093c5d966 (patch) | |
| tree | 5dfd4a800bbbe02a8cbcb3ffeee542686bc258bb /node_modules/montage/ui/popup/popup.reel/popup.html | |
| parent | 79b0173eeca079dec42ff1480182656dbe3af44f (diff) | |
| parent | 8e06b63e5eab5558823f4923e20a832c8b36cbe2 (diff) | |
| download | ninja-c093dd13a84ce6eb3e00a672c38a808093c5d966.tar.gz | |
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Conflicts:
js/io/document/document-controller.js
js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
js/io/ui/save-as-dialog.reel/save-as-dialog.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/popup/popup.reel/popup.html')
| -rwxr-xr-x | node_modules/montage/ui/popup/popup.reel/popup.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage/ui/popup/popup.reel/popup.html b/node_modules/montage/ui/popup/popup.reel/popup.html index 69bf075c..9948b868 100755 --- a/node_modules/montage/ui/popup/popup.reel/popup.html +++ b/node_modules/montage/ui/popup/popup.reel/popup.html | |||
| @@ -42,7 +42,7 @@ | |||
| 42 | 42 | ||
| 43 | </head> | 43 | </head> |
| 44 | <body> | 44 | <body> |
| 45 | <div id="popup-container" class="montage-hide montage-popup-container"> | 45 | <div id="popup-container" class="montage-invisible montage-popup-container"> |
| 46 | <div id="popup-wrapper" class="montage-popup-tooltip montage-popup-wrapper montage-popup-border"> | 46 | <div id="popup-wrapper" class="montage-popup-tooltip montage-popup-wrapper montage-popup-border"> |
| 47 | <div id="popup-content" class="montage-popup-content"></div> | 47 | <div id="popup-content" class="montage-popup-content"></div> |
| 48 | </div> | 48 | </div> |