tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-09-25 02:47:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

LimiterControlForm: Remove class inline and update css

Browse Source
This commit is contained in:
Johannes Meyer 2019-07-17 08:23:14 +02:00
parent 2be7c784b2
commit 5c6d04f5d7
3 changed files with 10 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
application/forms/Control/LimiterControlForm.php
View File

@ -15,7 +15,7 @@ class LimiterControlForm extends Form
* *
* @var string * @var string
*/ */
const CSS_CLASS_LIMITER = 'limiter-control inline'; const CSS_CLASS_LIMITER = 'limiter-control icinga-controls';
/** /**
* Default limit * Default limit
@ -37,14 +37,10 @@ class LimiterControlForm extends Form
500 => '500' 500 => '500'
); );
public static $defaultElementDecorators = array( public static $defaultElementDecorators = [
array('Label', array('tag'=>'span', 'separator' => '')), ['Label', ['tag' => 'span', 'separator' => '']],
array('Help', array('placement' => 'APPEND')), ['ViewHelper', ['separator' => '']],
array(array('labelWrap' => 'HtmlTag'), array('tag' => 'div')), ];
array('ViewHelper', array('separator' => '')),
array('Errors', array('separator' => '')),
array('HtmlTag', array('tag' => 'div', 'class' => 'limiter-control-form'))
);
/** /**
* Default limit for this instance * Default limit for this instance

32
public/css/icinga/controls.less
View File

@ -79,29 +79,8 @@ input.search {
} }
} }
.limiter-control > .control-group { .limiter-control > select {
padding: 0; margin-left: .5em;
// Note that the sort-control form does not have padding as it's utilizing different decorators
> .control-label-group {
text-align: left;
padding: 0;
width: 1em;
}
> select {
width: 4.5em;
}
> i {
.sr-only();
}
}
.limiter-control,
.sort-control {
// Display limiter and sort control both on the same line; floating could be used here too to achieve the same
display: inline-block;
} }
.pagination-control { .pagination-control {
@ -164,8 +143,6 @@ input.search {
} }
.sort-control { .sort-control {
margin-left: 0.25em;
label { label {
width: auto; width: auto;
margin-right: 0.5em; margin-right: 0.5em;
@ -185,9 +162,10 @@ input.search {
.sort-controls-container { .sort-controls-container {
clear: right; clear: right;
float: right; float: right;
display: flex;
> * { > *:not(:last-child) {
vertical-align: middle; margin-right: .5em;
} }
} }

5
public/css/icinga/forms.less
View File

@ -439,11 +439,6 @@ form.icinga-forms .form-info {
// Specific form styles // Specific form styles
.limiter-control-form > * {
display: inline-block;
margin-right: 0.25em;
}
.search.inline { .search.inline {
display: inline-block; display: inline-block;
} }