lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean code

Browse Source
This commit is contained in:
Laurent Destailleur 2020-02-24 20:20:02 +01:00
parent dfe6861241
commit 4fc3158962
6 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
htdocs/modulebuilder/template/img/mymodule.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 683 B

BIN
htdocs/modulebuilder/template/img/object_mymodule_over.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 323 B

1
htdocs/takepos/css/pos.css.php
View File

@ -464,6 +464,7 @@ div.description_content {
margin-left: 6px; margin-left: 6px;
font-size: 1.3em; font-size: 1.3em;
max-width: 250px; max-width: 250px;
border-radius: 5px;
} }
@media screen and (min-width: 892px) { @media screen and (min-width: 892px) {

12
htdocs/theme/eldy/dropdown.inc.php
View File

@ -336,7 +336,7 @@ a.top-menu-dropdown-link {
margin-right: 5px; margin-right: 5px;
display: inline-block; display: inline-block;
content: "\f0da"; 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 { .dropdown-search-input {
width: 100%; width: 280px;
padding: 10px 35px 10px 20px; padding: 10px 35px 10px 20px;
background-color: transparent; background-color: transparent;
font-size: 14px; /*font-size: 14px;
line-height: 16px; line-height: 16px;*/
box-sizing: border-box; box-sizing: border-box;
color: #575756; 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-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-repeat: no-repeat;
background-size: 16px 16px; background-size: 16px 16px;
background-position: 95% center; background-position: 95% center;
border-radius: 50px; border-radius: 10px;
border: 1px solid #c4c4c2 !important; border: 1px solid #c4c4c2 !important;
transition: all 250ms ease-in-out; transition: all 250ms ease-in-out;
backface-visibility: hidden; backface-visibility: hidden;

13
htdocs/theme/eldy/global.inc.php
View File

@ -1983,13 +1983,7 @@ a.tmenuimage:hover{
$found = 0; $url = ''; $found = 0; $url = '';
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
if (file_exists($dirroot."/".$val."/img/".$val."_over.png")) if (file_exists($dirroot."/".$val."/img/".$val.".png"))
{
$url = dol_buildpath('/'.$val.'/img/'.$val.'_over.png', 1);
$found = 1;
break;
}
elseif (file_exists($dirroot."/".$val."/img/".$val.".png")) // Retro compatibilité
{ {
$url = dol_buildpath('/'.$val.'/img/'.$val.'.png', 1); $url = dol_buildpath('/'.$val.'/img/'.$val.'.png', 1);
$found = 1; $found = 1;
@ -2000,10 +1994,11 @@ a.tmenuimage:hover{
if (!$found) if (!$found)
{ {
if (!defined('DISABLE_FONT_AWSOME')) { 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 { print 'div.mainmenu.'.$val.'::before {
content: "\f249"; content: "\f249";
}'; }'."\n";
} }
else else
{ {

11
htdocs/theme/md/style.css.php
View File

@ -2051,13 +2051,7 @@ div.mainmenu.website {
$found = 0; $url = ''; $found = 0; $url = '';
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
if (file_exists($dirroot."/".$val."/img/".$val."_over.png")) if (file_exists($dirroot."/".$val."/img/".$val.".png"))
{
$url = dol_buildpath('/'.$val.'/img/'.$val.'_over.png', 1);
$found = 1;
break;
}
elseif (file_exists($dirroot."/".$val."/img/".$val.".png")) // Retro compatibilité
{ {
$url = dol_buildpath('/'.$val.'/img/'.$val.'.png', 1); $url = dol_buildpath('/'.$val.'/img/'.$val.'.png', 1);
$found = 1; $found = 1;
@ -2075,7 +2069,8 @@ div.mainmenu.website {
} }
else 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); $url = dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.(min($generic, 4))."_over.png", 1);
print "div.mainmenu.".$val." {\n"; print "div.mainmenu.".$val." {\n";
print " background-image: url(".$url.");\n"; print " background-image: url(".$url.");\n";