diff --git a/ChangeLog b/ChangeLog index 7d3297cad89a30856ee9c64fa034101b2653f486..1529a25943d690e49fb48a987884f27cbcf0faa5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,12 +32,13 @@ For users: - New: Can add an event automatically when a projet is create. - New: Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE. - New: Add option excludethirdparties and onlythirdparties into merge pdf scripts. -- New : [ task #925 ] Add ODT document generation for Tasks in project module. -- New : [ task #924 ] Add numbering rule on task. -- New : [ task #165 ] Add import/export of multiprices. +- New: [ task #925 ] Add ODT document generation for Tasks in project module. +- New: [ task #924 ] Add numbering rule on task. +- New: [ task #165 ] Add import/export of multiprices. - New: Add Maghreb regions and departments. - New: A more responsive desgin for statistic box of home page. - Qual: Implement same rule for return value of all command line scripts (0 when success, <>0 if error). +- New: [ task #1005 ] Adapting to Spanish legislation bill numbering For translators: diff --git a/htdocs/core/modules/facture/mod_facture_mars.php b/htdocs/core/modules/facture/mod_facture_mars.php new file mode 100644 index 0000000000000000000000000000000000000000..28a32868d394e341dc4fb89f3d7277c1b5eb67ca --- /dev/null +++ b/htdocs/core/modules/facture/mod_facture_mars.php @@ -0,0 +1,207 @@ +<?php +/* Copyright (C) 2005-2008 Laurent Destailleur <eldy@users.sourceforge.net> + * Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com> + * Copyright (C) 2013 Juanjo Menent <jmenent@2byte.es> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * or see http://www.gnu.org/ + */ + +/** + * \file htdocs/core/modules/facture/mod_facture_mars.php + * \ingroup facture + * \brief File containing class for numbering module Mars + */ +require_once DOL_DOCUMENT_ROOT .'/core/modules/facture/modules_facture.php'; + +/** \class mod_facture_mars + * \brief Classe du modele de numerotation de reference de facture Mars + */ +class mod_facture_mars extends ModeleNumRefFactures +{ + var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' + var $prefixinvoice='FA'; + var $prefixreplacement='FR'; + var $prefixproforma='FP'; + var $prefixcreditnote='AV'; + var $error=''; + + /** + * Renvoi la description du modele de numerotation + * + * @return string Texte descripif + */ + function info() + { + global $langs; + $langs->load("bills"); + return $langs->trans('MarsNumRefModelDesc1',$this->prefixinvoice,$this->prefixreplacement,$this->prefixproforma,$this->prefixcreditnote); + } + + /** + * Renvoi un exemple de numerotation + * + * @return string Example + */ + function getExample() + { + return $this->prefixinvoice."0501-0001"; + } + + /** + * Test si les numeros deja en vigueur dans la base ne provoquent pas de + * de conflits qui empechera cette numerotation de fonctionner. + * + * @return boolean false si conflit, true si ok + */ + function canBeActivated() + { + global $langs,$conf; + + $langs->load("bills"); + + // Check invoice num + $fayymm=''; $max=''; + + $posindice=8; + $sql = "SELECT MAX(SUBSTRING(facnumber FROM ".$posindice.")) as max"; // This is standard SQL + $sql.= " FROM ".MAIN_DB_PREFIX."facture"; + $sql.= " WHERE facnumber LIKE '".$this->prefixinvoice."____-%'"; + $sql.= " AND entity = ".$conf->entity; + + $resql=$db->query($sql); + if ($resql) + { + $row = $db->fetch_row($resql); + if ($row) { $fayymm = substr($row[0],0,6); $max=$row[0]; } + } + if ($fayymm && ! preg_match('/'.$this->prefixinvoice.'[0-9][0-9][0-9][0-9]/i',$fayymm)) + { + $langs->load("errors"); + $this->error=$langs->trans('ErrorNumRefModel',$max); + return false; + } + + // Check credit note num + $fayymm=''; + + $posindice=8; + $sql = "SELECT MAX(SUBSTRING(facnumber FROM ".$posindice.")) as max"; // This is standard SQL + $sql.= " FROM ".MAIN_DB_PREFIX."facture"; + $sql.= " WHERE facnumber LIKE '".$this->prefixcreditnote."____-%'"; + $sql.= " AND entity = ".$conf->entity; + + $resql=$db->query($sql); + if ($resql) + { + $row = $db->fetch_row($resql); + if ($row) { $fayymm = substr($row[0],0,6); $max=$row[0]; } + } + if ($fayymm && ! preg_match('/'.$this->prefixcreditnote.'[0-9][0-9][0-9][0-9]/i',$fayymm)) + { + $this->error=$langs->trans('ErrorNumRefModel',$max); + return false; + } + + return true; + } + + /** + * Return next value not used or last value used + * + * @param Societe $objsoc Object third party + * @param Facture $facture Object invoice + * @param string $mode 'next' for next value or 'last' for last value + * @return string Value + */ + function getNextValue($objsoc,$facture,$mode='next') + { + global $db,$conf; + + $prefix=$this->prefixinvoice; + + if ($facture->type == 1) $prefix=$this->prefixreplacement; + elseif ($facture->type == 2) $prefix=$this->prefixcreditnote; + elseif ($facture->type == 4) $prefix=$this->prefixproforma; + + // D'abord on recupere la valeur max + $posindice=8; + $sql = "SELECT MAX(SUBSTRING(facnumber FROM ".$posindice.")) as max"; // This is standard SQL + $sql.= " FROM ".MAIN_DB_PREFIX."facture"; + $sql.= " WHERE facnumber LIKE '".$prefix."____-%'"; + $sql.= " AND entity = ".$conf->entity; + + $resql=$db->query($sql); + dol_syslog(get_class($this)."::getNextValue sql=".$sql); + if ($resql) + { + $obj = $db->fetch_object($resql); + if ($obj) $max = intval($obj->max); + else $max=0; + } + else + { + dol_syslog(get_class($this)."::getNextValue sql=".$sql, LOG_ERR); + return -1; + } + + if ($mode == 'last') + { + $num = sprintf("%04s",$max); + + $ref=''; + $sql = "SELECT facnumber as ref"; + $sql.= " FROM ".MAIN_DB_PREFIX."facture"; + $sql.= " WHERE facnumber LIKE '".$prefix."____-".$num."'"; + $sql.= " AND entity = ".$conf->entity; + + dol_syslog(get_class($this)."::getNextValue sql=".$sql); + $resql=$db->query($sql); + if ($resql) + { + $obj = $db->fetch_object($resql); + if ($obj) $ref = $obj->ref; + } + else dol_print_error($db); + + return $ref; + } + else if ($mode == 'next') + { + $date=$facture->date; // This is invoice date (not creation date) + $yymm = strftime("%y%m",$date); + $num = sprintf("%04s",$max+1); + + dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num); + return $prefix.$yymm."-".$num; + } + else dol_print_error('','Bad parameter for getNextValue'); + } + + /** + * Return next free value + * + * @param Societe $objsoc Object third party + * @param string $objforref Object for number to search + * @param string $mode 'next' for next value or 'last' for last value + * @return string Next free value + */ + function getNumRef($objsoc,$objforref,$mode='next') + { + return $this->getNextValue($objsoc,$objforref,$mode); + } + +} + +?> diff --git a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php index 2daef285bce0184c4e08b571408fba23801ebe13..995815a0724a8146b128f587c6d2eb096cba296e 100644 --- a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php @@ -636,13 +636,13 @@ class pdf_typhon extends ModelePDFDeliveryOrder pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->COMMANDE_DRAFT_WATERMARK); } - $pdf->SetTextColor(0,0,60); - $pdf->SetFont('','B', $default_font_size + 3); - - $posy=$this->marge_haute; - $posx=$this->page_largeur-$this->marge_droite-100; - - $pdf->SetXY($this->marge_gauche,$posy); + $pdf->SetTextColor(0,0,60); + $pdf->SetFont('','B', $default_font_size + 3); + + $posy=$this->marge_haute; + $posx=$this->page_largeur-$this->marge_droite-100; + + $pdf->SetXY($this->marge_gauche,$posy); // Logo $logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo; diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang index 478da4f90c8034d2f741727c6f947c5d5c6305a8..67f88938ca0e66156c32e024856149fd4044310a 100644 --- a/htdocs/langs/ca_ES/bills.lang +++ b/htdocs/langs/ca_ES/bills.lang @@ -403,3 +403,4 @@ PDFCrabeDescription=Model de factura complet (model recomanat per defecte) PDFOursinDescription=Model de factura complet (model alternatiu) # NumRef Modules TerreNumRefModelDesc1=Retorna el nombre sota el format %syymm-nnnn per a les factures i %syymm-nnnn per als abonaments on yy és l'any, mm. el mes i nnnn un comptador seqüencial sense ruptura i sense permanència a 0 +MarsNumRefModelDesc1=Retorna el nombre sota el format %syymm-nnnn per a les factures, %syymm-nnnn per a les factures rectificatives, %syymm-nnnn per a les factures proforma i %syymm-nnnn per als abonaments on yy és l'any, mm. el mes i nnnn un comptador seqüencial sense ruptura i sense permanència a 0 \ No newline at end of file diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 82abde453c1ae04859f49510013f9ca857374c79..ceab52445e2fea734c630374475ff06ce13e3432 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -412,4 +412,6 @@ PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (Tem PDFOursinDescription=Invoice PDF template Oursin. A complete invoice template (Template alternative) # NumRef Modules TerreNumRefModelDesc1=Return numero with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 +MarsNumRefModelDesc1=Return numero with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for proforma invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 + TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module. diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang index f8093cfe1589f896b0525e669dd4da3556009ec5..0cf2fd8389400565c9a5e827dd0e0c2197c8d2bb 100644 --- a/htdocs/langs/es_ES/bills.lang +++ b/htdocs/langs/es_ES/bills.lang @@ -406,3 +406,4 @@ PDFCrabeDescription=Modelo de factura completo (modelo recomendado por defecto) PDFOursinDescription=Modelo de factura completo (modelo alternativo) # NumRef Modules TerreNumRefModelDesc1=Devuelve el número bajo el formato %syymm-nnnn para las facturas y %syymm-nnnn para los abonos donde yy es el año, mm. el mes y nnnn un contador secuencial sin ruptura y sin permanencia a 0 +MarsNumRefModelDesc1=Devuelve el número bajo el formato %syymm-nnnn para las facturas, %syymm-nnnn para las facturas rectificativas, %syymm-nnnn para las facturas proforma y %syymm-nnnn para los abonos donde yy es el año, mm. el mes y nnnn un contador secuencial sin ruptura y sin permanencia a 0 \ No newline at end of file diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index c27aeb340c41e711bafb7df70ed18e56e0c6fec4..d50dc794c5c17d13f3ac2ed62b269974134d1649 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -409,3 +409,4 @@ PDFCrabeDescription=Modèle de facture PDF complet (modèle recommandé par déf PDFOursinDescription=Modèle de facture PDF complet (modèle alternatif) # NumRef Modules TerreNumRefModelDesc1=Renvoie le numéro sous la forme %syymm-nnnn pour les factures et %syymm-nnnn pour les avoirs où yy est l'année, mm le mois et nnnn un compteur séquentiel sans rupture et sans remise à 0 +MarsNumRefModelDesc1=Renvoie le numéro sous la forme %syymm-nnnn pour les factures, %syymm-nnnn pour les factures de remplacement, %syymm-nnnn pour les factures proforma et %syymm-nnnn pour les avoirs où yy est l'année, mm le mois et nnnn un compteur séquentiel sans rupture et sans remise à 0 \ No newline at end of file diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index a0cba9339a83848f83a707afa34b3d6e3bcd6bbf..9daeecd1e00d8a2eb40c8ba128710707e9b642af 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -108,7 +108,8 @@ $colorbacklineimpairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+roun $colorbacklinepair1='255,255,255'; // line pair $colorbacklinepair2='255,255,255'; // line pair $colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)); -$colorbackbody='#ffffff url('.$img_head.') 0 0 no-repeat;'; +//$colorbackbody='#ffffff url('.$img_head.') 0 0 no-repeat;'; +$colorbackbody='#ffffff'; $colortext='40,40,40'; $fontsize=empty($conf->dol_optimize_smallscreen)?'12':'14'; $fontsizesmaller=empty($conf->dol_optimize_smallscreen)?'11':'14'; @@ -116,24 +117,24 @@ $fontsizesmaller=empty($conf->dol_optimize_smallscreen)?'11':'14'; // Eldy colors if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) { - $conf->global->THEME_ELDY_TOPMENU_BACK1=($conf->browser->name == 'ie' && round($conf->browser->version,2) < 10)?'230,232,232':'200,216,246'; // topmenu - $conf->global->THEME_ELDY_TOPMENU_BACK2='190,206,236'; + $conf->global->THEME_ELDY_TOPMENU_BACK1='250,250,250'; // topmenu + $conf->global->THEME_ELDY_TOPMENU_BACK2='236,236,236'; $conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255'; // vmenu $conf->global->THEME_ELDY_VERMENU_BACK1b='230,232,232'; // vmenu (not menu) $conf->global->THEME_ELDY_VERMENU_BACK2='240,240,240'; $conf->global->THEME_ELDY_BACKTITLE1='140,160,185'; // title of arrays - $conf->global->THEME_ELDY_BACKTITLE2='210,220,235'; - $conf->global->THEME_ELDY_BACKTABCARD1='240,240,240'; // card - $conf->global->THEME_ELDY_BACKTABCARD2='234,234,234'; + $conf->global->THEME_ELDY_BACKTITLE2='230,230,230'; + $conf->global->THEME_ELDY_BACKTABCARD2='210,210,210'; // card + $conf->global->THEME_ELDY_BACKTABCARD1='234,234,234'; $conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234'; - $conf->global->THEME_ELDY_BACKBODY='#ffffff url('.$img_head.') 0 0 no-repeat;'; + //$conf->global->THEME_ELDY_BACKBODY='#ffffff url('.$img_head.') 0 0 no-repeat;'; + $conf->global->THEME_ELDY_BACKBODY='#ffffff;'; $conf->global->THEME_ELDY_LINEIMPAIR1='242,242,242'; $conf->global->THEME_ELDY_LINEIMPAIR2='248,248,248'; $conf->global->THEME_ELDY_LINEIMPAIRHOVER='238,246,252'; $conf->global->THEME_ELDY_LINEPAIR1='255,255,255'; $conf->global->THEME_ELDY_LINEPAIR2='255,255,255'; $conf->global->THEME_ELDY_LINEPAIRHOVER='238,246,252'; - $conf->global->THEME_ELDY_BACKBODY='#ffffff url('.$img_head.') 0 0 no-repeat;'; $conf->global->THEME_ELDY_TEXT='50,50,130'; if ($dol_use_jmobile) { @@ -177,8 +178,16 @@ $tmpval=(! empty($tmppart[1]) ? $tmppart[1] : ''); $tmpval+=(! empty($tmppart[2]) ? $tmppart[2] : ''); $tmpval+=(! empty($tmppart[3]) ? $tmppart[3] : ''); //print $tmpval; -if ($tmpval < 340) $colortextmain='FFFFFF'; -else $colortextmain='444444'; +if ($tmpval < 340) $colortextback='FFF'; +else $colortextback='444'; +$tmppart=explode(',',$colorbacktitle1); +$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : ''); +$tmpval+=(! empty($tmppart[2]) ? $tmppart[2] : ''); +$tmpval+=(! empty($tmppart[3]) ? $tmppart[3] : ''); +//print 'xxx'.$tmpval; exit; +if ($tmpval < 360) { $colortexttitle='FFF'; $colorshadowtitle='000'; } +else { $colortexttitle='444'; $colorshadowtitle='FFF'; } + $usecss3=true; if ($conf->browser->name == 'ie' && round($conf->browser->version,2) < 10) $usecss3=false; @@ -333,9 +342,9 @@ legend { margin-bottom: 8px; } -moz-border-radius:0px 5px 0px 5px; -webkit-border-radius:0px 5px 0px 5px; border-radius:0px 5px 0px 5px; - -moz-box-shadow: 4px 4px 4px #DDD; - -webkit-box-shadow: 4px 4px 4px #DDD; - box-shadow: 4px 4px 4px #DDD; + -moz-box-shadow: 3px 3px 4px #DDD; + -webkit-box-shadow: 3px 3px 4px #DDD; + box-shadow: 3px 3px 4px #DDD; } form { padding:0px; @@ -349,7 +358,7 @@ div.floatright { float:<?php print $right; ?>; } -div.inline-block +.inline-block { display:inline-block; } @@ -484,10 +493,9 @@ else } ?> - div#tmenu_tooltip { <?php if (! empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED) || ! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)) { - $colortexttopmenu=$colortextmain; + $colortexttopmenu=$colortextback; ?> background: rgb(<?php echo $colorback1 ?>); <?php } else { @@ -507,9 +515,9 @@ div.tmenudiv { position: relative; display: block; white-space: nowrap; - border-top: 0px solid #D3E5EC; + border-top: 0px; border-<?php print $left; ?>: 0px; - border-<?php print $right; ?>: 0px solid #555555; + border-<?php print $right; ?>: 0px; padding: 0px 0px 0px 0px; /* t r b l */ margin: 0px 0px 0px 0px; /* t r b l */ font-size: 13px; @@ -517,22 +525,26 @@ div.tmenudiv { height: <?php print ($heightmenu+1); ?>px; <?php if ($usecss3) { ?> - background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(40,40,40,.3) 100%); - background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(40,40,40,.3) 100%); - background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(40,40,40,.3) 100%); - background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(40,40,40,.3) 100%); - background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(40,40,40,.3) 100%); - background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(40,40,40,.3)) ); + background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(160,160,160,.3) 100%); + background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(160,160,160,.3) 100%); + background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(160,160,160,.3) 100%); + background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(160,160,160,.3) 100%); + background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(160,160,160,.3) 100%); + background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(160,160,160,.3)) ); box-shadow: 0 0 6px rgba(0, 0, 0, .4) !important; <?php } else { ?> background-image: rgb(<?php echo $colorback1; ?>); + border-bottom: 1px solid #CCC; <?php } ?> - color: #000000; + color: #000000; text-decoration: none; <?php } ?> } +div.tmenudisabled, a.tmenudisabled { + opacity: 0.6; +} a.tmenudisabled:link, a.tmenudisabled:visited, a.tmenudisabled:hover, a.tmenudisabled:active { color: #808080; font-weight: normal; @@ -578,6 +590,7 @@ a.tmenusel:link, a.tmenusel:visited, a.tmenusel:hover, a.tmenusel:active { white-space: nowrap; /* text-shadow: 1px 1px 1px #FFFFFF;*/ color: #<?php echo $colortexttopmenu; ?>; + text-decoration: none !important; } @@ -823,9 +836,9 @@ form#login { border: 1px solid #C0C0C0; background-color: #E0E0E0; - -moz-box-shadow: 4px 4px 4px #DDD; - -webkit-box-shadow: 4px 4px 4px #DDD; - box-shadow: 4px 4px 4px #DDD; + -moz-box-shadow: 3px 3px 4px #DDD; + -webkit-box-shadow: 3px 3px 4px #DDD; + box-shadow: 3px 3px 4px #DDD; border-radius: 8px; border:solid 1px rgba(168,168,168,.4); @@ -875,10 +888,10 @@ div.login { font-weight: bold; } div.login a { - color: #<?php echo $colortextmain; ?>; + color: #<?php echo $colortextback; ?>; } div.login a:hover { - color: #<?php echo $colortextmain; ?>; + color: #<?php echo $colortextback; ?>; text-decoration:underline; } .alogin, .alogin:hover { @@ -923,11 +936,11 @@ div.vmenu, td.vmenu { a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; } font.vmenudisabled { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; color: #93a5aa; } -a.vmenu:link, a.vmenu:visited { color: #<?php echo $colortextmain; ?>; } +a.vmenu:link, a.vmenu:visited { color: #<?php echo $colortextback; ?>; } a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; margin: 1px 1px 1px 8px; } font.vsmenudisabled { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #93a5aa; } -a.vsmenu:link, a.vsmenu:visited { color: #<?php echo $colortextmain; ?>; } +a.vsmenu:link, a.vsmenu:visited { color: #<?php echo $colortextback; ?>; } font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; } a.help:link, a.help:visited, a.help:hover, a.help:active { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #666666; text-decoration: none; } @@ -954,7 +967,6 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktab2; ?>) 0px, rgb(<?php echo $colorbacktab1; ?>) 3px); <?php } else { ?> - background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/tmenu.jpg',1); ?>); background-position:top; background-repeat:repeat-x; <?php } ?> @@ -964,9 +976,9 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks border-top: 1px solid #DDDDDD; border-radius: 5px; -moz-border-radius: 5px; - -moz-box-shadow: 4px 4px 4px #DDD; - -webkit-box-shadow: 4px 4px 4px #DDD; - box-shadow: 4px 4px 4px #DDD; + -moz-box-shadow: 3px 3px 4px #DDD; + -webkit-box-shadow: 3px 3px 4px #DDD; + box-shadow: 3px 3px 4px #DDD; } div.blockvmenusearch @@ -983,11 +995,11 @@ div.blockvmenusearch background: #E3E6E8; <?php if ($usecss3) { ?> - background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorbacktab1b; ?>) 90%, rgb(<?php echo $colorbacktab2; ?>) 100%); - background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacktab1b; ?>) 90%, rgb(<?php echo $colorbacktab2; ?>) 100%); - background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacktab1b; ?>) 90%, rgb(<?php echo $colorbacktab2; ?>) 100%); - background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktab1b; ?>) 90%, rgb(<?php echo $colorbacktab2; ?>) 100%); - background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktab1b; ?>) 90%, rgb(<?php echo $colorbacktab2; ?>) 100%); + background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 90%, rgb(<?php echo $colorbacktab2; ?>) 100%); + background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 90%, rgb(<?php echo $colorbacktab2; ?>) 100%); + background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 90%, rgb(<?php echo $colorbacktab2; ?>) 100%); + background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 90%, rgb(<?php echo $colorbacktab2; ?>) 100%); + background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 90%, rgb(<?php echo $colorbacktab2; ?>) 100%); <?php } ?> border-left: 1px solid #DDDDDD; @@ -996,9 +1008,9 @@ div.blockvmenusearch border-top: 1px solid #E8E8E8; border-radius: 5px; -moz-border-radius: 5px; - -moz-box-shadow: 4px 4px 4px #DDD; - -webkit-box-shadow: 4px 4px 4px #DDD; - box-shadow: 4px 4px 4px #DDD; + -moz-box-shadow: 3px 3px 4px #DDD; + -webkit-box-shadow: 3px 3px 4px #DDD; + box-shadow: 3px 3px 4px #DDD; } div.blockvmenubookmarksold @@ -1029,9 +1041,9 @@ div.blockvmenubookmarksold border-bottom: 1px solid #BBBBBB; border-radius: 5px; -moz-border-radius: 5px; - -moz-box-shadow: 4px 4px 4px #DDD; - -webkit-box-shadow: 4px 4px 4px #DDD; - box-shadow: 4px 4px 4px #DDD; + -moz-box-shadow: 3px 3px 4px #DDD; + -webkit-box-shadow: 3px 3px 4px #DDD; + box-shadow: 3px 3px 4px #DDD; } div.blockvmenuhelp @@ -1113,9 +1125,9 @@ td.photo { -moz-border-radius: 5px 5px 5px 5px !important; -webkit-border-radius: 5px 5px 5px 5px !important; border-radius: 5px 5px 5px 5px !important; - -moz-box-shadow: 4px 4px 4px #EEE; - -webkit-box-shadow: 4px 4px 4px #EEE; - box-shadow: 4px 4px 4px #EEE; + -moz-box-shadow: 3px 3px 4px #DDD; + -webkit-box-shadow: 3px 3px 4px #DDD; + box-shadow: 3px 3px 4px #DDD; padding: 0 4px 0 4px !important; } @@ -1328,8 +1340,8 @@ img.toolbarbutton { /* Onglets */ /* ============================================================================== */ div.tabs { - margin: 0px 0px 2px 6px; - padding: 0px 6px 3px 0px; +/* margin: 0px 0px 2px 6px; + padding: 0px 6px 3px 0px; */ text-align: <?php print $left; ?>; clear:both; @@ -1338,7 +1350,7 @@ div.tabs { div.tabsElem { margin-top: 8px; } /* To avoid overlap of tabs when not browser */ div.tabBar { - color: #<?php echo $colortextmain; ?>; + color: #<?php echo $colortextback; ?>; padding-top: 9px; padding-left: <?php echo ($dol_optimize_smallscreen?'4':'8'); ?>px; padding-right: <?php echo ($dol_optimize_smallscreen?'4':'8'); ?>px; @@ -1353,18 +1365,18 @@ div.tabBar { border-top: 1px solid #D8D8D8; width: auto; <?php if ($usecss3) { ?> - background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorbacktabcard1; ?>) 25%, rgb(<?php echo $colorbacktabcard2; ?>) 100%); - background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacktabcard1; ?>) 25%, rgb(<?php echo $colorbacktabcard2; ?>) 100%); - background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacktabcard1; ?>) 25%, rgb(<?php echo $colorbacktabcard2; ?>) 100%); - background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktabcard1; ?>) 25%, rgb(<?php echo $colorbacktabcard2; ?>) 100%); - background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktabcard1; ?>) 25%, rgb(<?php echo $colorbacktabcard2; ?>) 100%); + background-image: -o-linear-gradient(bottom, rgba(<?php echo $colorbacktabcard1; ?>, 0.5) 25%, rgba(<?php echo $colorbacktabcard2; ?>, 0.5) 100%); + background-image: -moz-linear-gradient(bottom, rgba(<?php echo $colorbacktabcard1; ?>, 0.5) 25%, rgba(<?php echo $colorbacktabcard2; ?>, 0.5) 100%); + background-image: -webkit-linear-gradient(bottom, rgba(<?php echo $colorbacktabcard1; ?>, 0.5) 25%, rgba(<?php echo $colorbacktabcard2; ?>, 0.5) 100%); + background-image: -ms-linear-gradient(bottom, rgba(<?php echo $colorbacktabcard1; ?>, 0.5) 25%, rgba(<?php echo $colorbacktabcard2; ?>, 0.5) 100%); + background-image: linear-gradient(bottom, rgba(<?php echo $colorbacktabcard1; ?>, 0.5) 25%, rgba(<?php echo $colorbacktabcard2; ?>, 0.5) 100%); <?php } else { ?> - background: rgb(<?php echo $colorbacktabcard1; ?>) repeat-x; + background: rgb(<?php echo $colorbacktabcard1; ?>); <?php } ?> <?php if (empty($dol_optimize_smallscreen)) { ?> - -moz-box-shadow: 4px 4px 4px #DDD; - -webkit-box-shadow: 4px 4px 4px #DDD; - box-shadow: 4px 4px 4px #DDD; + -moz-box-shadow: 3px 3px 4px #DDD; + -webkit-box-shadow: 3px 3px 4px #DDD; + box-shadow: 3px 3px 4px #DDD; <?php } ?> } @@ -1416,28 +1428,29 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active { background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%); background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%); background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%); -<?php } else { ?> - background: #ffffff; <?php } ?> + background-image: none !important; } a.tab#active { <?php if ($usecss3) { ?> - border-bottom: 1px solid rgb(<?php echo $colorbacktabactive; ?>) !important; - background-color: rgb(<?php echo $colorbacktabactive; ?>) !important; +/* border-bottom: 1px solid rgb(<?php echo $colorbacktabactive; ?>) !important; */ + background: rgba(<?php echo $colorbacktabcard2; ?>, 0.5) url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png',1); ?>) 50% 0 repeat-x; <?php } else { ?> - background: rgb(<?php echo $colorbacktabcard1; ?>); + background: rgb(<?php echo $colorbacktabactive; ?>) url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png',1); ?>) 50% 0 repeat-x; <?php } ?> - background-image: none !important; + /*background-image: none !important; */ + color: #<?php echo $colortextback; ?>; } -a.tab:link, a.tab:visited, a.tab:hover, a.tab#active +a.tab:hover { - color: #<?php echo $colortextmain; ?>; - /* font-weight: normal !important; */ + background: rgba(<?php echo $colorbacktabcard1; ?>, 0.5) url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png',1); ?>) 50% 0 repeat-x; + color: #<?php echo $colortextback; ?>; } -a.tab:hover +a.tab:link, a.tab:visited { - background: rgb(<?php echo $colorbacktabcard2; ?>) url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png',1); ?>) 50% 0 repeat-x; + color: #888; + /* font-weight: normal !important; */ } a.tabimage { color: #434956; @@ -1517,9 +1530,9 @@ div.divButAction { margin-bottom: 1.4em; } -moz-border-radius:0px 5px 0px 5px; -webkit-border-radius:0px 5px 0px 5px; border-radius:0px 5px 0px 5px; - -moz-box-shadow: 4px 4px 4px #DDD; - -webkit-box-shadow: 4px 4px 4px #DDD; - box-shadow: 4px 4px 4px #DDD; + -moz-box-shadow: 3px 3px 4px #DDD; + -webkit-box-shadow: 3px 3px 4px #DDD; + box-shadow: 3px 3px 4px #DDD; } <?php if (! empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) { ?> @@ -1589,7 +1602,7 @@ table.border, table.dataTable { table.border td { padding: 1px 2px 1px 2px; - border: 1px solid #9CACBB; + border: 1px solid #D0D0D0; border-collapse: collapse; } @@ -1608,24 +1621,24 @@ table.noborder, table.formdoc, div.noborder { border-collapse: separate !important; border-spacing: 0px; - border-right-width: 0px; - border-right-color: #DDDDDD; + border-right-width: 1px; + border-right-color: #BBBBBB; border-right-style: solid; border-left-width: 1px; - border-left-color: #DDDDDD; + border-left-color: #CCCCCC; border-left-style: solid; border-bottom-width: 1px; - border-bottom-color: #DDDDDD; + border-bottom-color: #BBBBBB; border-bottom-style: solid; margin: 0px 0px 2px 0px; /*padding: 1px 2px 1px 2px;*/ - -moz-box-shadow: 4px 4px 4px #DDD; - -webkit-box-shadow: 4px 4px 4px #DDD; - box-shadow: 4px 4px 4px #DDD; + -moz-box-shadow: 3px 3px 4px #DDD; + -webkit-box-shadow: 3px 3px 4px #DDD; + box-shadow: 3px 3px 4px #DDD; -moz-border-radius: 0.2em; -webkit-border-radius: 0.2em; @@ -1684,9 +1697,9 @@ table.liste { margin-bottom: 2px; margin-top: 0px; - -moz-box-shadow: 4px 4px 4px #DDD; - -webkit-box-shadow: 4px 4px 4px #DDD; - box-shadow: 4px 4px 4px #DDD; + -moz-box-shadow: 3px 3px 4px #DDD; + -webkit-box-shadow: 3px 3px 4px #DDD; + box-shadow: 3px 3px 4px #DDD; } table.liste td { padding-right: 2px; @@ -1700,22 +1713,22 @@ table.liste td { tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable.tr { - height: 20px !important; + height: 26px !important; } div.liste_titre, tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable thead tr { background: rgb(<?php echo $colorbacktitle1; ?>); background-repeat: repeat-x; <?php if ($usecss3) { ?> - background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%); - background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%); - background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%); - background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%); - background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%); + background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 10%, rgb(<?php echo $colorbacktitle2; ?>) 120%); + background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 10%, rgb(<?php echo $colorbacktitle2; ?>) 120%); + background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 40%, rgb(<?php echo $colorbacktitle2; ?>) 120%); + background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 40%, rgb(<?php echo $colorbacktitle2; ?>) 120%); + background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 40%, rgb(<?php echo $colorbacktitle2; ?>) 120%); + font-weight: bold; <?php } ?> - color: #<?php echo $colortextmain; ?>; + color: #<?php echo $colortexttitle; ?>; font-family: <?php print $fontlist ?>; - font-weight: bold; border-bottom: 1px solid #FDFFFF; white-space: <?php echo $dol_optimize_smallscreen?'normal':'nowrap'; ?>; text-align: <?php echo $left; ?>; @@ -1726,7 +1739,10 @@ tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste /*font-weight: normal;*/ border-bottom: 1px solid #FDFFFF; white-space: <?php echo $dol_optimize_smallscreen?'normal':'nowrap'; ?>; - text-shadow:1px 0px 1px #ffffff; + text-shadow: 1px 0px 1px #<?php echo $colorshadowtitle; ?>; +} +.liste_titre td a { + text-shadow: none !important; } div.liste_titre { padding-left: 3px; @@ -1738,7 +1754,7 @@ tr.liste_titre_sel th, th.liste_titre_sel, tr.liste_titre_sel td, td.liste_titre border-bottom: 1px solid #FDFFFF; white-space: <?php echo $dol_optimize_smallscreen?'normal':'nowrap'; ?>; text-decoration: underline; - text-shadow:1px 1px 1px #ffffff; + text-shadow: 1px 0px 1px #<?php echo $colorshadowtitle; ?>; } input.liste_titre { background: transparent; @@ -1826,11 +1842,11 @@ div.tabBar .noborder { .tdboxstats { <?php if ($usecss3) { ?> - background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%) !important; - background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%) !important; - background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%) !important; - background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%) !important; - background: linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%) !important; + background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 120%) !important; + background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 120%) !important; + background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 120%) !important; + background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 120%) !important; + background: linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 120%) !important; <?php } else { ?> background: #ffffff !important; <?php } ?> @@ -1840,19 +1856,19 @@ div.tabBar .noborder { <?php print "float: ".$left.";\n"; ?> margin: 3px; padding: 3px; - /*-moz-box-shadow: 4px 4px 4px #DDD; - -webkit-box-shadow: 4px 4px 4px #DDD; - box-shadow: 4px 4px 4px #DDD; + /*-moz-box-shadow: 3px 3px 4px #DDD; + -webkit-box-shadow: 3px 3px 4px #DDD; + box-shadow: 3px 3px 4px #DDD; margin-bottom: 8px !important;*/ border: 1px solid #AAA; text-align: center; border-radius: 5px; } - + .boxtable { - -moz-box-shadow: 4px 4px 4px #DDD; - -webkit-box-shadow: 4px 4px 4px #DDD; - box-shadow: 4px 4px 4px #DDD; + -moz-box-shadow: 3px 3px 4px #DDD; + -webkit-box-shadow: 3px 3px 4px #DDD; + box-shadow: 3px 3px 4px #DDD; margin-bottom: 8px !important; } @@ -1868,16 +1884,14 @@ tr.box_titre { background: rgb(<?php echo $colorbacktitle1; ?>); background-repeat: repeat-x; <?php if ($usecss3) { ?> - background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%); - background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%); - background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%); - background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%); - background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%); + background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 40%, rgb(<?php echo $colorbacktitle2; ?>) 120%); + background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 40%, rgb(<?php echo $colorbacktitle2; ?>) 120%); + background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 40%, rgb(<?php echo $colorbacktitle2; ?>) 120%); + background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 40%, rgb(<?php echo $colorbacktitle2; ?>) 120%); + background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 40%, rgb(<?php echo $colorbacktitle2; ?>) 120%); <?php } ?> - color: #<?php echo $colortextmain; ?>; - text-shadow:1px 1px 1px #FFFFFF; - /* color: #FFFFFF; - text-shadow:1px 1px 1px #444444; */ + color: #<?php echo $colortexttitle; ?>; + text-shadow: 1px 0px 1px #<?php echo $colorshadowtitle; ?>; font-family: <?php print $fontlist ?>, sans-serif; font-weight: bold; border-bottom: 1px solid #FDFFFF; @@ -2100,13 +2114,16 @@ border-<?php print $right; ?>: solid 1px #444444; border-bottom: solid 1px #444444; padding: 2px; z-index: 3000; -background-color: #FFFFF0; +background-color: #EFCFAA; opacity: 1; -moz-border-radius:6px; -webkit-border-radius: 6px; border-radius: 6px; } - +#tiptip_content { + background-color: rgb(250,240,220); + background-color: rgba(250,240,220,0.94); +} /* ============================================================================== */ /* Calendar */ @@ -2482,9 +2499,9 @@ a.cke_dialog_ui_button -moz-border-radius:0px 5px 0px 5px !important; -webkit-border-radius:0px 5px 0px 5px !important; border-radius:0px 5px 0px 5px !important; - -moz-box-shadow: 4px 4px 4px #DDD !important; - -webkit-box-shadow: 4px 4px 4px #DDD !important; - box-shadow: 4px 4px 4px #DDD !important; + -moz-box-shadow: 3px 3px 4px #DDD !important; + -webkit-box-shadow: 3px 3px 4px #DDD !important; + box-shadow: 3px 3px 4px #DDD !important; } .cke_dialog_ui_hbox_last { @@ -2623,9 +2640,9 @@ div.ecmjqft { /* use or not ? */ div.jnotify-background { opacity : 0.95 !important; - -moz-box-shadow: 4px 4px 4px #888 !important; - -webkit-box-shadow: 4px 4px 4px #888 !important; - box-shadow: 4px 4px 4px #888 !important; + -moz-box-shadow: 3px 3px 4px #888 !important; + -webkit-box-shadow: 3px 3px 4px #888 !important; + box-shadow: 3px 3px 4px #888 !important; } /* ============================================================================== */