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

Merge remote-tracking branch 'upstream/develop' into develop

Browse Source
This commit is contained in:
Juanjo Menent 2016-05-19 21:03:44 +02:00
commit 341c70fa87
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/tpl/contacts.tpl.php
View File

@ -139,7 +139,7 @@ if ($permission) {
} }
?> ?>
<form class="tagtr liste_titre formnoborder"> <form class="tagtr liste_titre liste_titre_add formnoborder">
<div class="tagtd"><?php echo $langs->trans("Nature"); ?></div> <div class="tagtd"><?php echo $langs->trans("Nature"); ?></div>
<div class="tagtd"><?php echo $langs->trans("ThirdParty"); ?></div> <div class="tagtd"><?php echo $langs->trans("ThirdParty"); ?></div>
<div class="tagtd"><?php echo $langs->trans("Users").'/'.$langs->trans("Contacts"); ?></div> <div class="tagtd"><?php echo $langs->trans("Users").'/'.$langs->trans("Contacts"); ?></div>

10
htdocs/theme/eldy/style.css.php
View File

@ -1142,17 +1142,15 @@ form#login {
background-color: #FFFFFF; background-color: #FFFFFF;
-moz-box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15); -moz-box-shadow: 0 2px 23px 2px rgba(0, 0, 0, 0.1), 0 2px 6px rgba(60,60,60,0.15);
-webkit-box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15); -webkit-box-shadow: 0 2px 23px 2px rgba(0, 0, 0, 0.1), 0 2px 6px rgba(60,60,60,0.15);
box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15); box-shadow: 0 2px 23px 2px rgba(0, 0, 0, 0.1), 0 2px 6px rgba(60,60,60,0.15);
/*-moz-box-shadow: 3px 2px 20px #CCC; /*-moz-box-shadow: 3px 2px 20px #CCC;
-webkit-box-shadow: 3px 2px 20px #CCC; -webkit-box-shadow: 3px 2px 20px #CCC;
box-shadow: 3px 2px 20px #CCC;*/ box-shadow: 3px 2px 20px #CCC;*/
border-radius: 5px; border-radius: 5px;
border:solid 1px rgba(80,80,80,.4); border:solid 1px rgba(80,80,80,.4);
border-top:solid 1px #f8f8f8;
} }
.login_main_message { .login_main_message {
text-align: center; text-align: center;
@ -2212,7 +2210,7 @@ table.liste, table.noborder, table.formdoc, div.noborder {
border-top-style: solid; border-top-style: solid;
} }
*/ */
.liste_titre_add td .liste_titre_add td, .liste_titre_add .tagtd
{ {
border-top-width: 1px; border-top-width: 1px;
border-top-color: rgb(<?php echo $colortopbordertitle1 ?>); border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);

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

@ -1805,18 +1805,19 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
.tabactive, a.tab#active { .tabactive, a.tab#active {
color: #<?php echo $colortextbacktab; ?> !important; color: #<?php echo $colortextbacktab; ?> !important;
background: rgb(<?php echo $colorbacktabcard1; ?>) !important; background: rgb(<?php echo $colorbacktabcard1; ?>) !important;
border-right: 1px solid #AAA !important;
border-left: 1px solid #AAA !important;
border-top: 2px solid #111 !important;
/*
-moz-box-shadow: 0 -1px 4px rgba(0,0,0,.1); -moz-box-shadow: 0 -1px 4px rgba(0,0,0,.1);
-webkit-box-shadow: 0 -1px 4px rgba(0,0,0,.1); -webkit-box-shadow: 0 -1px 4px rgba(0,0,0,.1);
box-shadow: 0 -1px 4px rgba(0,0,0,.1); box-shadow: 0 -1px 4px rgba(0,0,0,.1);
border-right: 1px solid #AAA !important;
border-left: 1px solid #AAA !important;
border-top: 1px solid #BBB !important;
-moz-border-radius:3px 3px 0px 0px; -moz-border-radius:3px 3px 0px 0px;
-webkit-border-radius:3px 3px 0px 0px; -webkit-border-radius:3px 3px 0px 0px;
border-radius:3px 3px 0px 0px; border-radius:3px 3px 0px 0px;
*/
} }
a.tab:hover a.tab:hover
{ {