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.scss | |
| 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.scss')
| -rwxr-xr-x | js/io/ui/cloudpopup.reel/css/cloudpopup.scss | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/io/ui/cloudpopup.reel/css/cloudpopup.scss b/js/io/ui/cloudpopup.reel/css/cloudpopup.scss index 5137beff..b8c9f880 100755 --- a/js/io/ui/cloudpopup.reel/css/cloudpopup.scss +++ b/js/io/ui/cloudpopup.reel/css/cloudpopup.scss | |||
| @@ -47,7 +47,7 @@ $grey_light: #494949; | |||
| 47 | { | 47 | { |
| 48 | float: right; | 48 | float: right; |
| 49 | clear: right; | 49 | clear: right; |
| 50 | margin: 0px 0px 0px 8px; | 50 | margin: 1px 2px 0px 8px; |
| 51 | width: 60px; | 51 | width: 60px; |
| 52 | } | 52 | } |
| 53 | 53 | ||
| @@ -98,5 +98,5 @@ $grey_light: #494949; | |||
| 98 | width: 80px; | 98 | width: 80px; |
| 99 | text-align: center; | 99 | text-align: center; |
| 100 | float: right; | 100 | float: right; |
| 101 | margin: 8px 0px 0px 8px; | 101 | margin: 8px 2px 2px 8px; |
| 102 | } \ No newline at end of file | 102 | } \ No newline at end of file |