diff --git a/htdocs/.gitignore b/htdocs/.gitignore index dfa990ed38c..8c416b1e28c 100644 --- a/htdocs/.gitignore +++ b/htdocs/.gitignore @@ -2,3 +2,4 @@ /custom* /bootstrap /multicompany +/skincoloreditor diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index d541808ae36..15ea8b2cc2c 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -378,7 +378,7 @@ class FormFile $out.= ''; $out.= '
'.$titletoshow.'
'; - $out.= ''; + $out.= '
'; $out.= ''; diff --git a/htdocs/theme/amarok/graph-color.php b/htdocs/theme/amarok/graph-color.php index f0a27c30243..12662b3bdc6 100755 --- a/htdocs/theme/amarok/graph-color.php +++ b/htdocs/theme/amarok/graph-color.php @@ -22,10 +22,10 @@ * \ingroup core */ -global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet; -$theme_bordercolor = array(235,235,224); -$theme_datacolor = array(array(101,191,112), array(164,206,230), array(248,128,128), array(252,245,184), array(190,190,190)); -$theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4')); -$theme_bgcoloronglet = array(hexdec('DE'),hexdec('E7'),hexdec('EC')); +global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet; +$theme_bordercolor = array(235,235,224); +$theme_datacolor = array(array(125,135,150), array(200,160,180), array(190,190,220), array(170,140,190), array(190,190,170)); +$theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4')); +$theme_bgcoloronglet = array(hexdec('DE'),hexdec('E7'),hexdec('EC')); ?> diff --git a/htdocs/theme/amarok/img/vmenu.png b/htdocs/theme/amarok/img/vmenu.png index 386261c83ae..74d696bf6b2 100755 Binary files a/htdocs/theme/amarok/img/vmenu.png and b/htdocs/theme/amarok/img/vmenu.png differ diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php index 23b030249ca..3202f868356 100755 --- a/htdocs/theme/amarok/style.css.php +++ b/htdocs/theme/amarok/style.css.php @@ -303,23 +303,6 @@ td.showDragHandle {cursor:move;} .tdlineupdown {white-space:nowrap;} -/* ============================================================================== */ -/* Styles de positionnement des zones */ -/* ============================================================================== */ - -td.vmenu { - - margin-right:2px; - padding:0px; - width:170px; - -} - -div.fiche { - padding:8px 12px 10px; -} - - /* ============================================================================== */ /* Menu top et 1ère ligne tableau */ /* ============================================================================== */ @@ -424,7 +407,6 @@ div.vmenu { display:none; width:170px; - background-color:#dde2e9; } @@ -632,8 +614,18 @@ a.tabTitle img { /* Styles de positionnement des zones */ /* ============================================================================== */ +td.vmenu { + + margin-right:2px; + padding:0px; + width:170px; + /* border-right: 1px solid #666666; */ + +} + div.fiche { - margin-: browser->phone) || empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))?'20':'24'; ?>px; + padding:8px 12px 10px; + margin-: browser->phone) || empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))?'16':'24'; ?>px; margin-: browser->phone)?'12':'6'; ?>px; } @@ -670,9 +662,9 @@ div.ficheaddleft { /* ============================================================================== */ /* boutons : */ -.button, .butAction {background: #999;border: solid 1px #666;} -.butActionRefused {background: #eaeaea; color:rgba(0,0,0,0.6)} -.butActionDelete {background: #b33c37;border:solid 1px #8d2f2b;} +.button, .butAction {background: #999; border: solid 1px #888; font-weight: normal; } +.butActionRefused {background: #eaeaea; color:rgba(0,0,0,0.6); font-weight: normal;} +.butActionDelete {background: #b33c37; border:solid 1px #8d2f2b; font-weight: normal;} .button, .butAction, .butActionRefused, .butActionDelete { padding:2px; @@ -701,9 +693,9 @@ border-left: solid 1px rgba(0,0,0,.3); ); } -.button, a.butAction{color:black;} +.button, a.butAction {color: white; font-weight: normal !important;} -.butActionDelete{color:white;} +.butAction, .butActionDelete {color:white;} td.formdocbutton {padding-top:6px;} @@ -720,6 +712,7 @@ td.formdocbutton {padding-top:6px;} color-stop(1, rgba(255,255,255,.3)), color-stop(0, rgba(0,0,0,.3)) ); + color:white; } /* ============================================================================== */ @@ -873,6 +866,7 @@ tr.liste_titre, tr.box_titre { color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(0,0,0,.3)) ); + height: 22px; } tr.box_titre td.boxclose { diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index aa3e808366b..c0cb4ed479b 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -108,7 +108,7 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) { $conf->global->THEME_ELDY_TOPMENU_BACK1='180,196,216'; // topmenu $conf->global->THEME_ELDY_TOPMENU_BACK2='190,206,226'; - $conf->global->THEME_ELDY_VERMENU_BACK1='246,248,250'; // vmenu + $conf->global->THEME_ELDY_VERMENU_BACK1='253,253,253'; // vmenu $conf->global->THEME_ELDY_VERMENU_BACK1b='226,228,230'; // vmenu (not menu) $conf->global->THEME_ELDY_VERMENU_BACK2='220,224,227'; $conf->global->THEME_ELDY_BACKTITLE1='140,160,185'; // title of arrays @@ -397,12 +397,9 @@ div#tmenu_tooltip { ?> background: rgb(); background: rgb(); - /* background: #305582; *//* 2C68A3 */ @@ -419,7 +416,6 @@ div.tmenudiv { border-top: 0px solid #D3E5EC; border-: 0px; border-: 0px solid #555555; - border-bottom: 1px solid #FFFFFF; padding: 0px 0px 0px 0px; /* t r b l */ margin: 0px 0px 0px 0px; /* t r b l */ font-size: 13px; @@ -433,8 +429,11 @@ div.tmenudiv { /* background-image: -ms-linear-gradient(bottom, rgb() 75%, rgb() 100%);*/ /* background-image: linear-gradient(bottom, rgb() 75%, rgb() 100%); */ background: url() 50% 0% repeat-x; + border-bottom: 1px solid rgb(); + box-shadow: 0 0 6px rgba(0, 0, 0, .4) !important; - background-image: url(); + border-bottom: 1px solid #DDDDDD; + background-image: url(); background-position:top; background-repeat:repeat-x; @@ -840,11 +839,12 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks margin: 1px 0px 8px 2px; - background-image: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background-image: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background-image: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background-image: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background-image: linear-gradient(bottom, rgb() 85%, rgb() 100%); + background-image: -o-linear-gradient(bottom, rgb() 80%, rgb() 100%); + background-image: -moz-linear-gradient(bottom, rgb() 90%, rgb() 100%); +/* background-image: -webkit-linear-gradient(bottom, rgb() 20px, rgb() 100%); */ + background-image: -webkit-linear-gradient(top, rgb() 0px, rgb() 10px); + background-image: -ms-linear-gradient(bottom, rgb() 90%, rgb() 100%); + background-image: linear-gradient(bottom, rgb() 90%, rgb() 100%); background-image: url(); background-position:top; @@ -858,7 +858,6 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks -moz-box-shadow: 4px 4px 4px #CCC; -webkit-box-shadow: 4px 4px 4px #CCC; box-shadow: 4px 4px 4px #CCC; - } div.blockvmenusearch @@ -876,11 +875,11 @@ div.blockvmenusearch background: #E3E6E8; - background-image: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background-image: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background-image: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background-image: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background-image: linear-gradient(bottom, rgb() 85%, rgb() 100%); + background-image: -o-linear-gradient(bottom, rgb() 90%, rgb() 100%); + background-image: -moz-linear-gradient(bottom, rgb() 90%, rgb() 100%); + background-image: -webkit-linear-gradient(bottom, rgb() 90%, rgb() 100%); + background-image: -ms-linear-gradient(bottom, rgb() 90%, rgb() 100%); + background-image: linear-gradient(bottom, rgb() 90%, rgb() 100%); border-left: 1px solid #CCCCCC; @@ -910,11 +909,11 @@ div.blockvmenubookmarksold background: #E3E6E8; - background-image: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background-image: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background-image: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background-image: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background-image: linear-gradient(bottom, rgb() 85%, rgb() 100%); + background-image: -o-linear-gradient(bottom, rgb() 90%, rgb() 100%); + background-image: -moz-linear-gradient(bottom, rgb() 90%, rgb() 100%); + background-image: -webkit-linear-gradient(bottom, rgb() 90%, rgb() 100%); + background-image: -ms-linear-gradient(bottom, rgb() 90%, rgb() 100%); + background-image: linear-gradient(bottom, rgb() 90%, rgb() 100%); border-left: 1px solid #CCCCCC;