diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-02-02 17:30:54 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-02-02 17:30:54 +0100 |
| commit | 7b9fb84fe9aa15c95bc6010e504761b6c737baa2 (patch) | |
| tree | 8fad5ee7fcd93c8a80c9377d9ae53a6d9bc89a0a /files | |
| parent | d514b1d92d7dad93ddb640829e4598fb6f49fa84 (diff) | |
| parent | f1982965769ac30f00bb36ab3c672815d1a0d09b (diff) | |
| download | nextcloud-server-7b9fb84fe9aa15c95bc6010e504761b6c737baa2.tar.gz nextcloud-server-7b9fb84fe9aa15c95bc6010e504761b6c737baa2.zip | |
Merge branch 'master' into filesystem
Diffstat (limited to 'files')
| -rw-r--r-- | files/css/files.css | 3 | ||||
| -rw-r--r-- | files/templates/index.php | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/files/css/files.css b/files/css/files.css index 5238c6a7f7b..512e462cb6f 100644 --- a/files/css/files.css +++ b/files/css/files.css @@ -27,7 +27,8 @@ .file_upload_start { opacity:0; filter:alpha(opacity=0); z-index:1; position:absolute; left:0; top:0; width:100%; cursor:pointer;} .file_upload_filename.active { border-bottom-right-radius:0 } -.file_upload_filename { z-index:100; cursor:pointer; border-top-left-radius:0; border-bottom-left-radius:0; padding:.3em; } +.file_upload_filename { position: relative; z-index:100; padding-left: 0.8em; padding-right: 0.8em; cursor:pointer; border-top-left-radius:0; border-bottom-left-radius:0; } +.file_upload_filename img { position: absolute; top: 0.4em; left: 0.4em; } .file_upload_form, .file_upload_wrapper, .file_upload_start, .file_upload_filename, #file_upload_submit { cursor:pointer; } diff --git a/files/templates/index.php b/files/templates/index.php index fa4643de75a..7e9505dec2f 100644 --- a/files/templates/index.php +++ b/files/templates/index.php @@ -3,13 +3,10 @@ <?php if (!isset($_['readonly']) || !$_['readonly']):?> <div class="actions"> <div id='new' class='button'> - <a> - <?php echo $l->t('New');?> - </a> + <a><?php echo $l->t('New');?></a> <ul class="popup popupTop"> <li style="background-image:url('<?php echo mimetype_icon('text/plain') ?>')" data-type='file'><p><?php echo $l->t('Text file');?></p></li> <li style="background-image:url('<?php echo mimetype_icon('dir') ?>')" data-type='folder'><p><?php echo $l->t('Folder');?></p></li> - <!-- <li style="background-image:url('<?php echo mimetype_icon('dir') ?>')" data-type='web'><p><?php echo $l->t('From the web');?></p></li> --> </ul> </div> <div class="file_upload_wrapper svg"> @@ -17,7 +14,7 @@ <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload"> <input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)"> <input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir"> - <button class="file_upload_filename"><img class='svg action' alt="Upload" src="<?php echo image_path("core", "actions/upload.svg"); ?>" /></button> + <button class="file_upload_filename"> <img class='svg action' alt="Upload" src="<?php echo image_path("core", "actions/upload.svg"); ?>" /></button> <input class="file_upload_start" type="file" name='files[]'/> <a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo $l->t('Upload'); echo ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a> <iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe> |