From 2639554cff7db87fa1c59e0a9cdad5d0445b17ed Mon Sep 17 00:00:00 2001 From: Laurent Destailleur <eldy@destailleur.fr> Date: Sat, 19 Mar 2016 18:46:44 +0100 Subject: [PATCH] Clean css for POS. Start to move css into theme. --- htdocs/cashdesk/affIndex.php | 2 -- htdocs/cashdesk/css/style.css | 42 ++++++++--------------------- htdocs/cashdesk/index.php | 3 +-- htdocs/theme/eldy/style.css.php | 48 ++++++++++++++++++++++++++++++--- htdocs/theme/md/style.css.php | 45 ++++++++++++++++++++++++++++++- 5 files changed, 101 insertions(+), 39 deletions(-) diff --git a/htdocs/cashdesk/affIndex.php b/htdocs/cashdesk/affIndex.php index 6ac2915a9d1..bfc49044bf8 100644 --- a/htdocs/cashdesk/affIndex.php +++ b/htdocs/cashdesk/affIndex.php @@ -62,8 +62,6 @@ print '<div class="conteneur">'."\n"; print '<div class="conteneur_img_gauche">'."\n"; print '<div class="conteneur_img_droite">'."\n"; -print '<h1 class="entete"><span>POINT OF SALE</span></h1>'."\n"; - print '<div class="menu_principal">'."\n"; include_once 'tpl/menu.tpl.php'; print '</div>'."\n"; diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css index bbb03bafde5..e606c8d2807 100644 --- a/htdocs/cashdesk/css/style.css +++ b/htdocs/cashdesk/css/style.css @@ -20,7 +20,6 @@ body { margin: 0; padding: 0; text-align: center; - font: 0.7em verdana, arial, helvetica; } p { @@ -46,6 +45,15 @@ p { .contenu { width: 100%; text-align: center; + padding-top: 20px; +} + +.logo { + text-align: center; +} +.logopos { + padding-top: 20px; + max-height: 40px; } /* ------------------- Header ------------------- */ @@ -61,7 +69,7 @@ p { /* ------------------- Menu ------------------- */ .menu_principal { - margin: 0 20px 20px 15px; + margin: 0; font-size: 14px; height: 84px; background: #CCCCCC; @@ -80,7 +88,7 @@ p { .menu { margin: 0; list-style-type: none; - padding: 10px 0 0; + padding: 8px 0 0; } .menu li { @@ -88,34 +96,6 @@ p { padding-right: 10px; } -.menu_choix1,.menu_choix2 { - font-size: 1.4em; - text-align: left; -} - -.menu_choix1 a,.menu_choix2 a { - display: block; - color: #fff; - text-decoration: none; - padding-top: 18px; - padding-left: 54px; - font-size: 14px; - height: 48px; - background: url('../img/new.png') top left no-repeat; -} - -.menu_choix1 a { - background: url('../img/new.png') top left no-repeat; -} - -.menu_choix2 a { - background: url('../img/gescom.png') top left no-repeat; -} - -.menu_choix1 a:hover,.menu_choix2 a:hover { - color: #6d3f6d; -} - .menu_choix0 { font-size: 10px; text-align: right; diff --git a/htdocs/cashdesk/index.php b/htdocs/cashdesk/index.php index 44d096ab478..3a5b54519a8 100644 --- a/htdocs/cashdesk/index.php +++ b/htdocs/cashdesk/index.php @@ -58,9 +58,8 @@ top_htmlhead('','',0,0,'',$arrayofcss); <div class="conteneur_img_gauche"> <div class="conteneur_img_droite"> -<h1 class="entete"></h1> - <div class="menu_principal hideonsmartphone"> +<div class="logo"><?php print '<img class="logopos" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&file='.urlencode('/thumbs/'.$mysoc->logo_small).'">'; ?></div> </div> <div class="contenu"> diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 84e00598056..c928b54d066 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -4038,12 +4038,54 @@ border-top-right-radius: 6px; +/* ============================================================================== */ +/* POS */ +/* ============================================================================== */ + +.menu_choix1 a { + background: url('<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus_black/money.png',1) ?>') top left no-repeat; +} + +.menu_choix2 a { + background: url('<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus_black/home.png',1) ?>') top left no-repeat; +} +.menu_choix1,.menu_choix2 { + font-size: 1.4em; + text-align: left; + border: 1px solid #666; + margin-right: 20px; +} +.menu_choix1 a, .menu_choix2 a { + display: block; + color: #fff; + text-decoration: none; + padding-top: 18px; + padding-left: 54px; + font-size: 14px; + height: 40px; +} +.menu_choix1 a:hover,.menu_choix2 a:hover { + color: #6d3f6d; +} + + + +/* ============================================================================== */ +/* Demo */ +/* ============================================================================== */ + + /* For demo pages */ img.demothumb { box-shadow: 2px 2px 8px #888; } + +/* ============================================================================== */ +/* Public */ +/* ============================================================================== */ + /* The theme for public pages */ .public_body { margin: 20px; @@ -4055,9 +4097,9 @@ img.demothumb { - - -/* CSS style used for small screen */ +/* ============================================================================== */ +/* CSS style used for small screen */ +/* ============================================================================== */ .imgopensurveywizard { diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 3dcf6d99eb6..15f763ef901 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -3867,13 +3867,56 @@ border-top-right-radius: 6px; -/* For demo pages */ +/* ============================================================================== */ +/* POS */ +/* ============================================================================== */ + +.menu_choix1 a { + background: url('<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money.png',1) ?>') top left no-repeat; + background-position-y: 15px; +} + +.menu_choix2 a { + background: url('<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/home.png',1) ?>') top left no-repeat; + background-position-y: 15px; +} +.menu_choix1,.menu_choix2 { + font-size: 1.4em; + text-align: left; + border: 1px solid #666; + margin-right: 20px; +} +.menu_choix1 a, .menu_choix2 a { + display: block; + color: #fff; + text-decoration: none; + padding-top: 18px; + padding-left: 54px; + font-size: 14px; + height: 40px; +} +.menu_choix1 a:hover,.menu_choix2 a:hover { + color: #6d3f6d; +} + + + + +/* ============================================================================== */ +/* Demo */ +/* ============================================================================== */ + img.demothumb { box-shadow: 2px 2px 8px #888; margin-bottom: 4px; } + +/* ============================================================================== */ +/* Public */ +/* ============================================================================== */ + /* The theme for public pages */ .public_body { margin: 20px; -- GitLab