From e90a6b8c0f8f1316672c85a0249d0793d7fff552 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 16 Dec 2017 20:52:49 +0100 Subject: [PATCH] Option THEME_HIDE_BORDER_ON_INPUT to restore border on inputfields work also with md theme. --- htdocs/core/class/conf.class.php | 2 ++ htdocs/theme/eldy/style.css.php | 6 ++---- htdocs/theme/md/style.css.php | 5 +---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index 2defcd0e2cc..0603ec93014 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -581,6 +581,8 @@ class Conf if (empty($this->global->MAIN_SIZE_SHORTLIST_LIMIT)) $this->global->MAIN_SIZE_SHORTLIST_LIMIT=3; + if (! isset($this->global->THEME_HIDE_BORDER_ON_INPUT)) $this->global->THEME_HIDE_BORDER_ON_INPUT=0; + // Save inconsistent option if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && (! isset($conf->global->AGENDA_DEFAULT_FILTER_TYPE) || $conf->global->AGENDA_DEFAULT_FILTER_TYPE == 'AC_NON_AUTO')) { diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 037c6a0f069..a39aff863d2 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -284,15 +284,13 @@ input[type=submit] { margin-left: 5px; } input, input.flat, form.flat select, select, select.flat, .dataTables_length label select { - global->THEME_ELDY_SHOW_BORDER_INPUT)) - print "border: none;" - ?> + border: none; } input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select { font-family: ; outline: none; margin: 0px 0px 0px 0px; - border-bottom: solid 1px rgba(0,0,0,.2); + borderglobal->THEME_HIDE_BORDER_ON_INPUT)?'-bottom':''; ?>: solid 1px rgba(0,0,0,.2); } input { diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 8ab38157947..8d164280591 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -297,7 +297,7 @@ input, input.flat, textarea, textarea.flat, form.flat select, select, select.fla font-size: px; font-family: ; border: none; - border-bottom: solid 1px rgba(0,0,0,.1); + borderglobal->THEME_HIDE_BORDER_ON_INPUT)?'-bottom':''; ?>: solid 1px rgba(0,0,0,.2); outline: none; margin: 0px 0px 0px 0px; } @@ -317,9 +317,6 @@ input, select { margin-top:1px; } -input, select { - border-bottom: solid 1px rgba(0,0,0,.1); -} textarea { border-radius: 0;