2
0
forked from Wavyzz/dolibarr

CSS Better visibility for buttons and status

This commit is contained in:
Laurent Destailleur
2020-08-02 00:15:21 +02:00
parent f5d7e94d7e
commit d08c42a205
5 changed files with 35 additions and 19 deletions

View File

@@ -8215,14 +8215,13 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
} }
// TODO : add a hook // TODO : add a hook
if ($displayMode == 0) { if ($displayMode == 0) {
$return = !empty($html) ? $html : $statusLabel; $return = !empty($html) ? $html : (empty($conf->dol_optimize_smallscreen) ? $statusLabel : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort));
} elseif ($displayMode == 1) { } elseif ($displayMode == 1) {
$return = !empty($html) ? $html : (!empty($statusLabelShort) ? $statusLabelShort : $statusLabel); $return = !empty($html) ? $html : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort);
} // Use status with images (for backward compatibility) } // Use status with images (for backward compatibility)
elseif (!empty($conf->global->MAIN_STATUS_USES_IMAGES)) { elseif (!empty($conf->global->MAIN_STATUS_USES_IMAGES)) {
$return = ''; $return = '';
$htmlLabel = (in_array($displayMode, array(1, 2, 5)) ? '<span class="hideonsmartphone">' : '').(!empty($html) ? $html : $statusLabel).(in_array($displayMode, array(1, 2, 5)) ? '</span>' : ''); $htmlLabel = (in_array($displayMode, array(1, 2, 5)) ? '<span class="hideonsmartphone">' : '').(!empty($html) ? $html : $statusLabel).(in_array($displayMode, array(1, 2, 5)) ? '</span>' : '');
$htmlLabelShort = (in_array($displayMode, array(1, 2, 5)) ? '<span class="hideonsmartphone">' : '').(!empty($html) ? $html : (!empty($statusLabelShort) ? $statusLabelShort : $statusLabel)).(in_array($displayMode, array(1, 2, 5)) ? '</span>' : ''); $htmlLabelShort = (in_array($displayMode, array(1, 2, 5)) ? '<span class="hideonsmartphone">' : '').(!empty($html) ? $html : (!empty($statusLabelShort) ? $statusLabelShort : $statusLabel)).(in_array($displayMode, array(1, 2, 5)) ? '</span>' : '');
@@ -8267,17 +8266,17 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
} }
} // Use new badge } // Use new badge
elseif (empty($conf->global->MAIN_STATUS_USES_IMAGES) && !empty($displayMode)) { elseif (empty($conf->global->MAIN_STATUS_USES_IMAGES) && !empty($displayMode)) {
$statusLabelShort = !empty($statusLabelShort) ? $statusLabelShort : $statusLabel; $statusLabelShort = (empty($statusLabelShort) ? $statusLabel : $statusLabelShort);
$dolGetBadgeParams['attr']['class'] = 'badge-status'; $dolGetBadgeParams['attr']['class'] = 'badge-status';
$dolGetBadgeParams['attr']['title'] = $statusLabel; $dolGetBadgeParams['attr']['title'] = $statusLabel;
if ($displayMode == 3) { if ($displayMode == 3) {
$return = dolGetBadge($statusLabel, '', $statusType, 'dot', $url, $dolGetBadgeParams); $return = dolGetBadge((empty($conf->dol_optimize_smallscreen) ? $statusLabel : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort)), '', $statusType, 'dot', $url, $dolGetBadgeParams);
} elseif ($displayMode === 5) { } elseif ($displayMode === 5) {
$return = dolGetBadge($statusLabelShort, $html, $statusType, '', $url, $dolGetBadgeParams); $return = dolGetBadge($statusLabelShort, $html, $statusType, '', $url, $dolGetBadgeParams);
} else { } else {
$return = dolGetBadge($statusLabel, $html, $statusType, '', $url, $dolGetBadgeParams); $return = dolGetBadge((empty($conf->dol_optimize_smallscreen) ? $statusLabel : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort)), $html, $statusType, '', $url, $dolGetBadgeParams);
} }
} }

View File

