--- /tmp/dsg/dolibarr/htdocs/theme/md/github_19.0.3_badges.inc.php +++ /tmp/dsg/dolibarr/htdocs/theme/md/client_badges.inc.php @@ -2,4 +2 @@ -if (!defined('ISLOADEDBYSTEELSHEET')) { - die('Must be call by steelsheet'); -} -?> +if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> @@ -12,14 +9,14 @@ - display: inline-block; - padding: .1em .35em; - font-size: 80%; - font-weight: 700 !important; - line-height: 1; - text-align: center; - white-space: nowrap; - vertical-align: baseline; - border-radius: .25rem; - transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out; - border-width: 2px; - border-style: solid; - border-color: rgba(255,255,255,0); - box-sizing: border-box; + display: inline-block; + padding: .1em .35em; + font-size: 80%; + font-weight: 700 !important; + line-height: 1; + text-align: center; + white-space: nowrap; + vertical-align: baseline; + border-radius: .25rem; + transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out; + border-width: 2px; + border-style: solid; + border-color: rgba(255,255,255,0); + box-sizing: border-box; @@ -29,14 +26,2 @@ - font-size: 1em; - padding: .19em .35em; /* more than 0.19 generate a change into heigth of lines */ -} -.tabBar .arearef .statusref .badge-status, .tabBar .arearefnobottom .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, .tabBar .arearefnobottom .statusref .badge-status { - font-size: 0.95em; - padding: .3em .2em; - } + font-size: 1em; + padding: .19em .35em; /* more than 0.19 generate a change into heigth of lines */ @@ -46,3 +31,3 @@ - padding-right: .5em; - padding-left: .5em; - border-radius: 0.25rem; + padding-right: .5em; + padding-left: .5em; + border-radius: 0.25rem; @@ -52,4 +37,4 @@ - padding: 0; - border-radius: 50%; - padding: 0.45em; - vertical-align: unset; + padding: 0; + border-radius: 50%; + padding: 0.35em; + vertical-align: unset; @@ -59 +44 @@ - text-decoration: none; + text-decoration: none; @@ -63,10 +48,2 @@ - background-color: ; - color: #fff; -} - -span.badgeneutral { - padding: 2px 7px 2px 7px; - background-color: #e4e4e4; - color: #666; - border-radius: 10px; - white-space: nowrap; + background-color: ; + color: #fff; @@ -78,2 +55,2 @@ - color: #fff !important; - background-color: ; + color: #fff !important; + background-color: ; @@ -82,2 +59,2 @@ - outline: 0; - box-shadow: 0 0 0 0.2rem ; + outline: 0; + box-shadow: 0 0 0 0.2rem ; @@ -86,2 +63,2 @@ - color: #fff !important; - background-color: ; + color: #fff !important; + background-color: ; @@ -92,2 +69,2 @@ - color: #fff !important; - background-color: ; + color: #fff !important; + background-color: ; @@ -96,2 +73,2 @@ - outline: 0; - box-shadow: 0 0 0 0.2rem ; + outline: 0; + box-shadow: 0 0 0 0.2rem ; @@ -100,2 +77,2 @@ - color: #fff !important; - background-color: ; + color: #fff !important; + background-color: ; @@ -106,2 +83,2 @@ - color: #fff !important; - background-color: ; + color: #fff !important; + background-color: ; @@ -110,2 +87,2 @@ - outline: 0; - box-shadow: 0 0 0 0.2rem ; + outline: 0; + box-shadow: 0 0 0 0.2rem ; @@ -114,2 +91,2 @@ - color: #fff !important; - background-color: ; + color: #fff !important; + background-color: ; @@ -120,2 +97,2 @@ - color: #fff !important; - background-color: ; + color: #fff !important; + background-color: ; @@ -124,2 +101,2 @@ - outline: 0; - box-shadow: 0 0 0 0.2rem ; + outline: 0; + box-shadow: 0 0 0 0.2rem ; @@ -128,2 +105,2 @@ - color: #fff !important; - background-color: ; + color: #fff !important; + background-color: ; @@ -134,2 +111,2 @@ - color: #fff !important; - background-color: ; + color: #fff !important; + background-color: ; @@ -138,2 +115,2 @@ - outline: 0; - box-shadow: 0 0 0 0.2rem ; + outline: 0; + box-shadow: 0 0 0 0.2rem ; @@ -142,13 +119,2 @@ - color: #212529 !important; - background-color: ; -} - -/* WARNING colorblind */ -body[class*="colorblind-"] .badge-warning { - background-color: ; - } -body[class*="colorblind-"] a.badge-warning.focus,body[class^="colorblind-"] a.badge-warning:focus { - box-shadow: 0 0 0 0.2rem ; -} -body[class*="colorblind-"] a.badge-warning:focus, a.badge-warning:hover { - background-color: ; + color: #212529 !important; + background-color: ; @@ -159,2 +125,2 @@ - color: #fff !important; - background-color: ; + color: #fff !important; + background-color: ; @@ -163,2 +129,2 @@ - outline: 0; - box-shadow: 0 0 0 0.2rem ; + outline: 0; + box-shadow: 0 0 0 0.2rem ; @@ -167,2 +133,2 @@ - color: #fff !important; - background-color: ; + color: #fff !important; + background-color: ; @@ -173,2 +139,2 @@ - color: #212529 !important; - background-color: ; + color: #212529 !important; + background-color: ; @@ -177,2 +143,2 @@ - outline: 0; - box-shadow: 0 0 0 0.2rem ; + outline: 0; + box-shadow: 0 0 0 0.2rem ; @@ -181,2 +147,2 @@ - color: #212529 !important; - background-color: ; + color: #212529 !important; + background-color: ; @@ -187,2 +153,2 @@ - color: #fff !important; - background-color: ; + color: #fff !important; + background-color: ; @@ -191,2 +157,2 @@ - outline: 0; - box-shadow: 0 0 0 0.2rem ; + outline: 0; + box-shadow: 0 0 0 0.2rem ; @@ -195,18 +161,9 @@ - color: #fff !important; - background-color: ; -} - - -@media only screen and (max-width: 570px) -{ - span.badge.badge-status { - overflow: hidden; - max-width: 130px; - text-overflow: ellipsis; - } -} - - -/* STATUS BADGES */ -; +} + + +/* + * STATUS BADGES + */ + +if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> @@ -7,33 +5 @@ -:root { - --btncolortext:rgb(); - --btncolorbg: #fbfbfb; - --btncolorborderhover: none; - --btncolorborder: #FFF; - --butactiondeletebg: rgb(234,228,225); - --butactionbg: rgb(); - --textbutaction: rgb(); -} - - + @@ -45,0 +12,4 @@ +div.divButAction { + margin-bottom: 1.4em; + vertical-align: top; +} @@ -47,7 +17 @@ -div.tabsAction > span.butAction, div.tabsAction > span.butActionRefused, div.tabsAction > span.butActionDelete, -div.tabsAction > div.divButAction > span.butAction, -div.tabsAction > div.divButAction > span.butActionDelete, -div.tabsAction > div.divButAction > span.butActionRefused, -div.tabsAction > div.divButAction > a.butAction, -div.tabsAction > div.divButAction > a.butActionDelete, -div.tabsAction > div.divButAction > a.butActionRefused { +div.tabsAction > span.butAction, div.tabsAction > span.butActionRefused, div.tabsAction > span.butActionDelete { @@ -55,4 +18,0 @@ - margin-right: 0px !important; -} -div.tabsActionNoBottom > a.butAction, div.tabsActionNoBottom > a.butActionRefused { - margin-bottom: 0 !important; @@ -65,47 +25,2 @@ -.butAction { - background: var(--butactionbg); - color: var(--textbutaction) !important; - /* background: rgb(230, 232, 239); */ -} -.butActionRefused, .butAction, .butActionDelete { - border-radius: 3px; -} -:not(.center) > .butActionRefused:last-child, :not(.center) > .butAction:last-child, :not(.center) > .butActionDelete:last-child { - margin-: 0px !important; -} -.butActionRefused, .butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active { - text-decoration: none; - text-transform: uppercase; - font-weight: bold; - line-height: 1.8em; - - margin: 0em em; - padding: 0.6em em; - font-family: ; - display: inline-block; - text-align: center; - cursor: pointer; - color: #444; - - /* 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-top-right-radius: 0 !important; - border-bottom-right-radius: 0 !important; - border-top-left-radius: 0 !important; - border-bottom-left-radius: 0 !important;*/ -} -.butActionNew, .butActionNewRefused, .butActionNew:link, .butActionNew:visited, .butActionNew:hover, .butActionNew:active { - text-decoration: none; - text-transform: uppercase; - font-weight: normal; - - margin: 0em 0.3em 0 0.3em !important; - padding: 0.2em em 0.3em; - font-family: ; - display: inline-block; - /* text-align: center; New button are on right of screen */ - cursor: pointer; -} - -.button { + +.button, .buttonDelete, .butAction, .butActionDelete, .butActionRefused, .butActionNewRefused { @@ -114,2 +29,2 @@ - padding: 0.4em em; - margin: 0em em; + padding: 0.4em em; + margin: 0em em; @@ -143,2 +58,2 @@ - padding: 0.2em em; - margin: 0em em; + padding: 0.2em em; + margin: 0em em; @@ -180 +95 @@ -.button { +.button, .butAction { @@ -193 +108 @@ -.button:disabled { +.button:disabled, .butAction:disabled { @@ -212,39 +127,19 @@ -a.butActionNew>span.fa, a.butActionNew>span.fa:hover, -span.butActionNew>span.fa, span.butActionNew>span.fa:hover, -a.butActionNewRefused>span.fa, a.butActionNewRefused>span.fa:hover, -span.butActionNewRefused>span.fa, span.butActionNewRefused>span.fa:hover -{ - padding-: 6px; - font-size: 1.5em; - border: none; - box-shadow: none; - -webkit-box-shadow: none; -} - -.butAction:hover { - -webkit-box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1); - box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1); -} -.butActionNew:hover { - text-decoration: underline; - box-shadow: unset !important; -} - -.butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active, .buttonDelete { - background: var(--butactiondeletebg); - /* border: 1px solid #633; */ - color: #633; - /* vertical-align: middle; */ -} - -.butActionDelete:hover { - -webkit-box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1); - box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1); -} - -.butActionRefused { - text-decoration: none !important; - text-transform: uppercase; - font-weight: bold !important; - - white-space: nowrap !important; +.butActionDelete, .buttonDelete { + color: #ffffff !important; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #cc6d00; + background-image: -moz-linear-gradient(top, #cc8800, #cc4400); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cc8800), to(#cc4400)); + background-image: -webkit-linear-gradient(top, #cc8800, #cc4400); + background-image: -o-linear-gradient(top, #cc8800, #cc4400); + background-image: linear-gradient(to bottom, #cc8800, #cc4400); + background-repeat: repeat-x; + border-color: #cc4400 #cc4400 #802a00; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); +} +a.butAction:link, a.butAction:visited, a.butAction:hover, a.butAction:active { + color: #FFFFFF; +} + +.butActionRefused, .butActionNewRefused { + color: #AAAAAA !important; @@ -252,30 +147,11 @@ - margin: 0em em; - padding: 0.6em em; - font-family: !important; - display: inline-block; - text-align: center; - cursor: pointer; - color: #999 !important; - - border: 1px solid #ccc; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; -} -.butActionNewRefused, .butActionNewRefused:link, .butActionNewRefused:visited, .butActionNewRefused:hover, .butActionNewRefused:active { - text-decoration: none !important; - text-transform: uppercase; - font-weight: normal !important; - - white-space: nowrap !important; - cursor: not-allowed !important; - margin: 0em em; - padding: 0.2em em; - font-family: !important; - display: inline-block; - /* text-align: center; New button are on right of screen */ - cursor: pointer; - color: #999 !important; - padding-top: 0.2em; - box-shadow: none !important; - -webkit-box-shadow: none !important; +} + +a.butAction:hover, a.butActionDelete:hover, a.butActionRefused:hover { + text-decoration: none; +} +a.butActionNewRefused:hover { + border-color: unset !important; + border: 1px solid #bbbbbb; +} +a.butAction:hover, a.butActionNew:hover, a.butActionDelete:hover { + opacity: 0.9; @@ -294,4 +169,0 @@ -div.pagination li:first-child a.btnTitle { - margin-left: 10px; -} - @@ -299,31 +171,26 @@ - display: inline-block; - padding: 4px 12px; - font-size: 14px; - font-weight: 400; - line-height: 1.4; - text-align: center; - white-space: nowrap; - vertical-align: middle; - -ms-touch-action: manipulation; - touch-action: manipulation; - cursor: pointer; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - box-shadow: none; - text-decoration: none; - position: relative; - margin: 0 0 0 10px; - min-width: 80px; - text-align: center; - color: rgb(); - border: none; - font-size: 12px; - font-weight: 300; - /* background-color: #fbfbfb; */ -} - -a.btnTitle.btnTitleSelected { - border: 1px solid #ccc; - border-radius: 3px; + display: inline-block; + padding: 6px 12px; + font-size: 14px + font-weight: 400; + line-height: 1.4; + text-align: center; + white-space: nowrap; + vertical-align: middle; + -ms-touch-action: manipulation; + touch-action: manipulation; + cursor: pointer; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + box-shadow: none; + text-decoration: none; + position: relative; + margin: 0 0 0 10px; + min-width: 80px; + text-align: center; + color: rgb(); + border: none; + font-size: 12px; + font-weight: 300; + background-color: #fbfbfb; @@ -337 +204 @@ - color: #666666; + color: #666666; @@ -341,9 +208,9 @@ - border-radius: 3px; - position: relative; - margin: 0 0 0 10px; - text-align: center; - color: #000; - background-color: #eee; - font-size: 12px; - text-decoration: none; - box-shadow: none; + border-radius: 3px; + position: relative; + margin: 0 0 0 10px; + text-align: center; + color: #ffffff; + background-color: rgb(); + font-size: 12px; + text-decoration: none; + box-shadow: none; @@ -353,4 +220,4 @@ - color: #8a8a8a; - cursor: not-allowed; - background-color: #fbfbfb; - background: repeating-linear-gradient( 45deg, #ffffff, #f1f1f1 4px, #f1f1f1 4px, #f1f1f1 4px ); + color: #8a8a8a; + cursor: not-allowed; + background-color: #fbfbfb; + background: repeating-linear-gradient( 45deg, #ffffff, #f1f1f1 4px, #f1f1f1 4px, #f1f1f1 4px ); @@ -360 +227 @@ - color:var(--btncolorborderhover); + color: #ffffff; @@ -367 +234 @@ - color: #8a8a8a; + color: #8a8a8a; @@ -371,49 +238,9 @@ - font-size: 20px; - display: block; -} - -.paginationafterarrows a.btnTitlePlus, .titre_right a.btnTitlePlus { - border: 1px solid var(--btncolorborder); -} -.paginationafterarrows a.btnTitlePlus:hover, .titre_right a.btnTitlePlus:hover { - border-color: #ddd; -} - -/* The buttonplus isgrowing on hover (dont know why). This is to avoid to have the cellegrowing too */ -.btnTitlePlus:hover { - max-width: 24px; - max-height: 40px; -} - - -/* rule to reduce top menu - 2nd reduction: Reduce width of top menu icons again */ -@media only screen and (max-width: global->THEME_ELDY_WITDHOFFSET_FOR_REDUC2; ?>px) /* reduction 2 */ -{ - .butAction, .butActionRefused, .butActionDelete { - font-size: 0.95em; - } - .btnTitle, a.btnTitle { - display: inline-block; - padding: 4px 4px 4px 4px; - min-width: unset; - } -} - -/* rule to reduce top menu - 3rd reduction: The menu for user is on left */ -@media only screen and (max-width: global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px) /* reduction 3 */ -{ - .butAction, .butActionRefused, .butActionDelete { - font-size: 0.9em; - } -} - -/* smartphone */ -@media only screen and (max-width: 767px) -{ - .butAction, .butActionRefused, .butActionDelete { - font-size: 0.85em; - } -} - - -admin)) { ?> + font-size: 20px; + display: block; +} + + + + + +global->MAIN_BUTTON_HIDE_UNAUTHORIZED) && (!$user->admin)) { ?> @@ -421,23 +248,3 @@ - display: none !important; -} - - - -/* - * BTN LINK - */ - -.btn-link{ - margin-right: 5px; - border: 1px solid #ddd; - color: #333; - padding: 5px 10px; - border-radius:1em; - text-decoration: none !important; -} - -.btn-link:hover{ - background-color: #ddd; - border: 1px solid #ddd; -} - + display: none !important; +} +photo) ? 52 : 0; - -?> +if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> + @@ -16,2 +10 @@ - white-space: normal; - word-break: break-word; + white-space: normal; @@ -21 +14 @@ - outline: none; + outline: none; @@ -25,5 +18,5 @@ - display: block; -} - - -#topmenu-global-search-dropdown a.login-dropdown-a, #topmenu-quickadd-dropdown a.login-dropdown-a, #topmenu-bookmark-dropdown a.login-dropdown-a { + display: block; +} + + +#topmenu-bookmark-dropdown a.login-dropdown-a { @@ -32,11 +24,0 @@ - -div#topmenu-global-search-dropdown { - position: fixed; - : px; - top: 0px; -} -div#topmenu-quickadd-dropdown { - position: fixed; - : px; - top: 0px; -} @@ -44,8 +26,3 @@ - position: fixed; - : px; - top: 0px; -} -div#topmenu-login-dropdown { - position: fixed; - : 20px; - top: 0px; + position: fixed; + right: 20px; + top: 0px; @@ -58,3 +35,2 @@ -#topmenu-global-search-dropdown .dropdown-menu, #topmenu-quickadd-dropdown .dropdown-menu, #topmenu-bookmark-dropdown .dropdown-menu, #topmenu-login-dropdown .dropdown-menu { - min-width: 300px; - max-width: 360px; +#topmenu-bookmark-dropdown .dropdown-menu { + width: 300px; @@ -64,5 +40,5 @@ - outline: none; -} - -.open>.dropdown-search, .open>.dropdown-quickadd, .open>.dropdown-bookmark, .open>.dropdown-menu{ - display: block !important; + outline: none; +} + +.open>.dropdown-search, .open>.dropdown-bookmark, .open>.dropdown-menu{ + display: block; @@ -72,21 +48,21 @@ - border-color: #eee; - - position: absolute; - top: 100%; - left: 0; - z-index: 1000; - display: none; - float: left; - min-width: 160px; - margin: 2px 0 0; - font-size: 14px; - text-align: left; - list-style: none; - background-color: #fff; - -webkit-background-clip: padding-box; - background-clip: padding-box; - border: 1px solid #ccc; - border: 1px solid rgba(0,0,0,.15); - border-radius: 4px; - -webkit-box-shadow: 0 6px 12px rgba(0,0,0,.175); - box-shadow: 0 6px 12px rgba(0,0,0,.175); + border-color: #eee; + + position: absolute; + top: 100%; + left: 0; + z-index: 1000; + display: none; + float: left; + min-width: 160px; + margin: 2px 0 0; + font-size: 14px; + text-align: left; + list-style: none; + background-color: #fff; + -webkit-background-clip: padding-box; + background-clip: padding-box; + border: 1px solid #ccc; + border: 1px solid rgba(0,0,0,.15); + border-radius: 4px; + -webkit-box-shadow: 0 6px 12px rgba(0,0,0,.175); + box-shadow: 0 6px 12px rgba(0,0,0,.175); @@ -95,21 +71,21 @@ - border-color: #eee; - - position: absolute; - top: 100%; - left: 0; - z-index: 1000; - display: none; - float: left; - min-width: 160px; - margin: 2px 0 0; - font-size: 14px; - text-align: left; - list-style: none; - background-color: #fff; - -webkit-background-clip: padding-box; - background-clip: padding-box; - border: 1px solid #ccc; - border: 1px solid rgba(0,0,0,.15); - border-radius: 4px; - -webkit-box-shadow: 0 6px 12px rgba(0,0,0,.175); - box-shadow: 0 6px 12px rgba(0,0,0,.175); + border-color: #eee; + + position: absolute; + top: 100%; + left: 0; + z-index: 1000; + display: none; + float: left; + min-width: 160px; + margin: 2px 0 0; + font-size: 14px; + text-align: left; + list-style: none; + background-color: #fff; + -webkit-background-clip: padding-box; + background-clip: padding-box; + border: 1px solid #ccc; + border: 1px solid rgba(0,0,0,.15); + border-radius: 4px; + -webkit-box-shadow: 0 6px 12px rgba(0,0,0,.175); + box-shadow: 0 6px 12px rgba(0,0,0,.175); @@ -118,30 +94,21 @@ - border-color: #eee; - - position: absolute; - top: 100%; - left: 0; - z-index: 1000; - display: none; - float: left; - min-width: 160px; - margin: 2px 0 0; - font-size: 14px; - text-align: left; - list-style: none; - background-color: #fff; - -webkit-background-clip: padding-box; - background-clip: padding-box; - border: 1px solid #ccc; - border: 1px solid rgba(0,0,0,.15); - border-radius: 4px; - -webkit-box-shadow: 0 6px 12px rgba(0,0,0,.175); - box-shadow: 0 6px 12px rgba(0,0,0,.175); -} - - -/* CSS to hide the arrow to show open/close */ -div#topmenu-global-search-dropdown, , div#topmenu-quickadd-dropdown, div#topmenu-bookmark-dropdown { - padding-right: 2px; -} -div#topmenu-global-search-dropdown a::after, div#topmenu-quickadd-dropdown a::after, div#topmenu-bookmark-dropdown a::after { - display: none; + border-color: #eee; + + position: absolute; + top: 100%; + left: 0; + z-index: 1000; + display: none; + float: left; + min-width: 160px; + margin: 2px 0 0; + font-size: 14px; + text-align: left; + list-style: none; + background-color: #fff; + -webkit-background-clip: padding-box; + background-clip: padding-box; + border: 1px solid #ccc; + border: 1px solid rgba(0,0,0,.15); + border-radius: 4px; + -webkit-box-shadow: 0 6px 12px rgba(0,0,0,.175); + box-shadow: 0 6px 12px rgba(0,0,0,.175); @@ -152 +119 @@ - text-decoration: none !important; + text-decoration: none !important; @@ -156,17 +123,17 @@ - /* font part */ - font-family: ""; - font-size: 0.7em; - font-weight: 900; - font-style: normal; - font-variant: normal; - text-rendering: auto; - -webkit-font-smoothing: antialiased; - text-align:center; - text-decoration:none; - margin: auto 3px; - display: inline-block; - content: "\f078"; - - -webkit-transition: -webkit-transform .2s ease-in-out; - -ms-transition: -ms-transform .2s ease-in-out; - transition: transform .2s ease-in-out; + /* font part */ + font-family: "Font Awesome 5 Free"; + font-size: 0.7em; + font-weight: 900; + font-style: normal; + font-variant: normal; + text-rendering: auto; + -webkit-font-smoothing: antialiased; + text-align:center; + text-decoration:none; + margin: auto 3px; + display: inline-block; + content: "\f078"; + + -webkit-transition: -webkit-transform .2s ease-in-out; + -ms-transition: -ms-transform .2s ease-in-out; + transition: transform .2s ease-in-out; @@ -176 +143 @@ - transform: rotate(180deg); + transform: rotate(180deg); @@ -180,3 +147,2 @@ - * MENU Dropdown - */ - +* MENU Dropdown +*/ @@ -184 +150 @@ - /* display: none; */ + display: none; @@ -188 +154 @@ - background: rgba(0, 0, 0, 0.1); + background: rgba(0, 0, 0, 0.1); @@ -191,4 +157,4 @@ - position: absolute; - right: 0; - : auto; - line-height:1.3em; + position: absolute; + right: 0; + : auto; + line-height:1.3em; @@ -197,2 +163,2 @@ - border-bottom-right-radius: 4px; - border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px; @@ -201 +167 @@ - color: #333; + color: #333; @@ -204,5 +170,5 @@ - border-top-right-radius: 0; - border-top-left-radius: 0; - padding: 1px 0 0 0; - border-top-width: 0; - width: 300px; + border-top-right-radius: 0; + border-top-left-radius: 0; + padding: 1px 0 0 0; + border-top-width: 0; + width: 300px; @@ -211,3 +177,3 @@ - margin-top: 0; - border-top-left-radius: 0; - border-top-right-radius: 0; + margin-top: 0; + border-top-left-radius: 0; + border-top-right-radius: 0; @@ -217,3 +183,68 @@ - min-height: 100px; - padding: 10px; - text-align: center; + min-height: 100px; + padding: 10px; + text-align: center; + white-space: normal; +} + +#topmenu-global-search-dropdown .dropdown-menu{ + width: 300px; + max-width: 100%; +} + +div#topmenu-global-search-dropdown, div#topmenu-bookmark-dropdown { + line-height: 46px; +} +a.top-menu-dropdown-link { + padding: 8px; +} + +.dropdown-user-image { + border-radius: 50%; + vertical-align: middle; + z-index: 5; + height: 90px; + width: 90px; + border: 3px solid; + border-color: transparent; + border-color: rgba(255, 255, 255, 0.2); + max-width: 100%; + max-height :100%; +} + +.dropdown-menu > .user-header{ + background: rgb(); +} + + + +.dropdown-menu .dropdown-header{ + padding: 5px 10px 10px 10px; +} + +.dropdown-menu > .user-footer { + background-color: #f9f9f9; + padding: 10px; +} + +.user-footer:after { + clear: both; +} + + +.dropdown-menu > .bookmark-footer{ + padding: 10px; +} + + +.dropdown-menu > .user-body, .dropdown-body{ + padding: 15px; + border-bottom: 1px solid #f4f4f4; + border-top: 1px solid #dddddd; + white-space: normal; +} + +.dropdown-menu > .bookmark-body, .dropdown-body{ + padding: 10px 0; + overflow-y: auto; + max-height: 60vh ; /* fallback for browsers without support for calc() */ + max-height: calc(90vh - 110px) ; @@ -222,72 +253,3 @@ - -#topmenu-global-search-dropdown .dropdown-menu{ - width: 300px; - max-width: 100%; -} - -div#topmenu-global-search-dropdown, div#topmenu-quickadd-dropdown, div#topmenu-bookmark-dropdown, div#topmenu-login-dropdown { - line-height: px; -} -a.top-menu-dropdown-link { - padding: 8px; -} - -.dropdown-user-image { - border-radius: 50%; - vertical-align: middle; - z-index: 5; - height: 90px; - width: 90px; - border: 3px solid; - border-color: transparent; - border-color: rgba(255, 255, 255, 0.2); - max-width: 100%; - max-height :100%; -} - -.dropdown-menu > .user-header{ - background: rgb(--colorbackhmenu1); -} - - - -.dropdown-menu .dropdown-header{ - padding: 8px 10px 10px 10px; -} - -.dropdown-menu > .user-footer { - background-color: #f9f9f9; - padding: 10px; -} - -.user-footer:after { - clear: both; -} - - -.dropdown-menu > .bookmark-footer{ - border-top: 1px solid #f0f0f0; - background-color: #f9f9f9; - padding: 10px; - text-align: start; -} - - -.dropdown-menu > .user-body, .dropdown-body{ - padding: 15px; - border-bottom: 1px solid #f4f4f4; - border-top: 1px solid #f0f0f0; - white-space: normal; -} - -.dropdown-menu > .bookmark-body, .dropdown-body{ - padding: 10px 0; - overflow-y: auto; - max-height: 60vh ; /* fallback for browsers without support for calc() */ - max-height: calc(90vh - 110px) ; - white-space: normal; -} -#topmenu-quickadd-dropdown .dropdown-menu > .bookmark-body, #topmenu-quickadd-dropdown .dropdown-body, -#topmenu-bookmark-dropdown .dropdown-menu > .bookmark-body, #topmenu-bookmark-dropdown .dropdown-body { - max-height: 60vh ; /* fallback for browsers without support for calc() */ - max-height: calc(90vh - 200px) ; +#topmenu-bookmark-dropdown .dropdown-menu > .bookmark-body, #topmenu-bookmark-dropdown .dropdown-body{ + max-height: 60vh ; /* fallback for browsers without support for calc() */ + max-height: calc(90vh - 200px) ; @@ -298,2 +260,2 @@ - width: 8px; - } + width: 8px; + } @@ -301,4 +263,4 @@ - -webkit-border-radius: 0; - border-radius: 0; - /* background: rgb(); */ - background: #aaa; + -webkit-border-radius: 0; + border-radius: 0; + /* background: rgb(); */ + background: #aaa; @@ -307,8 +269,8 @@ - -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); - -webkit-border-radius: 0; - border-radius: 0; -} - - -#topmenu-login-dropdown, #topmenu-quickadd-dropdown, #topmenu-bookmark-dropdown, #topmenu-global-search-dropdown { - padding: 0 5px 0 5px; + -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); + -webkit-border-radius: 0; + border-radius: 0; +} + + +#topmenu-login-dropdown, #topmenu-bookmark-dropdown, #topmenu-global-search-dropdown { + padding: 0 5px 0 5px; @@ -317,18 +279,14 @@ - text-decoration: none; -} - -#topmenuloginmoreinfo-btn, #topmenulogincompanyinfo-btn { - display: block; - text-align: start; - color:#666; - cursor: pointer; -} - -#topmenuloginmoreinfo, #topmenulogincompanyinfo { - display: none; - clear: both; - font-size: 0.95em; -} - -a.dropdown-item { - text-align: start; + text-decoration: none; +} + +#topmenuloginmoreinfo-btn{ + display: block; + text-aling: right; + color:#666; + cursor: pointer; +} + +#topmenuloginmoreinfo{ + display: none; + clear: both; + font-size: 0.95em; @@ -338,19 +296,19 @@ - display: inline-block; - padding: 6px 12px; - margin-bottom: 0; - font-size: 14px; - font-weight: 400; - line-height: 1.42857143; - text-align: center; - white-space: nowrap; - vertical-align: middle; - -ms-touch-action: manipulation; - touch-action: manipulation; - cursor: pointer; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - background-image: none; - border: 1px solid transparent; - border-radius: 4px; + display: inline-block; + padding: 6px 12px; + margin-bottom: 0; + font-size: 14px; + font-weight: 400; + line-height: 1.42857143; + text-align: center; + white-space: nowrap; + vertical-align: middle; + -ms-touch-action: manipulation; + touch-action: manipulation; + cursor: pointer; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + background-image: none; + border: 1px solid transparent; + border-radius: 4px; @@ -360,8 +318,8 @@ - color: #666666; - border-radius: 0; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - border-width: 1px; - background-color: #f4f4f4; - border-color: #ddd; + color: #666666; + border-radius: 0; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + border-width: 1px; + background-color: #f4f4f4; + border-color: #ddd; @@ -371,6 +329,6 @@ - color: rgb() !important; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - display: block; - margin: 5px 0px; + color: rgb() !important; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + display: block; + margin: 5px 0px; @@ -380,14 +338,14 @@ - display: block !important; - box-sizing: border-box; - width: 100%; - padding: .3em 1.5em .4em 1em; - clear: both; - font-weight: 400; - color: #212529 !important; - text-align: inherit; - background-color: transparent; - border: 0; - - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; + display: block !important; + box-sizing: border-box; + width: 100%; + padding: .25rem 1.5rem .25rem 1rem; + clear: both; + font-weight: 400; + color: #212529 !important; + text-align: inherit; + background-color: transparent; + border: 0; + + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; @@ -397,26 +355,20 @@ - /* font part */ - font-family: ""; - font-weight: 900; - font-style: normal; - font-variant: normal; - text-rendering: auto; - -webkit-font-smoothing: antialiased; - text-align:center; - text-decoration:none; - margin-: 5px; - display: inline-block; - content: "\f0da"; - color: rgba(0,0,0,0.3); -} -.multicompany-item::before { - content: none !important; -} - -.dropdown-item.bookmark-item-external::before { - content: "\f35d"; -} - -.dropdown-item.active, .dropdown-item:hover, .dropdown-item:hover::before, .dropdown-item:hover span::before, .dropdown-item:focus, .dropdown-item:focus span::before { - color: # !important; - text-decoration: none; - background: rgb(); + /* font part */ + font-family: "Font Awesome 5 Free"; + font-weight: 900; + font-style: normal; + font-variant: normal; + text-rendering: auto; + -webkit-font-smoothing: antialiased; + text-align:center; + text-decoration:none; + margin-right: 5px; + display: inline-block; + content: "\f0da"; + color: rgba(0,0,0,0.3); +} + + +.dropdown-item.active, .dropdown-item:hover, .dropdown-item:focus { + color: # !important; + text-decoration: none; + background: rgb(); @@ -426,2 +378,2 @@ - * SEARCH - */ +* SEARCH +*/ @@ -430,150 +382,21 @@ - width: 100%; - padding: 10px 35px 10px 20px; - - background-color: transparent; - font-size: 14px; - line-height: 16px; - box-sizing: border-box; - - - color: #575756; - background-color: transparent; - background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24'%3E%3Cpath d='M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z'/%3E%3Cpath d='M0 0h24v24H0z' fill='none'/%3E%3C/svg%3E"); - background-repeat: no-repeat; - background-size: 16px 16px; - background-position: 95% center; - border-radius: 50px; - border: 1px solid #c4c4c2 !important; - transition: all 250ms ease-in-out; - backface-visibility: hidden; - transform-style: preserve-3d; - -} - -.search-dropdown-body { - padding: unset; -} - -.global-search-item { - font-size: 1em; - padding-top: 6px; - padding-bottom: 6px; -} - -.global-search-item:before { - content: none; -} - -.global-search-header { - color: #444 !important; -} - - -/* - * QUICK ADD - */ - -#topmenu-quickadd-dropdown .dropdown-menu { - width: 310px !important; - color: #444; -} - -.quickadd-body.dropdown-body { - padding: unset; -} - -.quickadd-item { - font-size: 1em; - padding-top: 6px; - padding-bottom: 6px; -} - -.quickadd-item:before { - content: none; -} - -.quickadd-header { - color: #444 !important; -} - -div.quickadd { - display: -ms-flexbox; - display: -webkit-flex; - display: flex; - -webkit-flex-direction: row; - -ms-flex-direction: row; - flex-direction: row; - -webkit-flex-wrap: wrap; - -ms-flex-wrap: wrap; - flex-wrap: wrap; - -webkit-justify-content: center; - -ms-flex-pack: center; - justify-content: center; - -webkit-align-content: center; - -ms-flex-line-pack: center; - align-content: center; - -webkit-align-items: flex-start; - -ms-flex-align: start; - align-items: flex-start; -} - -div.quickadd a { - color: #444; -} - -div.quickadd a:hover, div.quickadd a:active { - color: #000000; -} - -div.quickaddblock { - width: 95px; - height: 80px; -} - -div.quickaddblock:hover, -div.quickaddblock:active, -div.quickaddblock:focus { - background: ; -} - - -/* for the dropdown on action buttons */ -dropdown-holder { - position: relative; - display: inline-block; -} - -.dropdown-content { - display: none; - position: absolute; - z-index: 1; - width: 300px; - right:10px; /* will be set with js */ - background: #fff; - border: 1px solid #bbb; - text-align: -} - -.dropdown-content a { - margin-right: auto !important; - margin-left: auto !important; -} -.dropdown-content .butAction { - background: none; - color: #000 !important; -} -.dropdown-content a.butAction { - display: flex; -} -.dropdown-content .butAction:hover { - box-shadow: none; - text-decoration: underline; -} -.dropdown-content .butActionRefused { - margin-left: 0; - margin-right: 0; - border: none; -} - -.dropdown-holder.open .dropdown-content { - display: block; + width: 100%; + padding: 10px 35px 10px 20px; + + background-color: transparent; + font-size: 14px; + line-height: 16px; + box-sizing: border-box; + + + color: #575756; + background-color: transparent; + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24'%3E%3Cpath d='M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z'/%3E%3Cpath d='M0 0h24v24H0z' fill='none'/%3E%3C/svg%3E"); + background-repeat: no-repeat; + background-size: 16px 16px; + background-position: 95% center; + border-radius: 50px; + border: 1px solid #c4c4c2 !important; + transition: all 250ms ease-in-out; + backface-visibility: hidden; + transform-style: preserve-3d; + @@ -586,16 +409 @@ - #topmenu-quickadd-dropdown .dropdown-menu { - min-width: 220px; - max-width: 235px; - } - #topmenu-bookmark-dropdown .dropdown-menu { - min-width: 220px; - max-width: 360px; - } - #topmenu-login-dropdown .dropdown-menu { - min-width: 220px; - max-width: 360px; - } - - #topmenu-quickadd-dropdown a.login-dropdown-a, - #topmenu-bookmark-dropdown a.login-dropdown-a, - #topmenu-login-dropdown a.login-dropdown-a { + #topmenu-bookmark-dropdown a.login-dropdown-a { @@ -604,3 +412,2 @@ - #topmenu-quickadd-dropdown .dropdown-menu, - #topmenu-bookmark-dropdown .dropdown-menu, - #topmenu-login-dropdown .dropdown-menu { + + #topmenu-bookmark-dropdown .dropdown-menu { @@ -610,4 +417 @@ - div#topmenu-global-search-dropdown, - div#topmenu-quickadd-dropdown, - div#topmenu-bookmark-dropdown, - div#topmenu-login-dropdown { + div#topmenu-bookmark-dropdown { @@ -617,4 +421,2 @@ - div#topmenu-global-search-dropdown, - div#topmenu-quickadd-dropdown, - div#topmenu-bookmark-dropdown { - line-height: unset; + div#topmenu-global-search-dropdown, div#topmenu-bookmark-dropdown { + line-height: unset; @@ -624 +426 @@ - margin-right: 2px; + margin-right: 2px; @@ -628,19 +429,0 @@ -@media only screen and (max-width: 320px) -{ - .dropdown dd ul { - max-width: 270px; /* must always be 50 slower than width */ - } -} -@media only screen and (max-width: 300px) -{ - .dropdown dd ul { - max-width: 250px; - } -} -@media only screen and (max-width: 280px) -{ - .dropdown dd ul { - max-width: 230px; - } -} - @@ -649,2 +432,2 @@ - color: color(#575756); - letter-spacing: 1.5px; + color: color(#575756 a(0.8)); + letter-spacing: 1.5px; @@ -654,2 +437,2 @@ - display: none !important; -} + display: none !important; +} --- /tmp/dsg/dolibarr/htdocs/theme/md/github_19.0.3_info-box.inc.php +++ /tmp/dsg/dolibarr/htdocs/theme/md/client_info-box.inc.php @@ -2,3 +2 @@ -if (!defined('ISLOADEDBYSTEELSHEET')) { - die('Must be call by steelsheet'); -} ?> +if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> @@ -17,10 +15,4 @@ -if (getDolGlobalString('THEME_INFOBOX_COLOR_ON_BACKGROUND')) { - $prefix = 'background-'; -} - -if (!isset($conf->global->THEME_SATURATE_RATIO)) { - $conf->global->THEME_SATURATE_RATIO = 0.7; -} -if (GETPOSTISSET('THEME_SATURATE_RATIO')) { - $conf->global->THEME_SATURATE_RATIO = GETPOST('THEME_SATURATE_RATIO', 'int'); -} +if (!empty($conf->global->THEME_INFOBOX_COLOR_ON_BACKGROUND)) $prefix = 'background-'; + +if (!isset($conf->global->THEME_SATURATE_RATIO)) $conf->global->THEME_SATURATE_RATIO = 0.7; +if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO = GETPOST('THEME_SATURATE_RATIO', 'int'); @@ -29,36 +20,0 @@ - -.customer-back { - background-color: #65953d !important; - color: #FFF !important; - padding: 2px; - margin: 2px; - border-radius: 3px; -} -.vendor-back { - background-color: #599caf !important; - color: #FFF !important; - padding: 2px; - margin: 2px; - border-radius: 3px; -} -.user-back { - background-color: #79633f !important; - color: #FFF !important; - padding: 2px; - margin: 2px; - border-radius: 3px; -} -.member-company-back { - padding: 2px 7px 2px 7px; - background-color: #e4e4e4; - color: #666; - border-radius: 10px; - white-space: nowrap; -} -.member-individual-back { - padding: 2px 7px 2px 7px; - background-color: #e4e4e4; - color: #666; - border-radius: 10px; - white-space: nowrap; -} @@ -72,5 +28,9 @@ -.bg-infobox-propal, .bg-infobox-facture, .bg-infobox-commande { - color: #65953d !important; -} -.bg-infobox-supplier_proposal, .bg-infobox-invoice_supplier, .bg-infobox-order_supplier { - color: #599caf !important; +.bg-infobox-propal, +.bg-infobox-facture, +.bg-infobox-commande{ + color: #99a17d !important; +} +.bg-infobox-supplier_proposal, +.bg-infobox-invoice_supplier, +.bg-infobox-order_supplier{ + color: #599caf !important; @@ -96 +56 @@ - color: #79633f; + color: #79633f !important; @@ -99 +59 @@ - color: #6c6aa8; + color: #6c6aa8 !important; @@ -102,15 +62,12 @@ - color: #a47080; -} -/* Color for customer object */ -.infobox-propal:not(.pictotitle):not(.error), -.infobox-facture:not(.pictotitle):not(.error), -.infobox-commande:not(.pictotitle):not(.error) { - color: #65953d; -} -/* Color for vendor object */ -.infobox-supplier_proposal:not(.pictotitle):not(.error), -.infobox-invoice_supplier:not(.pictotitle):not(.error), -.infobox-order_supplier:not(.pictotitle):not(.error) { - color: #599caf; -} - + color: #a47080 !important; +} +.infobox-propal, +.infobox-facture, +.infobox-commande{ + color: #99a17d !important; +} +.infobox-supplier_proposal, +.infobox-invoice_supplier, +.infobox-order_supplier{ + color: #599caf !important; +} @@ -118 +75 @@ - color: #46a676; + color: #46a676 !important; @@ -121 +78 @@ - color: #b0a53e; + color: #b0a53e !important; @@ -124 +81 @@ - color: #79633f; + color: #79633f !important; @@ -127 +84 @@ - color: #79633f; + color: #79633f !important; @@ -130,14 +87,6 @@ - color: #755114; -} - - -.info-box-module.--external span.info-box-icon-version { - background: #bbb; -} - -a.info-box-text.info-box-text-a { - /* display: table-cell; */ - display: contents; -} -a.info-box-text-a i.fa.fa-exclamation-triangle { - font-size: 0.9em; + color: #755114 !important; +} + + +.info-box-module-external span.info-box-icon-version { + background: #bbb; @@ -150 +99 @@ - background: var(--colorbacklineimpair2); + background: #fff; @@ -157,3 +106,3 @@ -.info-box.info-box-sm { - min-height: 80px; - margin-bottom: 10px; +.info-box.info-box-sm{ + min-height: 80px; + margin-bottom: 10px; @@ -162,4 +111,4 @@ - float: right; - top: 4px; - position: absolute; - right: 10px; + float: right; + top: 4px; + position: absolute; + right: 10px; @@ -171 +120 @@ -.info-box:not(.info-box-kanban) .progress { +.info-box .progress { @@ -181 +130 @@ -.info-box:not(.info-box-kanban) .progress .progress-bar { +.info-box .progress .progress-bar { @@ -201 +150 @@ - width: 86px; + width: 90px; @@ -205,34 +154,9 @@ - background: var(--colorbacktitle1) !important; - global->THEME_SATURATE_RATIO)) { ?> - filter: saturate(global->THEME_SATURATE_RATIO; ?>); - -} - -.info-box-module .info-box-icon { - padding-top: 4px; - padding-bottom: 4px; -} -.info-box-sm .info-box-icon, .info-box-sm .info-box-img { - height: 96px !important; /* must match height of info-box-sm .info-box-content */ - width: 80px; - font-size: 25px; - line-height: 92px; -} -.info-box-order { - border-top-left-radius: 2px; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - border-bottom-left-radius: 2px; - display: block; - overflow: hidden; - float: left; - height: 115px; - width: 88px; - text-align: center; - font-size: 2.3em; - line-height: 115px; - margin-right: 10px; - background: var(--colorbacktitle1) !important; -} -.opened-dash-board-wrap .info-box .info-box-icon { - font-size: 2em; + background: #eee; + global->THEME_SATURATE_RATIO)) { ?> + filter: saturate(global->THEME_SATURATE_RATIO; ?>); + +} +.info-box-sm .info-box-icon { + width: 80px; + font-size: 25px; + line-height: 92px; @@ -241 +165 @@ - line-height: 80px; + line-height: 80px; @@ -247 +171 @@ - max-width: 85%; + max-width: 100%; @@ -250,29 +174,20 @@ - max-width: 55%; -} - -.info-box-line { - line-height: 1.2em; -} -.info-box-line-text { - overflow: hidden; - width: calc(100% - 76px); - text-overflow: ellipsis; -} - -.info-box-icon-text { - box-sizing: border-box; - display: block; - position: absolute; - width: 90px; - bottom: 0px; - color: #ffffff; - background-color: rgba(0,0,0,0.1); - cursor: default; - - font-size: 10px; - line-height: 15px; - padding: 0px 3px; - text-align: center; - opacity: 0; - -webkit-transition: opacity 0.5s, visibility 0s 0.5s; - transition: opacity 0.5s, visibility 0s 0.5s; + max-width: 55%; +} + +.info-box-icon-text{ + box-sizing: border-box; + display: block; + position: absolute; + width: 90px; + bottom: 0px; + color: #ffffff; + background-color: rgba(0,0,0,0.1); + cursor: default; + + font-size: 10px; + line-height: 15px; + padding: 0px 3px; + text-align: center; + opacity: 0; + -webkit-transition: opacity 0.5s, visibility 0s 0.5s; + transition: opacity 0.5s, visibility 0s 0.5s; @@ -282,20 +197,20 @@ - box-sizing: border-box; - display: block; - position: absolute; - width: 90px; - bottom: 0px; - color: #ffffff; - background-color: rgba(0,0,0,0.1); - cursor: default; - - font-size: 10px; - line-height: 1.5em; - padding: 4px 3px; - text-align: center; - opacity: 1; - -webkit-transition: opacity 0.5s, visibility 0s 0.5s; - transition: opacity 0.5s, visibility 0s 0.5s; -} - -.box-flex-item.info-box-module.--disabled { - /* opacity: 0.6; */ + box-sizing: border-box; + display: block; + position: absolute; + width: 90px; + bottom: 0px; + color: #ffffff; + background-color: rgba(0,0,0,0.1); + cursor: default; + + font-size: 10px; + line-height: 22px; + padding: 0px 3px; + text-align: center; + opacity: 1; + -webkit-transition: opacity 0.5s, visibility 0s 0.5s; + transition: opacity 0.5s, visibility 0s 0.5s; +} + +.box-flex-item.info-box-module.info-box-module-disabled { + /* opacity: 0.6; */ @@ -306,31 +221,5 @@ - right: 0; - bottom: 0; -} - -/* customize section img box on list of products */ -.info-box-img { - height: 105px !important; - width: 88px; - border-top-left-radius: 2px; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - border-bottom-left-radius: 2px; - display: block; - overflow: hidden; - float: left; - text-align: center; - font-size: 2.8em; - line-height: 90px; - margin-right: 5px; - background: var(--colorbacktitle1) !important; -} -.info-box-img > img { - width: 90%; - position: relative; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); -} - - - + right: 0; + bottom: 0; +} + +global->MAIN_DISABLE_GLOBAL_BOXSTATS) && !empty($conf->global->MAIN_INCLUDE_GLOBAL_STATS_IN_OPENED_DASHBOARD)) { ?> @@ -338 +227 @@ - opacity: 1; + opacity: 1; @@ -343,2 +232,2 @@ - overflow: hidden; - width: 80px; + overflow: hidden; + width: 80px; @@ -347 +236 @@ - opacity: 1; + opacity: 1; @@ -351,4 +240 @@ - padding-top: 5px; - padding-bottom: 5px; - padding-left: 10px; - padding-right: 5px; + padding: 5px 10px; @@ -356,11 +241,0 @@ -} -.info-box-sm .info-box-content { - margin-left: 80px; - height: 86px; /* 96 - margins of .info-box-sm .info-box-content */ -} -.info-box-sm .info-box-module-enabled { - /* background: linear-gradient(0.35turn, #fff, #fff, #f6faf8, #e4efe8) */ - background: var(--infoboxmoduleenabledbgcolor); -} -.info-box-content-warning span.font-status4 { - color: #bc9526 !important; @@ -388,3 +262,0 @@ -.info-box-title { - width: calc(100% - 20px); -} @@ -392 +264 @@ - font-size: 0.90em; + font-size: 0.92em; @@ -407,0 +280,3 @@ +.info-box-icon { + color: #000 !important; +} @@ -410,12 +285,2 @@ - -$prefix = ''; -if (getDolGlobalString('THEME_INFOBOX_COLOR_ON_BACKGROUND')) { - $prefix = 'background-'; -} - -if (!isset($conf->global->THEME_SATURATE_RATIO)) { - $conf->global->THEME_SATURATE_RATIO = 0.7; -} -if (GETPOSTISSET('THEME_SATURATE_RATIO')) { - $conf->global->THEME_SATURATE_RATIO = GETPOST('THEME_SATURATE_RATIO', 'int'); -} +if (!isset($conf->global->THEME_SATURATE_RATIO)) $conf->global->THEME_SATURATE_RATIO = 0.7; +if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO = GETPOST('THEME_SATURATE_RATIO', 'int'); @@ -468 +333 @@ - content: "\f542"; + content: "\f0e8"; @@ -496 +361 @@ - background: var(--colorbacktitle1) !important; + background: #eee !important; @@ -500 +365 @@ - color : #cfbf00; + color : #000000; @@ -504 +369 @@ - color : #bc9526; + color : #000000; @@ -507,2 +372,2 @@ - content: "\f743"; - color : #b16000; + content: "\f0c2"; + color : #000000; @@ -512 +377 @@ - color : #b04000; + color : #000000; @@ -516,3 +381,2 @@ - color : #b01000; -} - + color : #000000; +} @@ -561,4 +424,0 @@ -.box-flex-grow-zero{ - flex-grow: 0 !important; -} - @@ -578,3 +437,0 @@ -.info-box-title { - width: calc(100% - 20px); -} @@ -583 +440 @@ - max-width: 350px; + max-width: 350px; @@ -588,34 +444,0 @@ -.fright { - float:right; -} - -@media only screen and (max-width: 1740px) { - .info-box-module { - min-width: 315px; - max-width: 315px; - } -} -@media only screen and (max-width: 767px) { - .info-box-module { - min-width: 260px; - } - .info-box-sm .info-box-icon { - width: 60px; - } - .info-box-sm .info-box-content { - margin-left: 60px; - } - .info-box-content { - padding-top: 5px; - padding-bottom: 5px; - padding-left: 10px; - padding-right: 2px; - } - .info-box-line-text { - width: calc(100% - 92px); - max-width: calc(100% - 82px); - } -} - - - --- /tmp/dsg/dolibarr/htdocs/theme/md/github_19.0.3_main_menu_fa_icons.inc.php +++ /tmp/dsg/dolibarr/htdocs/theme/md/client_main_menu_fa_icons.inc.php @@ -1,3 +1 @@ - + @@ -7,10 +5,10 @@ - /* font part */ - font-family: ""; - font-weight: 900; - font-style: normal; - font-variant: normal; - text-rendering: auto; - line-height: 26px; - font-size: 1.3em; - -webkit-font-smoothing: antialiased; - text-align:center; + /* font part */ + font-family: "Font Awesome 5 Free"; + font-weight: 900; + font-style: normal; + font-variant: normal; + text-rendering: auto; + line-height: 26px; + font-size: 1.5em; + -webkit-font-smoothing: antialiased; + text-align:center; @@ -18 +16 @@ - color: var(--colortextbackhmenu); + color: #; @@ -21,2 +19,7 @@ -div.mainmenu.menu { - background-image: none; + + +div.mainmenu.ticket::before { + content: "\f3ff"; +} +div.mainmenu.ticket { + background-image: none !important; @@ -25,5 +28 @@ -/* -div.mainmenu.menu::before { - content: "\f0c9"; -} -*/ + @@ -32 +31 @@ - content: "\f249"; + content: "\f249"; @@ -36 +35 @@ - content: "\f249"; + content: "\f249"; @@ -40 +39 @@ - content: "\f249"; + content: "\f249"; @@ -44 +43 @@ - content: "\f249"; + content: "\f249"; @@ -46,71 +44,0 @@ - -/* Define color of some picto */ - -.fa-phone, .fa-mobile-alt, .fa-fax { - opacity: 0.7; - color: #440; -} -.fa-at, .fa-external-link-alt, .fa-share-alt { - opacity: 0.7; - color: #304; -} -.fa-trash { - color: #666; -} -.fa-trash:hover:before { - color: #800; -} -.fa-play { - color: #444; -} -.fa-link, .fa-unlink { - color: #555; -} - -/* Define square Dolibarr logo in pure CSS */ - -.fa-dolibarr-css{ - color: #235481; - background: currentColor; - height: 150px; - width: 150px; - position: relative; -} -.fa-dolibarr-css:before{ - content: ''; - position: absolute; - left: 19%; - top: 17%; - width: 25%; - height: 25%; - border: solid 30px white; - border-radius: 0% 200% 200% 0% / 0% 180% 180% 0%; -} -.fa-dolibarr-css:after{ - content: ''; - position: absolute; - left: 19%; - top: 17%; - width: 5px; - height: 25%; - border-bottom: solid 60px currentColor; - margin-left: 30px; -} - -.tmenu span.fas, .tmenu span.far { - color: unset !important; - line-height: 28px; - text-align: center; -} - -.menu_titre .em092 { - font-size: 0.92em; -} - -.menu_titre .em088 { - font-size: 0.88em; -} - -.menu_titre .em080 { - font-size: 0.80em; -} --- /tmp/dsg/dolibarr/htdocs/theme/md/github_19.0.3_manifest.json.php +++ /tmp/dsg/dolibarr/htdocs/theme/md/client_manifest.json.php @@ -20 +20 @@ - * along with this program. If not, see . + * along with this program. If not, see . @@ -25 +25 @@ - * \brief File for The Web App (PWA) + * \brief File for The Web App @@ -28,27 +28,10 @@ -if (!defined('NOREQUIREUSER')) { - define('NOREQUIREUSER', '1'); -} -if (!defined('NOREQUIRESOC')) { - define('NOREQUIRESOC', '1'); -} -if (!defined('NOREQUIRETRAN')) { - define('NOREQUIRETRAN', '1'); -} -if (!defined('NOTOKENRENEWAL')) { - define('NOTOKENRENEWAL', '1'); -} -if (!defined('NOLOGIN')) { - define('NOLOGIN', '1'); -} -if (!defined('NOREQUIREMENU')) { - define('NOREQUIREMENU', '1'); -} -if (!defined('NOREQUIREHTML')) { - define('NOREQUIREHTML', '1'); -} -if (!defined('NOREQUIREAJAX')) { - define('NOREQUIREAJAX', '1'); -} -if (!defined('NOSESSION')) { - define('NOSESSION', '1'); -} +if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER', '1'); +if (! defined('NOREQUIREDB')) define('NOREQUIREDB', '1'); +if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1'); +if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN', '1'); +if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK', '1'); +if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); +if (! defined('NOLOGIN')) define('NOLOGIN', '1'); +if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1'); +if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML', '1'); +if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1'); @@ -58,9 +41,2 @@ -top_httphead('text/json'); -// Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access. -if (empty($dolibarr_nocache)) { - header('Cache-Control: max-age=10800, public, must-revalidate'); - // For a text/json, we must set an Expires to avoid to have it forced to an expired value by the web server - header('Expires: '.gmdate('D, d M Y H:i:s', dol_now('gmt') + 10800).' GMT'); -} else { - header('Cache-Control: no-cache'); -} +$appli=constant('DOL_APPLICATION_TITLE'); +if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE; @@ -68,95 +44,14 @@ - -$manifest = new stdClass(); - -$manifest->manifest_version = 3; - -$manifest->name = constant('DOL_APPLICATION_TITLE'); -if (getDolGlobalString('MAIN_APPLICATION_TITLE')) { - $manifest->name = getDolGlobalString('MAIN_APPLICATION_TITLE'); -} -$manifest->short_name = $manifest->name; - -$manifest->theme_color = getDolGlobalString('MAIN_MANIFEST_APPLI_THEME_COLOR', getDolGlobalString('THEME_ELDY_TOPMENU_BACK1', '#F05F40')); -if (!preg_match('/#[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]$/', $manifest->theme_color)) { - include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; - $manifest->theme_color = '#'.colorArrayToHex(colorStringToArray($manifest->theme_color)); -} -$manifest->background_color = getDolGlobalString('MAIN_MANIFEST_APPLI_BG_COLOR', "#ffffff"); -if (!preg_match('/#[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]$/', $manifest->background_color)) { - include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; - $manifest->background_color = '#'.colorArrayToHex(colorStringToArray($manifest->background_color)); -} -$manifest->display = getDolGlobalString('MAIN_MANIFEST_DISPLAY', "minimal-ui"); -$manifest->splash_pages = null; -$manifest->icons = array(); -$manifest->start_url = constant('DOL_MAIN_URL_ROOT'); -$manifest->id = constant('DOL_MAIN_URL_ROOT'); - -if (getDolGlobalString('MAIN_MANIFEST_APPLI_LOGO_URL')) { - $icon = new stdClass(); - $icon->src = getDolGlobalString('MAIN_MANIFEST_APPLI_LOGO_URL'); - if (getDolGlobalString('MAIN_MANIFEST_APPLI_LOGO_URL_SIZE')) { - $icon->sizes = getDolGlobalString('MAIN_MANIFEST_APPLI_LOGO_URL_SIZE') . "x" . getDolGlobalString('MAIN_MANIFEST_APPLI_LOGO_URL_SIZE'); - } else { - $icon->sizes = "512x512"; - } - $icon->type = "image/png"; - $manifest->icons[] = $icon; -} elseif (getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED')) { - if (getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI')) { - $iconRelativePath = 'logos/thumbs/' . getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI'); - $iconPath = $conf->mycompany->dir_output.'/'.$iconRelativePath; - if (is_readable($iconPath)) { - $imgSize = getimagesize($iconPath); - if (!empty($imgSize)) { - $icon = new stdClass(); - $icon->src = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode($iconRelativePath); - $icon->sizes = $imgSize[0]."x".$imgSize[1]; - $icon->type = "image/png"; - $manifest->icons[] = $icon; - } - } - } - - if (getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_SMALL')) { - $iconRelativePath = 'logos/thumbs/' . getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_SMALL'); - $iconPath = $conf->mycompany->dir_output.'/'.$iconRelativePath; - if (is_readable($iconPath)) { - $imgSize = getimagesize($iconPath); - if ($imgSize) { - $icon = new stdClass(); - $icon->src = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode($iconRelativePath); - $icon->sizes = $imgSize[0]."x".$imgSize[1]; - $icon->type = "image/png"; - $manifest->icons[] = $icon; - } - } - } - - if (getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED')) { - $iconRelativePath = 'logos/' . getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED'); - $iconPath = $conf->mycompany->dir_output.'/'.$iconRelativePath; - if (is_readable($iconPath)) { - $imgSize = getimagesize($iconPath); - if ($imgSize) { - $icon = new stdClass(); - $icon->src = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode($iconRelativePath); - $icon->sizes = $imgSize[0]."x".$imgSize[1]; - $icon->type = "image/png"; - $manifest->icons[] = $icon; - } - } - } -} - -// Add Dolibarr std icon -if (empty($manifest->icons)) { - $icon = new stdClass(); - $icon->src = DOL_URL_ROOT.'/theme/dolibarr_256x256_color.png'; - $icon->sizes = "256x256"; - $icon->type = "image/png"; - $manifest->icons[] = $icon; -} - - -print json_encode($manifest); +?> +{ + "name": "", + "icons": [ + { + "src": "", + "sizes": "256x256", + "type": "image/png" + } + ], + "theme_color": "#ffffff", + "background_color": "#ffffff", + "display": "standalone" +} --- /tmp/dsg/dolibarr/htdocs/theme/md/github_19.0.3_style.css.php +++ /tmp/dsg/dolibarr/htdocs/theme/md/client_style.css.php @@ -9 +8,0 @@ - * Copyright (C) 2021-2023 Anthony Berton @@ -32,3 +31 @@ -if (!defined('NOREQUIRESOC')) { - define('NOREQUIRESOC', '1'); -} +if (!defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1'); @@ -36,9 +33,3 @@ -if (!defined('NOCSRFCHECK')) { - define('NOCSRFCHECK', 1); -} -if (!defined('NOTOKENRENEWAL')) { - define('NOTOKENRENEWAL', 1); -} -if (!defined('NOLOGIN')) { - define('NOLOGIN', 1); // File must be accessed by logon page so without login -} +if (!defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1); +if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); +if (!defined('NOLOGIN')) define('NOLOGIN', 1); // File must be accessed by logon page so without login @@ -46,6 +37,2 @@ -if (!defined('NOREQUIREHTML')) { - define('NOREQUIREHTML', 1); -} -if (!defined('NOREQUIREAJAX')) { - define('NOREQUIREAJAX', '1'); -} +if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1); +if (!defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1'); @@ -58,3 +45 @@ -if (defined('THEME_ONLY_CONSTANT')) { - return; -} +if (defined('THEME_ONLY_CONSTANT')) return; @@ -70 +55,2 @@ -if (empty($user->id) && !empty($_SESSION['dol_login'])) { +if (empty($user->id) && !empty($_SESSION['dol_login'])) +{ @@ -73,4 +58,0 @@ - - // Reload menu now we have the good user (and we need the good menu to have ->showmenu('topnb') correct. - $menumanager = new MenuManager($db, empty($user->socid) ? 0 : 1); - $menumanager->loadMenu(); @@ -83,16 +65,5 @@ -if (empty($dolibarr_nocache)) { - header('Cache-Control: max-age=10800, public, must-revalidate'); -} else { - header('Cache-Control: no-cache'); -} - -if (GETPOST('theme', 'aZ09')) { - $conf->theme = GETPOST('theme', 'aZ09'); // If theme was forced on URL -} -if (GETPOST('lang', 'aZ09')) { - $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL -} - -if (GETPOSTISSET('THEME_DARKMODEENABLED')) { - $conf->global->THEME_DARKMODEENABLED = GETPOST('THEME_DARKMODEENABLED', 'int'); // If darkmode was forced on URL -} +if (empty($dolibarr_nocache)) header('Cache-Control: max-age=10800, public, must-revalidate'); +else header('Cache-Control: no-cache'); + +if (GETPOST('theme', 'alpha')) $conf->theme = GETPOST('theme', 'alpha'); // If theme was forced on URL +if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL @@ -106,4 +77 @@ -if (getDolGlobalString('MAIN_OVERWRITE_THEME_RES')) { - $path = '/' . getDolGlobalString('MAIN_OVERWRITE_THEME_RES'); - $theme = $conf->global->MAIN_OVERWRITE_THEME_RES; -} +if (!empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path = '/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme = $conf->global->MAIN_OVERWRITE_THEME_RES; } @@ -127 +94,0 @@ -$userborderontable = getDolGlobalInt('THEME_ELDY_USEBORDERONTABLE'); @@ -130,33 +97,9 @@ -if (!isset($conf->global->THEME_ELDY_BACKBODY)) { - $conf->global->THEME_ELDY_BACKBODY = $colorbackbody; -} -if (!isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) { - $conf->global->THEME_ELDY_TOPMENU_BACK1 = $colorbackhmenu1; -} -if (!isset($conf->global->THEME_ELDY_VERMENU_BACK1)) { - $conf->global->THEME_ELDY_VERMENU_BACK1 = $colorbackvmenu1; -} -if (!isset($conf->global->THEME_ELDY_BACKTITLE1)) { - $conf->global->THEME_ELDY_BACKTITLE1 = $colorbacktitle1; -} -if (!isset($conf->global->THEME_ELDY_USE_HOVER)) { - $conf->global->THEME_ELDY_USE_HOVER = $colorbacklinepairhover; -} -if (!isset($conf->global->THEME_ELDY_USE_CHECKED)) { - $conf->global->THEME_ELDY_USE_CHECKED = $colorbacklinepairchecked; -} -if (!isset($conf->global->THEME_ELDY_LINEBREAK)) { - $conf->global->THEME_ELDY_LINEBREAK = $colorbacklinebreak; -} -if (!isset($conf->global->THEME_ELDY_TEXTTITLENOTAB)) { - $conf->global->THEME_ELDY_TEXTTITLENOTAB = $colortexttitlenotab; -} -if (!isset($conf->global->THEME_ELDY_TEXTLINK)) { - $conf->global->THEME_ELDY_TEXTLINK = $colortextlink; -} -if (!isset($conf->global->THEME_ELDY_BTNACTION)) { - $conf->global->THEME_ELDY_BTNACTION = $butactionbg; -} -if (!isset($conf->global->THEME_ELDY_TEXTBTNACTION)) { - $conf->global->THEME_ELDY_TEXTBTNACTION = $textbutaction; -} +if (!isset($conf->global->THEME_ELDY_BACKBODY)) $conf->global->THEME_ELDY_BACKBODY = $colorbackbody; +if (!isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1 = $colorbackhmenu1; +if (!isset($conf->global->THEME_ELDY_VERMENU_BACK1)) $conf->global->THEME_ELDY_VERMENU_BACK1 = $colorbackvmenu1; +if (!isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1 = $colorbacktitle1; +if (!isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER = $colorbacklinepairhover; +if (!isset($conf->global->THEME_ELDY_USE_CHECKED)) $conf->global->THEME_ELDY_USE_CHECKED = $colorbacklinepairchecked; +if (!isset($conf->global->THEME_ELDY_LINEBREAK)) $conf->global->THEME_ELDY_LINEBREAK = $colorbacklinebreak; +if (!isset($conf->global->THEME_ELDY_TEXTTITLENOTAB)) $conf->global->THEME_ELDY_TEXTTITLENOTAB = $colortexttitlenotab; +if (!isset($conf->global->THEME_ELDY_TEXTLINK)) $conf->global->THEME_ELDY_TEXTLINK = $colortextlink; @@ -165 +108,2 @@ -if (!getDolGlobalString('THEME_ELDY_ENABLE_PERSONALIZED')) { +if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) +{ @@ -175,22 +119,19 @@ -$colorbackhmenu1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('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); -$colorbackvmenu1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('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); -$colortopbordertitle1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TOPBORDER_TITLE1') ? $colortopbordertitle1 : $conf->global->THEME_ELDY_TOPBORDER_TITLE1) : (empty($user->conf->THEME_ELDY_TOPBORDER_TITLE1) ? $colortopbordertitle1 : $user->conf->THEME_ELDY_TOPBORDER_TITLE1); -$colorbacktitle1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_BACKTITLE1') ? $colorbacktitle1 : $conf->global->THEME_ELDY_BACKTITLE1) : (empty($user->conf->THEME_ELDY_BACKTITLE1) ? $colorbacktitle1 : $user->conf->THEME_ELDY_BACKTITLE1); -$colorbacktabcard1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_BACKTABCARD1') ? $colorbacktabcard1 : $conf->global->THEME_ELDY_BACKTABCARD1) : (empty($user->conf->THEME_ELDY_BACKTABCARD1) ? $colorbacktabcard1 : $user->conf->THEME_ELDY_BACKTABCARD1); -$colorbacktabactive = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_BACKTABACTIVE') ? $colorbacktabactive : $conf->global->THEME_ELDY_BACKTABACTIVE) : (empty($user->conf->THEME_ELDY_BACKTABACTIVE) ? $colorbacktabactive : $user->conf->THEME_ELDY_BACKTABACTIVE); -$colorbacklineimpair1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_LINEIMPAIR1') ? $colorbacklineimpair1 : $conf->global->THEME_ELDY_LINEIMPAIR1) : (empty($user->conf->THEME_ELDY_LINEIMPAIR1) ? $colorbacklineimpair1 : $user->conf->THEME_ELDY_LINEIMPAIR1); -$colorbacklineimpair2 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_LINEIMPAIR2') ? $colorbacklineimpair2 : $conf->global->THEME_ELDY_LINEIMPAIR2) : (empty($user->conf->THEME_ELDY_LINEIMPAIR2) ? $colorbacklineimpair2 : $user->conf->THEME_ELDY_LINEIMPAIR2); -$colorbacklinepair1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_LINEPAIR1') ? $colorbacklinepair1 : $conf->global->THEME_ELDY_LINEPAIR1) : (empty($user->conf->THEME_ELDY_LINEPAIR1) ? $colorbacklinepair1 : $user->conf->THEME_ELDY_LINEPAIR1); -$colorbacklinepair2 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_LINEPAIR2') ? $colorbacklinepair2 : $conf->global->THEME_ELDY_LINEPAIR2) : (empty($user->conf->THEME_ELDY_LINEPAIR2) ? $colorbacklinepair2 : $user->conf->THEME_ELDY_LINEPAIR2); -$colorbacklinebreak = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_LINEBREAK') ? $colorbacklinebreak : $conf->global->THEME_ELDY_LINEBREAK) : (empty($user->conf->THEME_ELDY_LINEBREAK) ? $colorbacklinebreak : $user->conf->THEME_ELDY_LINEBREAK); -$colorbackbody = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_BACKBODY') ? $colorbackbody : $conf->global->THEME_ELDY_BACKBODY) : (empty($user->conf->THEME_ELDY_BACKBODY) ? $colorbackbody : $user->conf->THEME_ELDY_BACKBODY); -$colortexttitlenotab = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TEXTTITLENOTAB') ? $colortexttitlenotab : $conf->global->THEME_ELDY_TEXTTITLENOTAB) : (empty($user->conf->THEME_ELDY_TEXTTITLENOTAB) ? $colortexttitlenotab : $user->conf->THEME_ELDY_TEXTTITLENOTAB); -$colortexttitle = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TEXTTITLE') ? $colortext : $conf->global->THEME_ELDY_TEXTTITLE) : (empty($user->conf->THEME_ELDY_TEXTTITLE) ? $colortexttitle : $user->conf->THEME_ELDY_TEXTTITLE); -$colortexttitlelink = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TEXTTITLELINK') ? $colortexttitlelink : $conf->global->THEME_ELDY_TEXTTITLELINK) : (empty($user->conf->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $user->conf->THEME_ELDY_TEXTTITLELINK); -$colortext = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TEXT') ? $colortext : $conf->global->THEME_ELDY_TEXT) : (empty($user->conf->THEME_ELDY_TEXT) ? $colortext : $user->conf->THEME_ELDY_TEXT); -$colortextlink = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TEXTLINK') ? $colortext : $conf->global->THEME_ELDY_TEXTLINK) : (empty($user->conf->THEME_ELDY_TEXTLINK) ? $colortextlink : $user->conf->THEME_ELDY_TEXTLINK); -$butactionbg = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_BTNACTION') ? $butactionbg : $conf->global->THEME_ELDY_BTNACTION) : (empty($user->conf->THEME_ELDY_BTNACTION) ? $butactionbg : $user->conf->THEME_ELDY_BTNACTION); -$textbutaction = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TEXTBTNACTION') ? $textbutaction : $conf->global->THEME_ELDY_TEXTBTNACTION) : (empty($user->conf->THEME_ELDY_TEXTBTNACTION) ? $textbutaction : $user->conf->THEME_ELDY_TEXTBTNACTION); -$fontsize = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_FONT_SIZE1') ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE1) : (empty($user->conf->THEME_ELDY_FONT_SIZE1) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE1); -$fontsizesmaller = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_FONT_SIZE2') ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE2) : (empty($user->conf->THEME_ELDY_FONT_SIZE2) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE2); -$heightrow = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_USECOMOACTROW') ? '155%' : '300%') : (!getDolGlobalString('THEME_ELDY_USECOMOACTROW') ? '155%' : '300%'); +$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); +$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); +$colortopbordertitle1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TOPBORDER_TITLE1) ? $colortopbordertitle1 : $conf->global->THEME_ELDY_TOPBORDER_TITLE1) : (empty($user->conf->THEME_ELDY_TOPBORDER_TITLE1) ? $colortopbordertitle1 : $user->conf->THEME_ELDY_TOPBORDER_TITLE1); +$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); +$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); +$colorbacktabactive = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BACKTABACTIVE) ? $colorbacktabactive : $conf->global->THEME_ELDY_BACKTABACTIVE) : (empty($user->conf->THEME_ELDY_BACKTABACTIVE) ? $colorbacktabactive : $user->conf->THEME_ELDY_BACKTABACTIVE); +$colorbacklineimpair1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEIMPAIR1) ? $colorbacklineimpair1 : $conf->global->THEME_ELDY_LINEIMPAIR1) : (empty($user->conf->THEME_ELDY_LINEIMPAIR1) ? $colorbacklineimpair1 : $user->conf->THEME_ELDY_LINEIMPAIR1); +$colorbacklineimpair2 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEIMPAIR2) ? $colorbacklineimpair2 : $conf->global->THEME_ELDY_LINEIMPAIR2) : (empty($user->conf->THEME_ELDY_LINEIMPAIR2) ? $colorbacklineimpair2 : $user->conf->THEME_ELDY_LINEIMPAIR2); +$colorbacklinepair1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEPAIR1) ? $colorbacklinepair1 : $conf->global->THEME_ELDY_LINEPAIR1) : (empty($user->conf->THEME_ELDY_LINEPAIR1) ? $colorbacklinepair1 : $user->conf->THEME_ELDY_LINEPAIR1); +$colorbacklinepair2 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEPAIR2) ? $colorbacklinepair2 : $conf->global->THEME_ELDY_LINEPAIR2) : (empty($user->conf->THEME_ELDY_LINEPAIR2) ? $colorbacklinepair2 : $user->conf->THEME_ELDY_LINEPAIR2); +$colorbacklinebreak = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEBREAK) ? $colorbacklinebreak : $conf->global->THEME_ELDY_LINEBREAK) : (empty($user->conf->THEME_ELDY_LINEBREAK) ? $colorbacklinebreak : $user->conf->THEME_ELDY_LINEBREAK); +$colorbackbody = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BACKBODY) ? $colorbackbody : $conf->global->THEME_ELDY_BACKBODY) : (empty($user->conf->THEME_ELDY_BACKBODY) ? $colorbackbody : $user->conf->THEME_ELDY_BACKBODY); +$colortexttitlenotab = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLENOTAB) ? $colortexttitlenotab : $conf->global->THEME_ELDY_TEXTTITLENOTAB) : (empty($user->conf->THEME_ELDY_TEXTTITLENOTAB) ? $colortexttitlenotab : $user->conf->THEME_ELDY_TEXTTITLENOTAB); +$colortexttitle = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLE) ? $colortext : $conf->global->THEME_ELDY_TEXTTITLE) : (empty($user->conf->THEME_ELDY_TEXTTITLE) ? $colortexttitle : $user->conf->THEME_ELDY_TEXTTITLE); +$colortexttitlelink = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $conf->global->THEME_ELDY_TEXTTITLELINK) : (empty($user->conf->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $user->conf->THEME_ELDY_TEXTTITLELINK); +$colortext = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXT) ? $colortext : $conf->global->THEME_ELDY_TEXT) : (empty($user->conf->THEME_ELDY_TEXT) ? $colortext : $user->conf->THEME_ELDY_TEXT); +$colortextlink = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTLINK) ? $colortext : $conf->global->THEME_ELDY_TEXTLINK) : (empty($user->conf->THEME_ELDY_TEXTLINK) ? $colortextlink : $user->conf->THEME_ELDY_TEXTLINK); +$fontsize = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE1) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE1) : (empty($user->conf->THEME_ELDY_FONT_SIZE1) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE1); +$fontsizesmaller = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE2) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE2) : (empty($user->conf->THEME_ELDY_FONT_SIZE2) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE2); @@ -201 +142,2 @@ -if (!empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)) { +if (!empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)) +{ @@ -206,3 +148 @@ -if (empty($colortopbordertitle1)) { - $colortopbordertitle1 = $colorbackhmenu1; -} +if (empty($colortopbordertitle1)) $colortopbordertitle1 = $colorbackhmenu1; @@ -214,5 +154,2 @@ -if ($tmpval <= 460) { - $colortextbackhmenu = 'FFFFFF'; -} else { - $colortextbackhmenu = '000000'; -} +if ($tmpval <= 460) $colortextbackhmenu = 'FFFFFF'; +else $colortextbackhmenu = '000000'; @@ -223,7 +160,2 @@ -if ($tmpval <= 460) { - $colortextbackvmenu = 'FFFFFF'; -} else { - $colortextbackvmenu = '000000'; -} - -$colortopbordertitle1 = join(',', colorStringToArray($colortopbordertitle1)); // Normalize value to 'x,y,z' +if ($tmpval <= 460) { $colortextbackvmenu = 'FFFFFF'; } +else { $colortextbackvmenu = '000000'; } @@ -233 +165,2 @@ -if ($colortexttitle == '') { +if ($colortexttitle == '') +{ @@ -235,10 +168,4 @@ - if ($tmpval <= 460) { - $colortexttitle = 'FFFFFF'; - $colorshadowtitle = '888888'; - } else { - $colortexttitle = '101010'; - $colorshadowtitle = 'FFFFFF'; - } -} else { - $colorshadowtitle = '888888'; -} + if ($tmpval <= 460) { $colortexttitle = 'FFFFFF'; $colorshadowtitle = '888888'; } + else { $colortexttitle = '101010'; $colorshadowtitle = 'FFFFFF'; } +} +else $colorshadowtitle = '888888'; @@ -249,5 +176,2 @@ -if ($tmpval <= 460) { - $colortextbacktab = 'FFFFFF'; -} else { - $colortextbacktab = '111111'; -} +if ($tmpval <= 460) { $colortextbacktab = 'FFFFFF'; } +else { $colortextbacktab = '111111'; } @@ -265,6 +189,2 @@ -if ($colorbacklinepairhover != '') { - $colorbacklinepairhover = join(',', colorStringToArray($colorbacklinepairhover)); -} -if ($colorbacklinepairchecked != '') { - $colorbacklinepairchecked = join(',', colorStringToArray($colorbacklinepairchecked)); -} +if ($colorbacklinepairhover != '') $colorbacklinepairhover = join(',', colorStringToArray($colorbacklinepairhover)); +if ($colorbacklinepairchecked != '') $colorbacklinepairchecked = join(',', colorStringToArray($colorbacklinepairchecked)); @@ -278,4 +198 @@ -$nbtopmenuentriesreal = $nbtopmenuentries; -if ($conf->browser->layout == 'phone') { - $nbtopmenuentries = max($nbtopmenuentries, 10); -} +if ($conf->browser->layout == 'phone') $nbtopmenuentries = max($nbtopmenuentries, 10); @@ -294,7 +211,6 @@ -print 'colortexttitlenotab='.$colortexttitlenotab."\n"; -print 'colortexttitle='.$colortexttitle."\n"; -print 'colortext='.$colortext."\n"; -print 'colortextlink='.$colortextlink."\n"; -print 'colortexttitlelink='.$colortexttitlelink."\n"; -print 'colortextbackhmenu='.$colortextbackhmenu."\n"; -print 'colortextbackvmenu='.$colortextbackvmenu."\n"; +print '$colortexttitlenotab='.$colortexttitlenotab."\n"; +print '$colortexttitle='.$colortexttitle."\n"; +print '$colortext='.$colortext."\n"; +print '$colortextlink='.$colortextlink."\n"; +print '$colortextbackhmenu='.$colortextbackhmenu."\n"; +print '$colortextbackvmenu='.$colortextbackvmenu."\n"; @@ -312,2 +227,0 @@ -/*