Skip to content

Commit

Permalink
#45 - Fixed device info slider formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
lfkeitel committed Mar 29, 2018
1 parent cff340e commit b2644d7
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
4 changes: 2 additions & 2 deletions public/assets/js/device-list.js
Expand Up @@ -26,8 +26,8 @@ $.onReady(function() {
// Close all
$(".device-body").style("max-height", "0px");
}
if (mh !== "300px") {
thebody.style("max-height", "300px");
if (mh !== "1000px") {
thebody.style("max-height", "1000px");
} else {
thebody.style("max-height", "0px");
}
Expand Down
6 changes: 5 additions & 1 deletion public/assets/styles/device-list.css
Expand Up @@ -45,8 +45,12 @@
text-align: center;
}

.device-info-check {
flex-basis: 30px;
}

.device-info {
padding: 1em 0;
padding: 1.1em;
min-width: 25%;
display: inline-block;
}
Expand Down
2 changes: 1 addition & 1 deletion templates/partials/device-list.tmpl
Expand Up @@ -7,7 +7,7 @@
<a name="{{.ID}}"></a>
<div class="device-header {{if .IsBlacklisted}}blacklisted{{else}}good-standing{{end}}" data-device-id="{{.ID}}">
{{if or $.main.canDeleteDevice $.main.canEditDevice $.main.canReassignDevice $.main.canManageBlacklist}}
<div class="device-check-select">
<div class="device-check-select device-info-check">
<input type="checkbox" value="{{.MAC}}" class="device-checkbox">
</div>
{{end}}
Expand Down

0 comments on commit b2644d7

Please sign in to comment.