diff --git a/htdocs/cashdesk/affContenu.php b/htdocs/cashdesk/affContenu.php index 6d8f5ca83ee..3f27d19c7f3 100644 --- a/htdocs/cashdesk/affContenu.php +++ b/htdocs/cashdesk/affContenu.php @@ -56,6 +56,7 @@ exit;*/ // Left area with selected articles (area for article, amount and payments) +print '
'; print '
'; $page=GETPOST('menu','alpha'); @@ -78,16 +79,17 @@ else } print '
'; - +print '
'; // Right area with selected articles (shopping cart) +print '
'; print '
'; require ('tpl/liste_articles.tpl.php'); print '
'; - +print '
'; $_SESSION['serObjFacturation'] = serialize($obj_facturation); diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css index f62a9193830..d639230564b 100644 --- a/htdocs/cashdesk/css/style.css +++ b/htdocs/cashdesk/css/style.css @@ -15,7 +15,7 @@ */ body { - background: #eee; + background: #fff; color: #333; margin: 0; padding: 0; @@ -30,9 +30,9 @@ p { .conteneur { background: #fff; text-align: left; - max-width: 770px; - margin: 10px auto; - border: 2px solid #000; + /*max-width: 770px;*/ + /*margin: 10px auto; + border: 2px solid #000;*/ } .conteneur_img_gauche { @@ -43,6 +43,11 @@ p { /* background: url("../img/bg_conteneur_droite.png") top right repeat-y; */ } +.contenu { + width: 100%; + text-align: center; +} + /* ------------------- Header ------------------- */ .entete { height: 15px; @@ -138,6 +143,7 @@ li.menu_choix0 { margin-right: 20px; border: 1px dotted #5ca64d; padding-bottom: 10px; + vertical-align: middle; } p.titre { @@ -192,8 +198,10 @@ p.titre { /* ------------------- Contenu ------------------- */ .principal_login { - margin: 30px; + margin: 10px; padding: 0; + max-width: 800px; + text-align: left; } .formulaire_login { @@ -221,8 +229,7 @@ p.titre { float: left; margin: 0 15px; padding: 0; - max-width: 500px; - width: 100%; + max-width: 900px; } .titre1 { diff --git a/htdocs/cashdesk/index.php b/htdocs/cashdesk/index.php index fa1c6723d20..44d096ab478 100644 --- a/htdocs/cashdesk/index.php +++ b/htdocs/cashdesk/index.php @@ -60,10 +60,11 @@ top_htmlhead('','',0,0,'',$arrayofcss);

-'; + ?> + diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index b88fcb187de..299a860380b 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -535,12 +535,15 @@ td.showDragHandle { /* ============================================================================== */ #id-container { - margin-top: 12px; - margin-bottom: 8px; + /* margin-top: 12px; + margin-bottom: 8px; */ display: table; table-layout: fixed; } #id-right, #id-left { + padding-top: 12px; + padding-bottom: 8px; + display: table-cell; float: none; vertical-align: top; @@ -1113,7 +1116,7 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks background: rgb(); - border-left: 1px solid #AAA; + /*border-left: 1px solid #AAA; border-right: 1px solid #BBB; border-bottom: 1px solid #BBB; border-top: 1px solid #BBB; @@ -1122,6 +1125,7 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks -moz-box-shadow: 3px 3px 4px #DDD; -webkit-box-shadow: 3px 3px 4px #DDD; box-shadow: 3px 3px 4px #DDD; + */ } div.blockvmenusearch @@ -1136,7 +1140,7 @@ div.blockvmenusearch padding-bottom: 3px; margin: 1px 0px 8px 2px; background: rgb(); - +/* border-left: 1px solid #AAA; border-right: 1px solid #CCC; border-bottom: 1px solid #CCC; @@ -1146,6 +1150,7 @@ div.blockvmenusearch -moz-box-shadow: 3px 3px 4px #DDD; -webkit-box-shadow: 3px 3px 4px #DDD; box-shadow: 3px 3px 4px #DDD; + */ } div.blockvmenusearch > form > div {