@@ -24,6 +24,18 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet');
font-size: 0.95em; font-size: 0.95em;
padding: .19em .35em; /* more than 0.19 generate a change into heigth of lines */ padding: .19em .35em; /* more than 0.19 generate a change into heigth of lines */
} }
.tabBar .arearef .statusref .badge-status {
font-size: 1.1em;
padding: .4em .4em;
}
/* Force values for small screen 767 */
@media only screen and (max-width: 767px)
{
.tabBar .arearef .statusref .badge-status {
font-size: 0.95em;
padding: .3em .2em;
}
}
.badge-pill, .tabs .badge { .badge-pill, .tabs .badge {
padding-right: .5em; padding-right: .5em;

View File

@@ -9,8 +9,9 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
--btncolorborder: #FFF; --btncolorborder: #FFF;
--butactiondeletebg: rgb(234,228,225); --butactiondeletebg: rgb(234,228,225);
/* tertiary color */ /* tertiary color */
--butactionbg:rgb(218, 235, 225); /* --butactionbg:rgb(218, 235, 225); */
/* --butactionbg:rgb(228, 218, 235); */ /* --butactionbg:rgb(228, 218, 235); */
--butactionbg:rgb(118, 145, 225);
} }
<?php <?php
@@ -53,6 +54,8 @@ span.butAction, span.butActionDelete {
.butAction { .butAction {
background: var(--butactionbg); background: var(--butactionbg);
color: #FFF !important;
border-radius: 3px;
/* background: rgb(230, 232, 239); */ /* background: rgb(230, 232, 239); */
} }
.butActionRefused, .butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active { .butActionRefused, .butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active {
@@ -72,10 +75,10 @@ span.butAction, span.butActionDelete {
/* border: 1px solid #aaa; */ /* border: 1px solid #aaa; */
/* border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); */ /* border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); */
border-top-right-radius: 0 !important; /*border-top-right-radius: 0 !important;
border-bottom-right-radius: 0 !important; border-bottom-right-radius: 0 !important;
border-top-left-radius: 0 !important; border-top-left-radius: 0 !important;
border-bottom-left-radius: 0 !important; border-bottom-left-radius: 0 !important;*/
} }
.butActionNew, .butActionNewRefused, .butActionNew:link, .butActionNew:visited, .butActionNew:hover, .butActionNew:active { .butActionNew, .butActionNewRefused, .butActionNew:link, .butActionNew:visited, .butActionNew:hover, .butActionNew:active {
text-decoration: none; text-decoration: none;

View File

@@ -34,7 +34,7 @@
--oddevencolor: #202020; --oddevencolor: #202020;
--colorboxstatsborder: #e0e0e0; --colorboxstatsborder: #e0e0e0;
--dolgraphbg: rgba(255,255,255,0); --dolgraphbg: rgba(255,255,255,0);
--fieldrequiredcolor: #000055; --fieldrequiredcolor: #804000;
--colortextbacktab: #<?php print $colortextbacktab; ?>; --colortextbacktab: #<?php print $colortextbacktab; ?>;
--colorboxiconbg: #eee; --colorboxiconbg: #eee;
--refidnocolor:#444; --refidnocolor:#444;
@@ -186,6 +186,12 @@ input, select {
} }
#mainbody input.button:not(.buttongen):not(.bordertransp) { #mainbody input.button:not(.buttongen):not(.bordertransp) {
background: var(--butactionbg); background: var(--butactionbg);
color: #FFF !important;
/* -webkit-box-shadow: 0px 0px 1px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
box-shadow: 0px 0px 1px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1); */
border-radius: 3px;
border-collapse: collapse; border-collapse: collapse;
border: none; border: none;
} }
@@ -3245,11 +3251,7 @@ div.pagination li:first-child span {
/*border-top-left-radius: 4px; /*border-top-left-radius: 4px;
border-bottom-left-radius: 4px;*/ border-bottom-left-radius: 4px;*/
} }
div.pagination li:last-child a,
div.pagination li:last-child span {
/*border-top-right-radius: 4px;
border-bottom-right-radius: 4px;*/
}
div.pagination li a:hover, div.pagination li a:hover,
div.pagination li:not(.paginationafterarrows,.title-button) span:hover, div.pagination li:not(.paginationafterarrows,.title-button) span:hover,
div.pagination li a:focus, div.pagination li a:focus,

View File

@@ -65,7 +65,7 @@ $colorbacklinepairhover = '230,237,244'; // line hover
$colorbacklinepairchecked = '230,237,244'; // line checked $colorbacklinepairchecked = '230,237,244'; // line checked
$colorbacklinebreak = '248,247,244'; // line break $colorbacklinebreak = '248,247,244'; // line break
$colorbackbody = '255,255,255'; $colorbackbody = '255,255,255';
$colortexttitlenotab = '0,123,140'; // 150,90,121 140,80,10 or 10,140,80 #875a7b green=0,123,140, violet: 0,50,120 $colortexttitlenotab = '10,120,140'; // 150,90,121 140,80,10 or 10,140,80 #875a7b green=0,123,140, violet: 0,50,120
$colortexttitlenotab2 = '100,0,100'; // 150,90,121 140,80,10 or 10,140,80 #875a7b green=0,123,140, violet: 0,50,120 $colortexttitlenotab2 = '100,0,100'; // 150,90,121 140,80,10 or 10,140,80 #875a7b green=0,123,140, violet: 0,50,120
$colortexttitle = '0,0,0'; $colortexttitle = '0,0,0';
$colortexttitlelink = '10, 20, 100'; $colortexttitlelink = '10, 20, 100';
@@ -87,11 +87,11 @@ $colorblind_deuteranopes_textWarning = $textWarning; // currently not tested wit
// Badges colors // Badges colors
$badgePrimary = '#007bff'; $badgePrimary = '#007bff';
$badgeSecondary = '#cccccc'; $badgeSecondary = '#aaaabb';
$badgeInfo = '#aaaabb';
$badgeSuccess = '#55a580'; $badgeSuccess = '#55a580';
$badgeWarning = '#bc9526'; // See $textWarning bc9526 $badgeWarning = '#bc9526'; // See $textWarning bc9526
$badgeDanger = '#9f4705'; // See $textDanger $badgeDanger = '#9f4705'; // See $textDanger
$badgeInfo = '#aaaabb';
$badgeDark = '#343a40'; $badgeDark = '#343a40';
$badgeLight = '#f8f9fa'; $badgeLight = '#f8f9fa';