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 /js/io/ui/cloudpopup.reel/css/cloudpopup.css | |
| 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 'js/io/ui/cloudpopup.reel/css/cloudpopup.css')
| -rw-r--r-- | js/io/ui/cloudpopup.reel/css/cloudpopup.css | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/io/ui/cloudpopup.reel/css/cloudpopup.css b/js/io/ui/cloudpopup.reel/css/cloudpopup.css index 6d804e50..fcf85e75 100644 --- a/js/io/ui/cloudpopup.reel/css/cloudpopup.css +++ b/js/io/ui/cloudpopup.reel/css/cloudpopup.css | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | .cloud_popup .content .btn_test { | 43 | .cloud_popup .content .btn_test { |
| 44 | float: right; | 44 | float: right; |
| 45 | clear: right; | 45 | clear: right; |
| 46 | margin: 0px 0px 0px 8px; | 46 | margin: 1px 2px 0px 8px; |
| 47 | width: 60px; | 47 | width: 60px; |
| 48 | } | 48 | } |
| 49 | 49 | ||
| @@ -94,5 +94,5 @@ | |||
| 94 | width: 80px; | 94 | width: 80px; |
| 95 | text-align: center; | 95 | text-align: center; |
| 96 | float: right; | 96 | float: right; |
| 97 | margin: 8px 0px 0px 8px; | 97 | margin: 8px 2px 2px 8px; |
| 98 | } | 98 | } |