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

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2017-08-21 11:04:09 +02:00
commit b48f501a0c
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/langs/en_US/main.lang
View File

@ -795,6 +795,7 @@ AutomaticallyCalculated=Automatically calculated
TitleSetToDraft=Go back to draft TitleSetToDraft=Go back to draft
ConfirmSetToDraft=Are you sure you want to go back to Draft status ? ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
ImportId=Import id ImportId=Import id
Websites=Web sites
# Week day # Week day
Monday=Monday Monday=Monday
Tuesday=Tuesday Tuesday=Tuesday

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

@ -3067,15 +3067,13 @@ div.error {
/* Info admin */ /* Info admin */
div.info { div.info {
color: #303035; color: #fff;
padding: 0.4em 0.4em 0.4em 0.4em; padding: 0.4em 0.4em 0.4em 0.4em;
margin: 0.5em 0em 0.5em 0em; margin: 0.5em 0em 0.5em 0em;
border: 1px solid #e0e0e0;
-moz-border-radius: 4px; -moz-border-radius: 4px;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
background: #868; background: #989;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
} }
div.warning a, div.info a, div.error a { div.warning a, div.info a, div.error a {