diff options
| author | fabrixxm <fabrix.xm@gmail.com> | 2011-09-05 21:05:24 +0200 |
|---|---|---|
| committer | fabrixxm <fabrix.xm@gmail.com> | 2011-09-05 21:05:24 +0200 |
| commit | 2f5a34ad1791f01cacb3b86c11501f0e11c67df4 (patch) | |
| tree | dd9242b14387c833346f4172e3f190659db56ff7 /view/theme/dispy | |
| parent | 5ec4a4e6deb5d28cbfab54093f8b4180912738d4 (diff) | |
| parent | 08e54234e30c10e3130b7d71caba9fd43e3593e3 (diff) | |
| download | volse-hubzilla-2f5a34ad1791f01cacb3b86c11501f0e11c67df4.tar.gz volse-hubzilla-2f5a34ad1791f01cacb3b86c11501f0e11c67df4.tar.bz2 volse-hubzilla-2f5a34ad1791f01cacb3b86c11501f0e11c67df4.zip | |
Merge branch 'newui' of github.com:fabrixxm/friendika into newui
Diffstat (limited to 'view/theme/dispy')
| -rw-r--r-- | view/theme/dispy/jot-header.tpl | 2 | ||||
| -rw-r--r-- | view/theme/dispy/style.css | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl index 155595056..0093bf82a 100644 --- a/view/theme/dispy/jot-header.tpl +++ b/view/theme/dispy/jot-header.tpl @@ -90,7 +90,7 @@ function initEditor(cb) { } } // initEditor </script> -<script type="text/javascript" src="include/ajaxupload.js" ></script> +<script type="text/javascript" src="js/ajaxupload.js" ></script> <script> var ispublic = '$ispublic'; $(document).ready(function() { diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 78efb57ff..8dc017c9c 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -1211,7 +1211,7 @@ footer { display: block; margin: 50px 20%; clear: both; } float: left; margin: 4px; } -.acl-list-item p { font-size: 10px; margin: 0px; padding: 2px 0px 1px; } +.acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;} .acl-list-item a { font-size: 8px; display: block; |