From 325a471131504d105de3e3851e7ee9f997be0357 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 13 Jan 2015 10:45:10 +0000 Subject: [PATCH] moving vfsMime icon size to etemplate, only overwriting it for thumbnail more specific in filemanager for Pixelegg template as they limit all images in NM widget --- etemplate/templates/default/etemplate2.css | 7 +++++++ filemanager/templates/default/app.css | 8 -------- filemanager/templates/pixelegg/app.css | 11 +++-------- filemanager/templates/pixelegg/app.less | 3 +++ 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css index 9151245204..1b17332b58 100644 --- a/etemplate/templates/default/etemplate2.css +++ b/etemplate/templates/default/etemplate2.css @@ -842,6 +842,13 @@ button.et2_vfs_btn { background-position: 4px center; background-size: 20px auto; } +img.vfsMimeIcon, #filemanager-select img.vfsMimeIcon { + max-height: 16px; + height: auto; +} +img.vfsMimeIcon[src*="/etemplate/thumbnail.php"] { + max-height: none; +} /** * Validation diff --git a/filemanager/templates/default/app.css b/filemanager/templates/default/app.css index 49f5bb83d5..fae8ca06e4 100644 --- a/filemanager/templates/default/app.css +++ b/filemanager/templates/default/app.css @@ -63,14 +63,6 @@ div.filemanager_navigation > label > input { max-height: none; } -#filemanager-index_nm img.vfsMimeIcon, #filemanager-select img.vfsMimeIcon { - max-height: 16px; - height: auto; -} -#filemanager-index_nm img.vfsMimeIcon[src*="/etemplate/thumbnail.php"] { - max-height: none; -} - /** * Tile view table.egwGridView_grid .tile .file_tile { diff --git a/filemanager/templates/pixelegg/app.css b/filemanager/templates/pixelegg/app.css index 03377b47c4..7b4cb75469 100755 --- a/filemanager/templates/pixelegg/app.css +++ b/filemanager/templates/pixelegg/app.css @@ -90,14 +90,6 @@ div.filemanager_navigation > label > input { text-overflow: ellipsis; max-height: none; } -#filemanager-index_nm img.vfsMimeIcon, -#filemanager-select img.vfsMimeIcon { - max-height: 16px; - height: auto; -} -#filemanager-index_nm img.vfsMimeIcon[src*="/etemplate/thumbnail.php"] { - max-height: none; -} /** * Tile view table.egwGridView_grid .tile .file_tile { @@ -209,6 +201,9 @@ img#filemanager-index_home { padding: 4px; background-color: #e6e6e6; } +#filemanager-index_nm img.vfsMimeIcon[src*="/etemplate/thumbnail.php"] { + height: auto; +} div.filemanager_navigation { position: relative; width: 100%; diff --git a/filemanager/templates/pixelegg/app.less b/filemanager/templates/pixelegg/app.less index 874f397dcb..a1140e3ed1 100644 --- a/filemanager/templates/pixelegg/app.less +++ b/filemanager/templates/pixelegg/app.less @@ -42,6 +42,9 @@ /*Home img*/ img#filemanager-index_home {position: relative; top: 5px; .dimension_width_height_s; padding: 4px; background-color: @gray_10;} +#filemanager-index_nm img.vfsMimeIcon[src*="/etemplate/thumbnail.php"] { + height: auto; +} // Pfad div.filemanager_navigation{