Adjust padding and margin of .content and .controls

refs #7876
This commit is contained in:
Johannes Meyer 2015-04-17 10:04:24 +02:00
parent 675d070b86
commit 6d0870ad2e
4 changed files with 12 additions and 8 deletions

View File

@ -94,11 +94,14 @@ div.contacts div.notification-periods {
div.tinystatesummary { div.tinystatesummary {
.page-header(); .page-header();
font-size: 1em; font-size: 1em;
margin-bottom: 0.5em;
.badges { .badges {
display: inline-block; display: inline-block;
margin-bottom: 4px; margin-bottom: 4px;
margin-left: 1em; margin-left: 1em;
} }
.state > a { .state > a {
color: white; color: white;
font-size: 0.8em; font-size: 0.8em;

View File

@ -1,6 +1,7 @@
/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */ /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
form.sort-control { form.sort-control {
.dontprint;
float: right; float: right;
label { label {

View File

@ -119,12 +119,12 @@ html {
.container .controls { .container .controls {
top: 0; top: 0;
background-color: white; background-color: white;
padding: 0; padding: 1em 1em 0;
z-index: 100; z-index: 100;
} }
.container .fake-controls { .container .fake-controls {
padding: 0; padding: 1em 1em 0;
} }
.container .controls .pagination { .container .controls .pagination {
@ -149,10 +149,6 @@ html {
font-size: 0.9em; font-size: 0.9em;
} }
.container .controls > * {
margin-left: 1em;
}
.container .controls .pagination { .container .controls .pagination {
margin-left: 1.2em; margin-left: 1.2em;
} }
@ -161,6 +157,10 @@ html {
padding: 1em; padding: 1em;
} }
.controls + .fake-controls + .content {
padding-top: 0;
}
.dashboard .content { .dashboard .content {
padding: 0; padding: 0;
overflow: auto; overflow: auto;

View File

@ -1,12 +1,12 @@
/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */ /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
ul.tabs { ul.tabs {
padding: 1em 0 0 0; padding: 0;
list-style-type: inside; list-style-type: inside;
} }
.controls ul.tabs { .controls ul.tabs {
margin-left: 0em; margin-left: -1em;
margin-top: -3.54em; margin-top: -3.54em;
height: 2.6em; height: 2.6em;
overflow: hidden; overflow: hidden;