Merge branch 'develop' of github.com:digitalocean/netbox into develop-2.2

This commit is contained in:
Jeremy Stretch
2017-09-25 15:12:47 -04:00
21 changed files with 341 additions and 114 deletions

View File

@@ -329,13 +329,14 @@ li.occupied + li.available {
}
/* Devices */
table.component-list tr.ipaddress td {
background-color: #eeffff;
padding-bottom: 4px;
padding-top: 4px;
table.component-list td.subtable {
padding: 0;
padding-left: 16px;
}
table.component-list tr.ipaddress:hover td {
background-color: #e6f7f7;
table.component-list td.subtable td {
border: none;
padding-bottom: 6px;
padding-top: 6px;
}
/* AJAX loader */