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

Fix bad merge

Browse Source
This commit is contained in:
Laurent Destailleur 2017-06-14 10:50:43 +02:00
parent b889db997a
commit 2d571bf097
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2362,15 +2362,6 @@ table.liste, table.noborder, table.formdoc, div.noborder {
border-bottom-style: solid; border-bottom-style: solid;
margin: 0px 0px 8px 0px; margin: 0px 0px 8px 0px;
<<<<<<< HEAD
=======
/*
-moz-box-shadow: 2px 2px 4px #CCC;
-webkit-box-shadow: 2px 2px 4px #CCC;
box-shadow: 2px 2px 4px #CCC;
*/
/* box-shadow: 0 0 3px rgba(0,0,0,0.16); */
>>>>>>> branch '4.0' of git@github.com:Dolibarr/dolibarr.git
-moz-border-radius: 0.1em; -moz-border-radius: 0.1em;
-webkit-border-radius: 0.1em; -webkit-border-radius: 0.1em;
@ -4641,11 +4632,7 @@ border-top-right-radius: 6px;
} }
@media only screen and (max-width: 767px) @media only screen and (max-width: 767px)
{ {
<<<<<<< HEAD
.imgopensurveywizard, .imgautosize { width:95%; height: auto; } .imgopensurveywizard, .imgautosize { width:95%; height: auto; }
=======
.imgopensurveywizard { width:95%; height: auto; }
>>>>>>> branch '4.0' of git@github.com:Dolibarr/dolibarr.git
#tooltip { #tooltip {
position: absolute; position: absolute;