diff --git a/htdocs/modulebuilder/template/img/mymodule.png b/htdocs/modulebuilder/template/img/mymodule.png deleted file mode 100644 index 2681ccc1d3a..00000000000 Binary files a/htdocs/modulebuilder/template/img/mymodule.png and /dev/null differ diff --git a/htdocs/modulebuilder/template/img/object_mymodule_over.png b/htdocs/modulebuilder/template/img/object_mymodule_over.png new file mode 100644 index 00000000000..72d9d7fe28e Binary files /dev/null and b/htdocs/modulebuilder/template/img/object_mymodule_over.png differ diff --git a/htdocs/takepos/css/pos.css.php b/htdocs/takepos/css/pos.css.php index 1b662649fc8..8a75549ce0c 100644 --- a/htdocs/takepos/css/pos.css.php +++ b/htdocs/takepos/css/pos.css.php @@ -464,6 +464,7 @@ div.description_content { margin-left: 6px; font-size: 1.3em; max-width: 250px; + border-radius: 5px; } @media screen and (min-width: 892px) { diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php index d451308884f..a0915b8bd08 100644 --- a/htdocs/theme/eldy/dropdown.inc.php +++ b/htdocs/theme/eldy/dropdown.inc.php @@ -336,7 +336,7 @@ a.top-menu-dropdown-link { margin-right: 5px; display: inline-block; content: "\f0da"; - color: rgba(0,0,0,0.3); + /* color: rgba(0,0,0,0.3); */ } @@ -351,22 +351,20 @@ a.top-menu-dropdown-link { */ .dropdown-search-input { - width: 100%; + width: 280px; padding: 10px 35px 10px 20px; background-color: transparent; - font-size: 14px; - line-height: 16px; + /*font-size: 14px; + line-height: 16px;*/ box-sizing: border-box; - color: #575756; - background-color: transparent; background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24'%3E%3Cpath d='M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z'/%3E%3Cpath d='M0 0h24v24H0z' fill='none'/%3E%3C/svg%3E"); background-repeat: no-repeat; background-size: 16px 16px; background-position: 95% center; - border-radius: 50px; + border-radius: 10px; border: 1px solid #c4c4c2 !important; transition: all 250ms ease-in-out; backface-visibility: hidden; diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 137cdd6418a..f6eb3dd324a 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -1983,13 +1983,7 @@ a.tmenuimage:hover{ $found = 0; $url = ''; foreach ($conf->file->dol_document_root as $dirroot) { - if (file_exists($dirroot."/".$val."/img/".$val."_over.png")) - { - $url = dol_buildpath('/'.$val.'/img/'.$val.'_over.png', 1); - $found = 1; - break; - } - elseif (file_exists($dirroot."/".$val."/img/".$val.".png")) // Retro compatibilité + if (file_exists($dirroot."/".$val."/img/".$val.".png")) { $url = dol_buildpath('/'.$val.'/img/'.$val.'.png', 1); $found = 1; @@ -2000,10 +1994,11 @@ a.tmenuimage:hover{ if (!$found) { if (!defined('DISABLE_FONT_AWSOME')) { - print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n"; + print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one. */\n"; + print "/* Overwrite this definition in your own css with a different content to use your own font awesome icon. */\n"; print 'div.mainmenu.'.$val.'::before { content: "\f249"; - }'; + }'."\n"; } else { diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 597ffb1d9f7..1305bdc6418 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -2051,13 +2051,7 @@ div.mainmenu.website { $found = 0; $url = ''; foreach ($conf->file->dol_document_root as $dirroot) { - if (file_exists($dirroot."/".$val."/img/".$val."_over.png")) - { - $url = dol_buildpath('/'.$val.'/img/'.$val.'_over.png', 1); - $found = 1; - break; - } - elseif (file_exists($dirroot."/".$val."/img/".$val.".png")) // Retro compatibilité + if (file_exists($dirroot."/".$val."/img/".$val.".png")) { $url = dol_buildpath('/'.$val.'/img/'.$val.'.png', 1); $found = 1; @@ -2075,7 +2069,8 @@ div.mainmenu.website { } else { - print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n"; + print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one. */\n"; + print "/* Overwrite this definition in your own css with a different content to use your own font awesome icon. */\n"; $url = dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.(min($generic, 4))."_over.png", 1); print "div.mainmenu.".$val." {\n"; print " background-image: url(".$url.");\n";