tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-26 23:34:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

css: Fix no-script apply styles in non-inline forms

Browse Source
This commit is contained in:
Johannes Meyer 2020-04-14 13:57:13 +02:00
parent cabfb8c7f9
commit 5ed41868d9
4 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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 icinga-controls'; const CSS_CLASS_LIMITER = 'limiter-control icinga-controls inline';
/** /**
* Default limit * Default limit

2
library/Icinga/Web/Widget/SortBox.php
View File

@ -187,7 +187,7 @@ class SortBox extends AbstractWidget
$columnForm = new Form(); $columnForm = new Form();
$columnForm->setTokenDisabled(); $columnForm->setTokenDisabled();
$columnForm->setName($this->name . '-column'); $columnForm->setName($this->name . '-column');
$columnForm->setAttrib('class', 'icinga-controls'); $columnForm->setAttrib('class', 'icinga-controls inline');
$columnForm->addElement( $columnForm->addElement(
'select', 'select',
'sort', 'sort',

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

@ -182,12 +182,6 @@ input.search {
} }
} }
html.no-js .sort-control form {
display: table;
margin-left: auto;
margin-top: 0.25em;
}
.controls { .controls {
.control-label-group { .control-label-group {
margin-top: 0; margin-top: 0;

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

@ -274,6 +274,8 @@ form.icinga-form .form-controls {
// Button styles // Button styles
.icinga-controls { .icinga-controls {
button:not([type]),
button[type="submit"],
input[type="submit"], input[type="submit"],
input[type="submit"].btn-confirm { input[type="submit"].btn-confirm {
.button(); .button();
@ -288,12 +290,17 @@ form.icinga-form .form-controls {
} }
button.noscript-apply { button.noscript-apply {
.rounded-corners(); color: @gray;
.button(@gray-lightest, @gray); background-color: @gray-lightest;
border-color: @gray;
border-width: 1px; border-width: 1px;
display: inline-block; }
padding: .1em .25em; }
margin: 0 .5em;
form.inline {
button.noscript-apply {
margin-left: .5em;
padding: .1em;
} }
} }
@ -479,10 +486,6 @@ form.icinga-form .form-info {
display: inline-block; display: inline-block;
} }
.sort-control > * {
display: inline-block;
}
/* Flyover form styles */ /* Flyover form styles */
.flyover-content form:not(.inline):not([role="search"]) { .flyover-content form:not(.inline):not([role="search"]) {