diff options
| author | icewind1991 <robin@icewind.nl> | 2014-02-21 16:18:43 +0100 |
|---|---|---|
| committer | icewind1991 <robin@icewind.nl> | 2014-02-21 16:18:43 +0100 |
| commit | 9b9b2255b652545784105c4d72cd89af66fa2582 (patch) | |
| tree | 197d6a4fe27c03d9ee41a442ace4ba12c1e21f6d /apps | |
| parent | fa7fa4a6d32e2e9fb6731a7b2db2736ba769fd9b (diff) | |
| parent | 6f56fd99a65253c638eaaefa064634d372e3c8bf (diff) | |
| download | nextcloud-server-9b9b2255b652545784105c4d72cd89af66fa2582.tar.gz nextcloud-server-9b9b2255b652545784105c4d72cd89af66fa2582.zip | |
Merge pull request #7355 from owncloud/new-menu-svg
Use SVG icons in New file menu
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/css/files.css | 24 | ||||
| -rw-r--r-- | apps/files/templates/index.php | 17 |
2 files changed, 28 insertions, 13 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 3ad167054c2..af863aca33e 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -20,7 +20,7 @@ padding: 10px; font-weight: normal; } -#new>a { +#new > a { padding: 14px 10px; position: relative; top: 7px; @@ -30,7 +30,7 @@ border-bottom-right-radius: 0; border-bottom: none; } -#new>ul { +#new > ul { display: none; position: fixed; min-width: 112px; @@ -39,16 +39,26 @@ padding-bottom: 0; margin-top: 14px; margin-left: -1px; - text-align:left; + text-align: left; background: #f8f8f8; border: 1px solid #ddd; border-radius: 5px; border-top-left-radius: 0; - box-shadow:0 2px 7px rgba(170,170,170,.4); + box-shadow: 0 2px 7px rgba(170,170,170,.4); +} +#new > ul > li { + height: 36px; + margin: 5px; + padding-left: 42px; + padding-bottom: 2px; + background-position: initial; + cursor: pointer; +} +#new > ul > li > p { + cursor: pointer; + padding-top: 7px; + padding-bottom: 7px; } -#new>ul>li { height:36px; margin:5px; padding-left:48px; padding-bottom:2px; - background-repeat:no-repeat; cursor:pointer; } -#new>ul>li>p { cursor:pointer; padding-top: 7px; padding-bottom: 7px;} #new .error, #fileList .error { color: #e9322d; diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index 939043b2c9f..ed15e46a5ac 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -5,12 +5,17 @@ <div id="new" class="button"> <a><?php p($l->t('New'));?></a> <ul> - <li style="background-image:url('<?php p(OCP\mimetype_icon('text/plain')) ?>')" - data-type='file' data-newname='<?php p($l->t('New text file')) ?>.txt'><p><?php p($l->t('Text file'));?></p></li> - <li style="background-image:url('<?php p(OCP\mimetype_icon('dir')) ?>')" - data-type='folder' data-newname='<?php p($l->t('New folder')) ?>'><p><?php p($l->t('Folder'));?></p></li> - <li style="background-image:url('<?php p(OCP\image_path('core', 'places/link.svg')) ?>')" - data-type='web'><p><?php p($l->t('From link'));?></p></li> + <li class="icon icon-filetype-text" + data-type="file" data-newname="<?php p($l->t('New text file')) ?>.txt"> + <p><?php p($l->t('Text file'));?></p> + </li> + <li class="icon icon-filetype-folder" + data-type="folder" data-newname="<?php p($l->t('New folder')) ?>"> + <p><?php p($l->t('Folder'));?></p> + </li> + <li class="icon icon-link" data-type="web"> + <p><?php p($l->t('From link'));?></p> + </li> </ul> </div> <?php endif;?> |