From 9b71c04fc17a6f53053d3677de9c17c278661412 Mon Sep 17 00:00:00 2001 From: Florian Strohmaier Date: Wed, 20 Oct 2021 17:54:00 +0200 Subject: [PATCH 1/7] layout-structure.less: Remove inset shadow for mobile refs #4562 --- public/css/icinga/layout-structure.less | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less index 933d1aa07..4ecbd6f5f 100644 --- a/public/css/icinga/layout-structure.less +++ b/public/css/icinga/layout-structure.less @@ -31,18 +31,18 @@ body { flex-direction: column; position: relative; z-index: 2; +} - &:after { - content: ""; - display: block; - position: absolute; - top: 0; - right: 0; - bottom: 0; - width: 1em; - background: linear-gradient(to left, rgba(0,0,0,.1), rgba(0,0,0,0)); - z-index: 0; - } +#layout:not(.minimal-layout) #sidebar:after { + content: ""; + display: block; + position: absolute; + top: 0; + right: 0; + bottom: 0; + width: 1em; + background: linear-gradient(to left, rgba(0,0,0,.1), rgba(0,0,0,0)); + z-index: 0; } #main { From 1ae6ee9615ca848d02f5843a9a55fe6642327374 Mon Sep 17 00:00:00 2001 From: Florian Strohmaier Date: Wed, 20 Oct 2021 17:54:33 +0200 Subject: [PATCH 2/7] layout.less: Increase `#mobile-menu-toggle` size refs #4562 --- public/css/icinga/layout.less | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/public/css/icinga/layout.less b/public/css/icinga/layout.less index d425acc13..876aa13dc 100644 --- a/public/css/icinga/layout.less +++ b/public/css/icinga/layout.less @@ -151,13 +151,19 @@ > button { background: none; border: none; - height: 2.5em; + font-size: 2em; + padding: 0 .5em; + line-height: 2; -webkit-appearance: none; -moz-appearance: none; -ms-appearance: none; appearance: none; } + + i:before { + margin-right: 0; + } } .container, From c672fdffc87e7b65bcfe8b2267a5cb06fab1a118 Mon Sep 17 00:00:00 2001 From: Florian Strohmaier Date: Wed, 20 Oct 2021 17:55:06 +0200 Subject: [PATCH 3/7] responsive.less: increase `#header-logo` size refs #4562 --- public/css/icinga/responsive.less | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/public/css/icinga/responsive.less b/public/css/icinga/responsive.less index 1597cb1a8..8ebf83882 100644 --- a/public/css/icinga/responsive.less +++ b/public/css/icinga/responsive.less @@ -75,16 +75,17 @@ #header-logo-container { width: auto; - height: 2.5em; + height: 4em; padding: 0; background: inherit; } #header-logo { float: left; - width: 6em; - height: 2em; - margin: .25em; + width: 9em; + height: 3em; + margin: .5em 1em; + background-position: left center; } #mobile-menu-toggle { From ea5560756be99bfc947b9a1c3750d989e8d8224b Mon Sep 17 00:00:00 2001 From: Florian Strohmaier Date: Thu, 21 Oct 2021 15:59:47 +0200 Subject: [PATCH 4/7] CSS: Fix #notifications layout on mobile refs #4562 --- public/css/icinga/layout.less | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public/css/icinga/layout.less b/public/css/icinga/layout.less index 876aa13dc..ddafaa227 100644 --- a/public/css/icinga/layout.less +++ b/public/css/icinga/layout.less @@ -206,6 +206,9 @@ list-style-type: none; margin: 0; padding: 0; +} + +#layout:not(.minimal-layout) #notifications { padding-left: 12em; } From bdfb75023f2222f489eb75f01096d1a1d1388258 Mon Sep 17 00:00:00 2001 From: Florian Strohmaier Date: Tue, 26 Oct 2021 16:49:15 +0200 Subject: [PATCH 5/7] PreferenceForm: Add `.theme-mode` class to theme mode control-group refs #4562 --- application/forms/PreferenceForm.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/application/forms/PreferenceForm.php b/application/forms/PreferenceForm.php index 7fd9b02d0..ac24ee130 100644 --- a/application/forms/PreferenceForm.php +++ b/application/forms/PreferenceForm.php @@ -243,7 +243,11 @@ class PreferenceForm extends Form ], 'value' => isset($value) ? $value : '', 'disable' => isset($disabled) ? $disabled : [], - 'escape' => false + 'escape' => false, + 'decorators' => array_merge( + array_slice(self::$defaultElementDecorators, 0, -1), + [['HtmlTag', ['tag' => 'div', 'class' => 'control-group theme-mode']]] + ) ] ); From 1fd861b5d636826d3c0e5f529d0bd09750882d2b Mon Sep 17 00:00:00 2001 From: Florian Strohmaier Date: Wed, 3 Nov 2021 17:06:41 +0100 Subject: [PATCH 6/7] forms.less: Fix them-mode control-group on mobile refs #4567 --- public/css/icinga/forms.less | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less index 90953a2de..5b9c4a2ec 100644 --- a/public/css/icinga/forms.less +++ b/public/css/icinga/forms.less @@ -546,3 +546,16 @@ form.icinga-form .form-info { text-align: center; } } + +#layout.minimal-layout .icinga-form { + .theme-mode { + .control-label-group { + width: 100%; + margin-bottom: .5em; + } + + label:first-of-type { + margin-left: auto; + } + } +} From d5ae19f57e60f987080166d330f2963231fde87b Mon Sep 17 00:00:00 2001 From: Florian Strohmaier Date: Wed, 3 Nov 2021 17:08:01 +0100 Subject: [PATCH 7/7] CSS: Optimize .form-controls layout in .minimal-layout refs #4567 --- public/css/icinga/forms.less | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less index 5b9c4a2ec..618e735da 100644 --- a/public/css/icinga/forms.less +++ b/public/css/icinga/forms.less @@ -88,6 +88,18 @@ form.inline { } } +#layout.minimal-layout .icinga-form { + .form-controls { + input[type="submit"] { + width: 100%; + + &:not(:last-child) { + margin-bottom: 1em; + } + } + } +} + // Label styles form.icinga-form .control-label-group {