1
0
Fork 0

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Jan Steemann 2013-08-20 09:43:30 +02:00
commit 5c1d17daea
2 changed files with 10 additions and 3 deletions

View File

@ -275,7 +275,8 @@ border-top: 0;
.containerdivNewLine { .containerdivNewLine {
clear: both; clear: both;
float: left; float: left;
display: block; /*display: block;*/
display:none;
position: relative; position: relative;
margin-bottom: 30px; margin-bottom: 30px;
} }

View File

@ -23,6 +23,8 @@
#dashboardHeader .btn-group { #dashboardHeader .btn-group {
margin-left: 10px; margin-left: 10px;
margin-top: 6px; margin-top: 6px;
margin-bottom: 0;
padding-bottom: 0;
} }
#dashboardHeader ul a { #dashboardHeader ul a {
@ -192,7 +194,7 @@ li:hover h6, li.hover h6 {
#dashboardHeader .btn-group { #dashboardHeader .btn-group {
border-radius: 0 !important; border-radius: 0 !important;
max-height: 36px !important; max-height: 30px !important;
} }
/*NVD3*/ /*NVD3*/
@ -478,8 +480,12 @@ li:hover h6, li.hover h6 {
float:none; float:none;
} }
#statSwitch, #replSwitch {
float:right;
}
#statSwitch { #statSwitch {
margin-left: 15px; margin-right: -3px;
} }
.arangoSubHeader { .arangoSubHeader {