From 185c29038f5d2fd9cd22b7001538f694f04b6d29 Mon Sep 17 00:00:00 2001 From: Julien Veyssier Date: Mon, 17 Sep 2018 12:26:40 +0200 Subject: [PATCH] update filetypes icon --- appinfo/app.php | 1 + {img => css}/app_black.svg | 0 css/gpxedit.css | 4 ++++ css/style.css | 31 ++----------------------------- js/filetypes.js | 6 +++--- 5 files changed, 10 insertions(+), 32 deletions(-) rename {img => css}/app_black.svg (100%) diff --git a/appinfo/app.php b/appinfo/app.php index 6b32a3f..7950768 100644 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -15,6 +15,7 @@ use OCP\AppFramework\App; use OCP\Util; Util::addScript('gpxedit', 'filetypes'); +Util::addStyle('gpxedit', 'style'); $app = new Application(); $container = $app->getContainer(); diff --git a/img/app_black.svg b/css/app_black.svg similarity index 100% rename from img/app_black.svg rename to css/app_black.svg diff --git a/css/gpxedit.css b/css/gpxedit.css index 76804da..b5a7d70 100644 --- a/css/gpxedit.css +++ b/css/gpxedit.css @@ -925,3 +925,7 @@ div#ho button { input[type=checkbox] { cursor: pointer; } +/* jquery dialog */ +.ui-dialog{ + z-index: 2001 !important ; +} diff --git a/css/style.css b/css/style.css index 779b410..d5fd284 100644 --- a/css/style.css +++ b/css/style.css @@ -1,30 +1,3 @@ -#hello { - color: red; -} -#app-navigation *, #app-settings *{ - width:2px; - z-index:-10; -} -#app-navigation, #app-settings{ - width:2px; -} - -#app *{ - box-sizing: border-box; -} - -#map *{ - box-sizing: content-box; -} -#gpxlist td{ - word-wrap: break-word; - white-space: normal; -} -#gpxlist a{ - color: blue; - text-decoration: underline; -} -/* jquery dialog */ -.ui-dialog{ - z-index: 2001 !important ; +.icon-gpxedit-black { + background-image: url("app_black.svg"); } diff --git a/js/filetypes.js b/js/filetypes.js index f69bd25..7cefd3c 100644 --- a/js/filetypes.js +++ b/js/filetypes.js @@ -2,7 +2,7 @@ $(document).ready(function() { if (OCA.Files && OCA.Files.fileActions && !$('#sharingToken').val()) { - var token = $('#sharingToken').val(); + var token = $('#sharingToken').val(); // file action for directories if (!token) { @@ -11,7 +11,7 @@ $(document).ready(function() { displayName: t('gpxedit','Load in GpxEdit'), mime: 'httpd/unix-directory', permissions: OC.PERMISSION_READ, - icon: function () {return OC.imagePath('gpxedit', 'app_black');}, + iconClass: 'icon-gpxedit-black', actionHandler: function(file, data){ var dir; if (data.dir === '/'){ @@ -36,7 +36,7 @@ $(document).ready(function() { displayName: t('gpxedit', 'Edit with GpxEdit'), mime: 'application/gpx+xml', permissions: OC.PERMISSION_READ, - icon: function () {return OC.imagePath('gpxedit', 'app_black');}, + iconClass: 'icon-gpxedit-black', actionHandler: openFile }); }