CSS: Fix controls floating

refs #11145
This commit is contained in:
Florian Strohmaier 2016-02-16 14:35:00 +01:00 committed by Eric Lippmann
parent 6267001053
commit 13f8da254c
2 changed files with 17 additions and 3 deletions

View File

@ -1,5 +1,14 @@
/*! Icinga Web 2 | (c) 2015 Icinga Development Team | GPLv2+ */ /*! Icinga Web 2 | (c) 2015 Icinga Development Team | GPLv2+ */
.filter {
clear: both;
}
.limiter-control,
.sort-control {
display: inline-block;
}
.limiter-control > .control-group { .limiter-control > .control-group {
padding: 0; padding: 0;
@ -19,6 +28,9 @@
} }
.pagination-control { .pagination-control {
clear: both;
float: left;
li { li {
&.active { &.active {
> a, > a,
@ -78,6 +90,11 @@
} }
} }
.sort-controls-container {
clear: right;
float: right;
}
html.no-js .sort-control form { html.no-js .sort-control form {
display: table; display: table;
margin-left: auto; margin-left: auto;

View File

@ -177,10 +177,8 @@ a:hover > .icon-cancel {
width: @name-value-table-name-width; width: @name-value-table-name-width;
} }
// TODO(el): Fix
.controls { .controls {
.limiter-control { .limiter-control {
float: right;
padding: @vertical-padding / 2 0; padding: @vertical-padding / 2 0;
margin-bottom: 0.25em; margin-bottom: 0.25em;
} }
@ -191,7 +189,6 @@ a:hover > .icon-cancel {
} }
.sort-control { .sort-control {
float: right;
padding: @vertical-padding / 2 0; padding: @vertical-padding / 2 0;
margin-bottom: 0.25em; margin-bottom: 0.25em;
margin-left: 0.5em; margin-left: 0.5em;