From dd94745e3377b3c7d6e8881291aa2f4ca407116d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 22 Dec 2021 20:57:14 +0100 Subject: [PATCH] Fix css for rtl languages --- htdocs/langs/en_US/main.lang | 2 +- htdocs/main.inc.php | 6 +++--- htdocs/theme/eldy/dropdown.inc.php | 2 +- htdocs/theme/eldy/global.inc.php | 9 ++++++--- htdocs/theme/md/dropdown.inc.php | 2 +- htdocs/theme/md/style.css.php | 24 ++++++++++++++---------- 6 files changed, 26 insertions(+), 19 deletions(-) diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 06acd399d25..c59da9aabec 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -88,7 +88,7 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C NbOfEntries=No. of entries GoToWikiHelpPage=Read online help (Internet access needed) GoToHelpPage=Read help -DedicatedPageAvailable=There is a dedicated help page related to your current screen +DedicatedPageAvailable=Dedicated help page related to your current screen HomePage=Home Page RecordSaved=Record saved RecordDeleted=Record deleted diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index dec6e389156..acd2239e07f 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1932,9 +1932,9 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead // Link to help pages if ($helpbaseurl && $helppage) { $text = ''; - $title = $langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage' : 'GoToHelpPage').'...'; + $title = $langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage' : 'GoToHelpPage').', '; if ($mode == 'wiki') { - $title .= '
'.$langs->trans("PageWiki").' '.dol_escape_htmltag('"'.strtr($helppage, '_', ' ').'"'); + $title .= '
'.img_picto('', 'globe', 'class="pictofixedwidth"').$langs->trans("PageWiki").' '.dol_escape_htmltag('"'.strtr($helppage, '_', ' ').'"'); if ($helppresent) { $title .= ' ('.$langs->trans("DedicatedPageAvailable").')'; } else { @@ -1949,7 +1949,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead } $text .= '">'; $text .= ''; - $text .= ''; + $text .= ''; $text .= ''; $toprightmenu .= $form->textwithtooltip('', $title, 2, 1, $text, 'login_block_elem', 2); } diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php index dcf7ca787b7..81734c817b8 100644 --- a/htdocs/theme/eldy/dropdown.inc.php +++ b/htdocs/theme/eldy/dropdown.inc.php @@ -359,7 +359,7 @@ a.top-menu-dropdown-link { -webkit-font-smoothing: antialiased; text-align:center; text-decoration:none; - margin-right: 5px; + margin-: 5px; display: inline-block; content: "\f0da"; /* color: rgba(0,0,0,0.3); */ diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 5033e90b858..503143d02c1 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -2932,14 +2932,17 @@ a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { /* color: #f3e4ac !important; */ } .helppresentcircle { + /* color: var(--colorbackhmenu1); - filter: invert(0.8); - margin-: -7px; + filter: invert(0.5); + */ + color: var(--colortextbackhmenu); + margin-: -4px; display: inline-block; - margin-top: -10px; font-size: x-small; vertical-align: super; opacity: 0.95; + transform: rotate(); } .vmenu div.blockvmenufirst, .vmenu div.blockvmenulogo, .vmenu div.blockvmenusearchphone, .vmenu div.blockvmenubookmarks diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php index 15888783b37..1aec654410f 100644 --- a/htdocs/theme/md/dropdown.inc.php +++ b/htdocs/theme/md/dropdown.inc.php @@ -365,7 +365,7 @@ a.top-menu-dropdown-link { -webkit-font-smoothing: antialiased; text-align:center; text-decoration:none; - margin-right: 5px; + margin-: 5px; display: inline-block; content: "\f0da"; color: rgba(0,0,0,0.3); diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index ddd7c28b542..e0c63983d0d 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -1834,7 +1834,7 @@ td.showDragHandle { width: 100%; padding-bottom: 20px; - padding-left: 229px; + padding-: 229px; padding-top: 16px; } @@ -1860,13 +1860,13 @@ td.showDragHandle { display: none; background: var(--colorbackvmenu1); - border-right: 1px solid rgba(0,0,0,0.2); + border-: 1px solid rgba(0,0,0,0.2); box-shadow: 3px 0 6px -2px #eee; bottom: 0; color: #333; display: block; font-family: "RobotoDraft","Roboto",sans-serif; - left: 0; + : 0; browser->layout, array('phone', 'tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { } else { ?> @@ -1920,12 +1920,13 @@ td.showDragHandle { } body.sidebar-collapse .side-nav-vert, body.sidebar-collapse #id-right { - margin-left: 0;padding-left:0 + margin-left: 0; + padding-left:0 } .side-nav-vert { - margin-left: 228px; + margin-: 228px; } /* body.sidebar-collapse .side-nav, body.sidebar-collapse .login_block_other, body.sidebar-collapse #topmenu-login-dropdown */ @@ -1991,7 +1992,7 @@ div.backgroundsemitransparent { #id-right { - padding-left: 0 ! important; + padding-: 0 ! important; } #id-left { z-index: 91; @@ -2941,7 +2942,7 @@ form[name="addtime"] img.userphoto { div.vmenu, td.vmenu { margin-: 2px; position: relative; - float: left; + float: ; padding: 0px; padding-bottom: 0px; padding-top: 0px; @@ -2949,7 +2950,7 @@ div.vmenu, td.vmenu { } .vmenu { - margin-left: 4px; + margin-: 4px; display: none; @@ -2993,14 +2994,17 @@ a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { } .helppresentcircle { + /* color: var(--colorbackhmenu1); filter: invert(0.5); - margin-left: -7px; + */ + color: var(--colortextbackhmenu); + margin-left: -4px; display: inline-block; - margin-top: -10px; font-size: x-small; vertical-align: super; opacity: 0.95; + transform: rotate(); } div.blockvmenulogo