From 00f39f9bfd6bc8b14a9415e00dd154633d6e3ed2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 28 Jul 2013 17:02:13 +0200
Subject: [PATCH] Fix: tons of bugs into css. Qual: Remove table for login
informations. Fix: Restore compatibility with IE 8+.
---
ChangeLog | 8 +-
htdocs/main.inc.php | 39 ++--
htdocs/theme/amarok/style.css.php | 23 ++-
htdocs/theme/auguria/style.css.php | 15 +-
htdocs/theme/bureau2crea/style.css.php | 23 ++-
htdocs/theme/cameleo/style.css.php | 15 +-
htdocs/theme/eldy/style.css.php | 273 +++++++++++++------------
7 files changed, 240 insertions(+), 156 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 72a5c386d30..ac01ad98197 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -65,7 +65,8 @@ For developers:
WARNING: This may create regression for some external modules, but was necessary to make
Dolibarr better:
-- We started to clean hooks code. If your hook want to modify value of $actions, it's role
+1) We started to clean hooks code.
+If your hook want to modify value of $actions, it's role
of your hook to modify it. Dolibarr hook code will not decide this for your module anymore.
If your action class for hook was returning a string or an array, instead your module must
set $actionclassinstance->results (to return array)
@@ -74,7 +75,10 @@ to return same thing. The return value must be replaced by a "return 0";
Goal is to fix old compatibility code that does not match hook specifications:
http://wiki.dolibarr.org/index.php/Hooks_system
-- Some methods object->addline used a first parameter that was object->id, some not. Of course
+2) If you implemented hook printTopRightMenu, check that output does not include '<td>' tags anymore.
+All content added must be tagged by a '<div>' with css class="login_block_elem"
+
+3) Some methods object->addline used a first parameter that was object->id, some not. Of course
this was not a good pratice, since object->id is already known so no need to provide it as
parameter. All methods addline in this case were modified to remove this information.
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 78d92c5ee3b..aba63ed674d 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1369,15 +1369,15 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
if (empty($conf->dol_hide_topmenu))
{
- print '<div id="tmenu_tooltip" class="tmenu">'."\n";
-
- // Show menu
+ // Show menu entries
+ print '<div id="tmenu_tooltip" class="tmenu">'."\n";
$menumanager->atarget=$target;
$menumanager->showmenu('top'); // This contains a \n
-
print "</div>\n";
- // Link to login card
+ $form=new Form($db);
+
+ // Define link to login card
$loginhtmltext=''; $logintext='';
if ($user->societe_id)
{
@@ -1434,18 +1434,26 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
}
print '<div class="login_block">'."\n";
- print '<table class="nobordernopadding" summary=""><tr>';
+ //print '<table class="nobordernopadding" summary=""><tr>';
- $form=new Form($db);
+ $toprightmenu.='<div class="login_block_user">';
+ // Add login user link
+ $toprightmenu.=$form->textwithtooltip('',$loginhtmltext,2,1,$logintext,'login_block_elem2',2); // This include div class="login"
+ $toprightmenu.='</div>';
- $toprightmenu.=$form->textwithtooltip('',$loginhtmltext,2,1,$logintext,'',1);
-
- // Execute hook printTopRightMenu (hooks should output string like '<td><div class="login"><a href="">mylink</a></div></td>')
+ $toprightmenu.='<div class="login_block_other">';
+ // Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')
$parameters=array();
- $toprightmenu.=$hookmanager->executeHooks('printTopRightMenu',$parameters); // Note that $action and $object may have been modified by some hooks
+ $result=$hookmanager->executeHooks('printTopRightMenu',$parameters); // Note that $action and $object may have been modified by some hooks
+ if (is_numeric($result))
+ {
+ if (empty($result)) $toprightmenu.=$hookmanager->resPrint; // add
+ else $toprightmenu=$hookmanager->resPrint; // replace
+ }
+ else $toprightmenu.=$result; // For backward compatibility
// Logout link
- $toprightmenu.=$form->textwithtooltip('',$logouthtmltext,2,1,$logouttext,'',1);
+ $toprightmenu.=$form->textwithtooltip('',$logouthtmltext,2,1,$logouttext,'login_block_elem',2);
// Link to print main content area
if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->browser->phone))
@@ -1454,13 +1462,16 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
$text ='<a href="'.$_SERVER["PHP_SELF"].'?'.$qs.($qs?'&':'').'optioncss=print" target="_blank">';
$text.= img_picto('', 'printer.png', 'class="printer"');
$text.='</a>';
- $toprightmenu.=$form->textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'',1);
+ $toprightmenu.=$form->textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'login_block_elem',2);
}
+ $toprightmenu.='</div>';
print $toprightmenu;
- print '</tr></table>'."\n";
+ //print '</tr></table>'."\n";
print "</div>\n";
+
+ unset($form);
}
if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT)) print "</div><!-- End top layout -->\n";
diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php
index edff0511363..8dba7f6241f 100755
--- a/htdocs/theme/amarok/style.css.php
+++ b/htdocs/theme/amarok/style.css.php
@@ -552,13 +552,14 @@ table.login_table .vmenu {
div.login_block {
position:absolute;
- top:5px;
- right:10px;
+ top:0px;
+ right:8px;
z-index:100;
<?php if (GETPOST("optioncss") == 'print') {?>
display:none;
<?php } ?>
}
+div.login_block_user, div.login_block_other { clear: both; }
div.login_block a {color:rgba(255,255,255,.6);}
div.login_block a:hover {color:#ffffff}
@@ -569,14 +570,24 @@ div.login_block table {
div.login {
white-space:nowrap;
- padding: <?php echo ($conf->dol_optimize_smallscreen?'0':'8')?>px 0px 0px 0px;
- margin:0px 0px 0px 8px;
+ /* padding: <?php echo ($conf->dol_optimize_smallscreen?'0':'8')?>px 0px 0px 0px; */
+ /* margin:0px 0px 0px 8px; */
font-weight:bold;
+ float: right;
+}
+.login_block_user {
+ float: right;
+}
+.login_block_elem {
+ float: right;
+ vertical-align: top;
+ padding: 0px 0px 0px 8px !important;
+ height: 16px;
}
img.login, img.printer, img.entity {
- padding: <?php echo ($conf->dol_optimize_smallscreen?'0':'8')?>px 0px 0px 0px;
- margin:0px 0px 0px 8px;
+ /* padding: <?php echo ($conf->dol_optimize_smallscreen?'0':'8')?>px 0px 0px 0px; */
+ margin:2px 0px 0px 0px;
text-decoration:none;
color: white;
font-weight:bold;
diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index 6f5f0d0cc1b..229d26b0c9a 100644
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -319,6 +319,10 @@ else
}
?>
+div#tmenu_tooltip {
+ padding-right: 100px;
+}
+
div.tmenu {
<?php if (GETPOST("optioncss") == 'print') { ?>
display:none;
@@ -539,6 +543,7 @@ form#login {
}
div.login_block {
+ width: 180px;
position: absolute;
<?php print $right; ?>: 5px;
top: 3px;
@@ -572,6 +577,14 @@ div.login a:hover {
color: black;
text-decoration:underline;
}
+.login_block_user {
+ float: right;
+}
+.login_block_elem {
+ float: right;
+ vertical-align: top;
+ padding: 0px 0px 0px 4px !important;
+}
.alogin, .alogin:hover {
color: #888 !important;
@@ -1018,7 +1031,7 @@ div.tabsAction {
a.tabTitle {
- background: #5088A9;
+ background: <? echo empty($dol_use_jmobile)?'#5088A9':'auto'; ?>;
color: white;
font-family: <?php print $fontlist ?>;
font-weight: normal;
diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index 7d287e8351b..aa6e7c02e78 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -17,6 +17,10 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * FIXME: This is a bugged theme:
+ * No wrapping of top menu entries when window not large enough
+ * Not compatible with jmobile
*/
/**
@@ -362,6 +366,12 @@ else
}
?>
+/* This theme is bugged. If width not large enough, menu are not wrapped on next line
+div#tmenu_tooltip {
+ padding-right: 100px;
+}
+*/
+
div.tmenu {
<?php if (GETPOST("optioncss") == 'print') { ?>
display:none;
@@ -466,7 +476,6 @@ ul.tmenu {
li.tmenu, li.tmenusel {
float: <?php print $left; ?>;
- height: 22px;
position:relative;
display: block;
padding: 0px;
@@ -485,10 +494,9 @@ li.tmenu span, li.tmenusel span {
li.tmenu a, li.tmenusel a {
position: relative;
display: block;
- height: 22px;
font-size: 12px;
font-family: Geneva, Verdana, sans-serif;
- line-height: 22px;
+ line-height: 20px;
color: #FFF;
font-weight: normal;
float: <?php print $left; ?>;
@@ -575,6 +583,7 @@ form#login {
}
div.login_block {
+ width: 180px;
position: absolute;
<?php print $right; ?>: 5px;
top: 2px;
@@ -609,6 +618,14 @@ div.login a:hover {
color: black;
text-decoration:underline;
}
+.login_block_user {
+ float: right;
+}
+.login_block_elem {
+ float: right;
+ vertical-align: top;
+ padding: 0px 0px 0px 4px !important;
+}
.alogin, .alogin:hover {
color: #888 !important;
diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php
index 57e13e8efa5..2fe5b2311c9 100644
--- a/htdocs/theme/cameleo/style.css.php
+++ b/htdocs/theme/cameleo/style.css.php
@@ -328,6 +328,10 @@ else
}
?>
+div#tmenu_tooltip {
+ padding-right: 100px;
+}
+
div.tmenu {
<?php if (GETPOST("optioncss") == 'print') { ?>
display:none;
@@ -341,7 +345,7 @@ div.tmenu {
padding: 0px 0px 0px 0px; /* t r b l */
margin: 0px 0px 5px 0px; /* t r b l */
font-weight: normal;
- height: 47px;
+ height: 44px;
background: #FFF;
background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_tmenu.jpg',1); ?>);
background-position: center bottom;
@@ -649,6 +653,7 @@ form#login {
}
div.login_block {
+ width: 180px;
position: absolute;
<?php print $right; ?>: 5px;
top: 3px;
@@ -682,6 +687,14 @@ div.login a:hover {
color: black;
text-decoration:underline;
}
+.login_block_user {
+ float: right;
+}
+.login_block_elem {
+ float: right;
+ vertical-align: top;
+ padding: 0px 0px 0px 4px !important;
+}
.alogin, .alogin:hover {
color: #888 !important;
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index b210fc2a908..a3e3670f828 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -92,11 +92,11 @@ $colblue =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->globa
$isred=max(0,(2*$colred-$colgreen-$colblue)/2); // 0 - 255
$isgreen=max(0,(2*$colgreen-$colred-$colblue)/2); // 0 - 255
$isblue=max(0,(2*$colblue-$colred-$colgreen)/2); // 0 - 255
-$colorback1=($colred-3).','.($colgreen-3).','.($colblue-3); // topmenu
-$colorback2=($colred+5).','.($colgreen+5).','.($colblue+5);
-$colorbacktab1=($colred+15).','.($colgreen+16).','.($colblue+17); // vmenu
-$colorbacktab1b=($colred+5).','.($colgreen+6).','.($colblue+7); // vmenu (not menu)
-$colorbacktab2=($colred-15).','.($colgreen-15).','.($colblue-15);
+$colorbackhmenu1=($colred-3).','.($colgreen-3).','.($colblue-3); // topmenu
+$colorbackhmenu2=($colred+5).','.($colgreen+5).','.($colblue+5);
+$colorbackvmenu1=($colred+15).','.($colgreen+16).','.($colblue+17); // vmenu
+$colorbackvmenu1b=($colred+5).','.($colgreen+6).','.($colblue+7); // vmenu (not menu)
+$colorbackvmenu2=($colred-15).','.($colgreen-15).','.($colblue-15);
$colorbacktitle1=($colred-5).','.($colgreen-5).','.($colblue-5); // title of array
$colorbacktitle2=($colred-15).','.($colgreen-15).','.($colblue-15);
$colorbacktabcard1=($colred+15).','.($colgreen+16).','.($colblue+17); // card
@@ -117,7 +117,7 @@ $fontsizesmaller=empty($conf->dol_optimize_smallscreen)?'11':'14';
// Eldy colors
if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
{
- $conf->global->THEME_ELDY_TOPMENU_BACK1='250,250,250'; // topmenu
+ $conf->global->THEME_ELDY_TOPMENU_BACK1='140,160,185'; // 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)
@@ -144,11 +144,11 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
}
}
-$colorback1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorback1:$conf->global->THEME_ELDY_TOPMENU_BACK1) :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorback1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
-$colorback2 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK2)?$colorback2:$conf->global->THEME_ELDY_TOPMENU_BACK2) :(empty($user->conf->THEME_ELDY_TOPMENU_BACK2)?$colorback2:$user->conf->THEME_ELDY_TOPMENU_BACK2);
-$colorbacktab1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK1)?$colorbacktab1:$conf->global->THEME_ELDY_VERMENU_BACK1) :(empty($user->conf->THEME_ELDY_VERMENU_BACK1)?$colorbacktab1:$user->conf->THEME_ELDY_VERMENU_BACK1);
-$colorbacktab1b =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK1b)?$colorbacktab1:$conf->global->THEME_ELDY_VERMENU_BACK1b) :(empty($user->conf->THEME_ELDY_VERMENU_BACK1b)?$colorbacktab1b:$user->conf->THEME_ELDY_VERMENU_BACK1b);
-$colorbacktab2 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK2)?$colorbacktab2:$conf->global->THEME_ELDY_VERMENU_BACK2) :(empty($user->conf->THEME_ELDY_VERMENU_BACK2)?$colorbacktab2:$user->conf->THEME_ELDY_VERMENU_BACK2);
+$colorbackhmenu1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1) :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
+$colorbackhmenu2 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK2)?$colorbackhmenu2:$conf->global->THEME_ELDY_TOPMENU_BACK2) :(empty($user->conf->THEME_ELDY_TOPMENU_BACK2)?$colorbackhmenu2:$user->conf->THEME_ELDY_TOPMENU_BACK2);
+$colorbackvmenu1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK1)?$colorbackvmenu1:$conf->global->THEME_ELDY_VERMENU_BACK1) :(empty($user->conf->THEME_ELDY_VERMENU_BACK1)?$colorbackvmenu1:$user->conf->THEME_ELDY_VERMENU_BACK1);
+$colorbackvmenu1b =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK1b)?$colorbackvmenu1:$conf->global->THEME_ELDY_VERMENU_BACK1b) :(empty($user->conf->THEME_ELDY_VERMENU_BACK1b)?$colorbackvmenu1b:$user->conf->THEME_ELDY_VERMENU_BACK1b);
+$colorbackvmenu2 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK2)?$colorbackvmenu2:$conf->global->THEME_ELDY_VERMENU_BACK2) :(empty($user->conf->THEME_ELDY_VERMENU_BACK2)?$colorbackvmenu2:$user->conf->THEME_ELDY_VERMENU_BACK2);
$colorbacktitle1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTITLE1) ?$colorbacktitle1:$conf->global->THEME_ELDY_BACKTITLE1) :(empty($user->conf->THEME_ELDY_BACKTITLE1)?$colorbacktitle1:$user->conf->THEME_ELDY_BACKTITLE1);
$colorbacktitle2 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTITLE2) ?$colorbacktitle2:$conf->global->THEME_ELDY_BACKTITLE2) :(empty($user->conf->THEME_ELDY_BACKTITLE2)?$colorbacktitle2:$user->conf->THEME_ELDY_BACKTITLE2);
$colorbacktabcard1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTABCARD1) ?$colorbacktabcard1:$conf->global->THEME_ELDY_BACKTABCARD1) :(empty($user->conf->THEME_ELDY_BACKTABCARD1)?$colorbacktabcard1:$user->conf->THEME_ELDY_BACKTABCARD1);
@@ -173,20 +173,22 @@ if ((! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) && empty($user->conf->
}
// Set text color to black or white
-$tmppart=explode(',',$colorback1);
-$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '');
-$tmpval+=(! empty($tmppart[2]) ? $tmppart[2] : '');
-$tmpval+=(! empty($tmppart[3]) ? $tmppart[3] : '');
-//print $tmpval;
-if ($tmpval < 340) $colortextback='FFF';
-else $colortextback='444';
+$tmppart=explode(',',$colorbackhmenu1);
+$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : '');
+if ($tmpval <= 360) $colortextbackhmenu='FFF';
+else $colortextbackhmenu='444';
+$tmppart=explode(',',$colorbackvmenu1);
+$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : '');
+if ($tmpval <= 360) { $colortextbackvmenu='FFF'; }
+else { $colortextbackvmenu='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'; }
+$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : '');
+if ($tmpval <= 360) { $colortexttitle='FFF'; $colorshadowtitle='000'; }
else { $colortexttitle='444'; $colorshadowtitle='FFF'; }
+$tmppart=explode(',',$colorbacktabcard1);
+$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : '');
+if ($tmpval <= 340) { $colortextbacktab='FFF'; }
+else { $colortextbacktab='444'; }
$usecss3=true;
@@ -430,13 +432,14 @@ td.showDragHandle {
/* ============================================================================== */
#id-container {
- display: table;
- table-layout: fixed;
+ margin-top: 8px;
+ display: table;
+ table-layout: fixed;
}
#id-right, #id-left {
- display: table-cell;
- float: none;
- vertical-align: top;
+ display: table-cell;
+ float: none;
+ vertical-align: top;
}
#id-<?php echo $right; ?> {
width: 100%;
@@ -494,18 +497,22 @@ else
?>
div#tmenu_tooltip {
-<?php if (! empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED) || ! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)) {
- $colortexttopmenu=$colortextback;
-?>
- background: rgb(<?php echo $colorback1 ?>);
-<?php } else {
- $colortexttopmenu='000000';
-?>
- background: rgb(<?php echo $colorback1 ?>);
-<?php
- }
-?>
- margin-bottom: 10px;
+ height: 40px;
+ /* margin-bottom: 24px; */
+ padding-right: 100px;
+ background: <?php echo $colorbackvmenu; ?>;
+ box-shadow: 0 0 6px rgba(0, 0, 0, .4) !important;
+ <?php if ($usecss3) { ?>
+ background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%);
+ background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%);
+ background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%);
+ background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%);
+ background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%);
+ background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(128,128,128,.3)) );
+ <?php } else { ?>
+ background-image: rgb(<?php echo $colorbackhmenu1; ?>);
+ border-bottom: 1px solid #CCC;
+ <?php } ?>
}
div.tmenudiv {
@@ -523,25 +530,10 @@ div.tmenudiv {
font-size: 13px;
font-weight: normal;
height: <?php print ($heightmenu+1); ?>px;
-
-<?php if ($usecss3) { ?>
- 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;
text-decoration: none;
<?php } ?>
}
-
div.tmenudisabled, a.tmenudisabled {
opacity: 0.6;
}
@@ -561,11 +553,11 @@ a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active {
padding: 0px 5px 0px 5px;
white-space: nowrap;
/* text-shadow: 1px 1px 1px #000000; */
- color: #<?php echo $colortexttopmenu; ?>;
+ color: #<?php echo $colortextbackhmenu; ?>;
text-decoration: none;
}
a.tmenu:link, a.tmenu:visited {
- color: #<?php echo $colortexttopmenu; ?>;
+ color: #<?php echo $colortextbackhmenu; ?>;
}
a.tmenu:hover, a.tmenu:active {
margin: 0px 0px 0px 0px;
@@ -575,7 +567,7 @@ a.tmenu:hover, a.tmenu:active {
/* border-bottom: 2px solid #F4F4F4; */
/* background: #F4F4F4; */
/* text-shadow: 1px 1px 1px #FFFFFF !important; */
- color: #<?php echo $colortexttopmenu; ?>;
+ color: #<?php echo $colortextbackhmenu; ?>;
}
a.tmenusel:link, a.tmenusel:visited, a.tmenusel:hover, a.tmenusel:active {
@@ -589,7 +581,7 @@ a.tmenusel:link, a.tmenusel:visited, a.tmenusel:hover, a.tmenusel:active {
/* border-bottom: 2px solid #F4F4F4; */
white-space: nowrap;
/* text-shadow: 1px 1px 1px #FFFFFF;*/
- color: #<?php echo $colortexttopmenu; ?>;
+ color: #<?php echo $colortextbackhmenu; ?>;
text-decoration: none !important;
}
@@ -598,7 +590,23 @@ ul.tmenu { /* t r b l */
padding: 0px 0px 0px 0px;
margin: 0px 0px 0px 0px;
list-style: none;
- height: <?php print $heightmenu; ?>px;
+ /* height: <?php print $heightmenu; ?>px; */
+ box-shadow: 0 0 6px rgba(0, 0, 0, .4) !important;
+}
+ul.tmenu li {
+ background: rgb(<?php echo $colorbackhmenu1 ?>);
+
+ <?php if ($usecss3) { ?>
+ background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
+ background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
+ background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
+ background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
+ background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
+ background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(0,0,0,.3)) );
+ <?php } else { ?>
+ background-image: rgb(<?php echo $colorbackhmenu1; ?>);
+ border-bottom: 1px solid #CCC;
+ <?php } ?>
}
li.tmenu, li.tmenusel {
<?php print $minwidthtmenu?'min-width: '.$minwidthtmenu.'px;':''; ?>
@@ -608,20 +616,20 @@ li.tmenu, li.tmenusel {
height: <?php print $heightmenu; ?>px;
position:relative;
display: block;
- padding: 0px 0px 0px 0px;
+ padding: 0px 0px 2px 0px;
margin: 0px 0px 0px 0px;
font-weight: normal;
}
-li.tmenu:hover, li.tmenusel {
-<?php if ($usecss3) { ?>
- /* background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%); */
- /* background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%);*/
- /* background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 40%, rgb(<?php echo $colorback2; ?>) 60%, rgb(<?php echo $colorback1; ?>) 100%); */
- /* background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%);*/
- /* background-image: linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%); */
- background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png',1); ?>) 50% 0 repeat-x;
-<?php } ?>
+li.tmenusel, li.tmenu:hover {
+ background-image: -o-linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important;
+ background-image: -moz-linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important;
+ background-image: -webkit-linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important;
+ background-image: -ms-linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important;
+ background-image: linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important;
+ background: rgb(<?php echo $colorbackhmenu1 ?>);
+ /* background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png',1); ?>) 50% 0 repeat-x !important; Nicer but problem when menu wrap on 2 lines */
}
+.tmenuend .tmenuleft { width: 0px; }
div.tmenuleft
{
width: 5px;
@@ -641,7 +649,7 @@ div.tmenucenter
.mainmenuaspan
{
padding-right: 4px;
- text-shadow: 1px 1px 1px #DDD;
+ /*text-shadow: 1px 1px 1px #DDD;*/
}
div.mainmenu {
@@ -876,28 +884,35 @@ div.login_block {
<?php print $right; ?>: 5px;
top: 3px;
font-weight: bold;
+ max-width: 110px;
<?php if (GETPOST("optioncss") == 'print') { ?>
display: none;
<?php } ?>
}
-
div.login_block table {
display: inline;
}
-
div.login {
white-space:nowrap;
- padding: <?php echo ($conf->dol_optimize_smallscreen?'0':'8')?>px 0px 0px 0px;
- margin: 0px 0px 0px 8px;
+ /* padding: <?php echo ($conf->dol_optimize_smallscreen?'0':'8')?>px 0px 0px 0px; */
+ /* margin: 0px 0px 0px 8px; */
font-weight: bold;
+ float: right;
}
div.login a {
- color: #<?php echo $colortextback; ?>;
+ color: #<?php echo $colortextbackvmenu; ?>;
}
div.login a:hover {
- color: #<?php echo $colortextback; ?>;
+ color: #<?php echo $colortextbackvmenu; ?>;
text-decoration:underline;
}
+div.login_block_user, div.login_block_other { clear: both; }
+.login_block_elem {
+ float: right;
+ vertical-align: top;
+ padding: 0px 0px 0px 4px !important;
+ height: 16px;
+}
.alogin, .alogin:hover {
color: #888 !important;
font-weight: normal !important;
@@ -907,8 +922,8 @@ div.login a:hover {
text-decoration:underline !important;
}
img.login, img.printer, img.entity {
- padding: <?php echo ($conf->dol_optimize_smallscreen?'0':'8')?>px 0px 0px 0px;
- margin: 0px 0px 0px 8px;
+ /* padding: 0px 0px 0px 4px; */
+ /* margin: 0px 0px 0px 8px; */
text-decoration: none;
color: white;
font-weight: bold;
@@ -940,11 +955,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 $colortextback; ?>; }
+a.vmenu:link, a.vmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; }
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 $colortextback; ?>; }
+a.vsmenu:link, a.vsmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; }
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; }
@@ -964,11 +979,11 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks
<?php if ($usecss3) { ?>
- background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorbacktab2; ?>) 0px, rgb(<?php echo $colorbacktab1; ?>) 3px);
- background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacktab2; ?>) 0px, rgb(<?php echo $colorbacktab1; ?>) 3px);
- background-image: -webkit-linear-gradient(right, rgb(<?php echo $colorbacktab2; ?>) 0px, rgb(<?php echo $colorbacktab1; ?>) 3px);
- background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktab2; ?>) 0px, rgb(<?php echo $colorbacktab1; ?>) 3px);
- background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktab2; ?>) 0px, rgb(<?php echo $colorbacktab1; ?>) 3px);
+ background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorbackvmenu2; ?>) 0px, rgb(<?php echo $colorbackvmenu1; ?>) 3px);
+ background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorbackvmenu2; ?>) 0px, rgb(<?php echo $colorbackvmenu1; ?>) 3px);
+ background-image: -webkit-linear-gradient(right, rgb(<?php echo $colorbackvmenu2; ?>) 0px, rgb(<?php echo $colorbackvmenu1; ?>) 3px);
+ background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbackvmenu2; ?>) 0px, rgb(<?php echo $colorbackvmenu1; ?>) 3px);
+ background-image: linear-gradient(bottom, rgb(<?php echo $colorbackvmenu2; ?>) 0px, rgb(<?php echo $colorbackvmenu1; ?>) 3px);
<?php } else { ?>
background-position:top;
@@ -999,11 +1014,11 @@ div.blockvmenusearch
background: #E3E6E8;
<?php if ($usecss3) { ?>
- 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%);
+ background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1; ?>) 90%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
+ background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1; ?>) 90%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
+ background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1; ?>) 90%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
+ background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1; ?>) 90%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
+ background-image: linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1; ?>) 90%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
<?php } ?>
border-left: 1px solid #DDDDDD;
@@ -1033,11 +1048,11 @@ div.blockvmenubookmarksold
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 $colorbackvmenu1b; ?>) 90%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
+ background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1b; ?>) 90%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
+ background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1b; ?>) 90%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
+ background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1b; ?>) 90%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
+ background-image: linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1b; ?>) 90%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
<?php } ?>
border-left: 1px solid #CCCCCC;
@@ -1115,23 +1130,22 @@ td.photo {
.largebutton {
<?php if ($usecss3) { ?>
- background-image: -o-linear-gradient(bottom, rgb(<?php echo '240,240,240'; ?>) 15%, rgb(<?php echo '255,255,255'; ?>) 100%) !important;
- background-image: -moz-linear-gradient(bottom, rgb(<?php echo '240,240,240'; ?>) 15%, rgb(<?php echo '255,255,255'; ?>) 100%) !important;
- background-image: -webkit-linear-gradient(bottom, rgb(<?php echo '240,240,240'; ?>) 15%, rgb(<?php echo '255,255,255'; ?>) 100%) !important;
- background-image: -ms-linear-gradient(bottom, rgb(<?php echo '240,240,240'; ?>) 15%, rgb(<?php echo '255,255,255'; ?>) 100%) !important;
- background-image: linear-gradient(bottom, rgb(<?php echo '240,240,240'; ?>) 15%, rgb(<?php echo '255,255,255'; ?>) 100%) !important;
-<?php } else { ?>
- background-image: url(<?php echo dol_buildpath($path.'/theme/'.$conf->theme.'/img/tmenu2.jpg',1); ?>) !important;
- background-repeat: repeat-x !important;
+ background-image: -o-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important;
+ background-image: -moz-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important;
+ background-image: -webkit-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important;
+ background-image: -ms-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important;
+ background-image: linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important;
<?php } ?>
- border: 1px solid #CCC !important;
+ background: #FFF;
+ background-repeat: repeat-x !important;
+ border: 1px solid #CCC !important;
-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: 3px 3px 4px #DDD;
- -webkit-box-shadow: 3px 3px 4px #DDD;
- box-shadow: 3px 3px 4px #DDD;
+ -moz-box-shadow: 2px 2px 4px #DDD;
+ -webkit-box-shadow: 2px 2px 4px #DDD;
+ box-shadow: 2px 2px 4px #DDD;
padding: 0 4px 0 4px !important;
}
@@ -1354,7 +1368,7 @@ div.tabs {
div.tabsElem { margin-top: 8px; } /* To avoid overlap of tabs when not browser */
div.tabBar {
- color: #<?php echo $colortextback; ?>;
+ color: #<?php echo $colortextbacktab; ?>;
padding-top: 9px;
padding-left: <?php echo ($dol_optimize_smallscreen?'4':'8'); ?>px;
padding-right: <?php echo ($dol_optimize_smallscreen?'4':'8'); ?>px;
@@ -1427,11 +1441,11 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
border-top: 1px solid #D8D8D8;
<?php if ($usecss3) { ?>
- background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
- background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
- 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%);
+ background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1; ?>) 35%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
+ background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1; ?>) 35%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
+ background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1; ?>) 35%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
+ background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1; ?>) 35%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
+ background-image: linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1; ?>) 35%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
<?php } ?>
background-image: none !important;
}
@@ -1444,16 +1458,16 @@ a.tab#active {
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; */
- color: #<?php echo $colortextback; ?>;
+ color: #<?php echo $colortextbacktab; ?>;
}
a.tab:hover
{
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; ?>;
+ color: #<?php echo $colortextbacktab; ?>;
}
a.tab:link, a.tab:visited
{
- color: #888;
+ /* color: #888; */
/* font-weight: normal !important; */
}
a.tabimage {
@@ -1733,11 +1747,11 @@ div.liste_titre, tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.list
background: rgb(<?php echo $colorbacktitle1; ?>);
background-repeat: repeat-x;
<?php if ($usecss3) { ?>
- 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%);
+ background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
+ background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
+ background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
+ background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
+ background-image: linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
font-weight: bold;
<?php } ?>
color: #<?php echo $colortexttitle; ?>;
@@ -1898,11 +1912,12 @@ 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; ?>) 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%);
+ background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
+ background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
+ background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
+ background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
+ background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
+ background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(0,0,0,.3)) );
<?php } ?>
color: #<?php echo $colortexttitle; ?>;
text-shadow: 1px 0px 1px #<?php echo $colorshadowtitle; ?>;
@@ -2112,8 +2127,8 @@ opacity: 1;
border-radius: 6px;
}
#tiptip_content {
- background-color: rgb(250,240,220);
- background-color: rgba(250,240,220,0.94);
+ background-color: rgb(252,248,246);
+ background-color: rgba(252,248,246,0.95);
}
/* ============================================================================== */
--
GitLab