diff options
| -rw-r--r-- | apps/files/css/files.css | 10 | ||||
| -rw-r--r-- | apps/files/js/newfilemenu.js | 5 | ||||
| -rw-r--r-- | core/css/apps.css | 10 |
3 files changed, 12 insertions, 13 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 97b2a0c451e..5c27515f26a 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -743,6 +743,15 @@ table.dragshadow td.size { text-overflow: ellipsis; overflow: hidden; } +.newFileMenu.popovermenu .menuitem .icon { + margin-bottom: -2px; +} +.newFileMenu.popovermenu a.menuitem, +.newFileMenu.popovermenu label.menuitem, +.newFileMenu.popovermenu .menuitem { + padding: 0; + margin: 0; +} .newFileMenu.bubble:after { left: 75px; @@ -768,4 +777,3 @@ table.dragshadow td.size { color: #000; padding: 0; } - diff --git a/apps/files/js/newfilemenu.js b/apps/files/js/newfilemenu.js index c851096bd8f..c7c02bd65f1 100644 --- a/apps/files/js/newfilemenu.js +++ b/apps/files/js/newfilemenu.js @@ -114,7 +114,7 @@ })); //this.trigger('actionPerformed', action); - $target.append($form); + $target.append($form); // here comes the OLD code var $input = $form.find('input'); @@ -201,7 +201,7 @@ id: 'file', displayName: t('files', 'Text file'), templateName: t('files', 'New text file.txt'), - iconClass: 'icon-text', + iconClass: 'icon-filetype-text', fileType: 'file' }, { id: 'folder', @@ -234,4 +234,3 @@ OCA.Files.NewFileMenu = NewFileMenu; })(); - diff --git a/core/css/apps.css b/core/css/apps.css index c11bfb3cadf..7380a44011a 100644 --- a/core/css/apps.css +++ b/core/css/apps.css @@ -637,12 +637,6 @@ em { opacity: .5; } -.popovermenu .menuitem { - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; - filter: alpha(opacity=50); - opacity: .5; -} - .popovermenu .menuitem:hover, .popovermenu .menuitem:focus { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; @@ -681,12 +675,11 @@ em { padding: 0; } - .popovermenu .menuitem .icon, .popovermenu .menuitem .no-icon { display: inline-block; width: 16px; - margin-right: 5px; + margin-right: 10px; } .popovermenu .menuitem { @@ -696,4 +689,3 @@ em { .popovermenu li:hover .menuitem { opacity: 1; } - |