Commit 1e6e76d9 authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch 'pdreissen/ispconfig3-datalogstatus-responsive-fixes-browser-fixes' into stable-3.1

parents d0fc52e1 1d2231fa
......@@ -73,7 +73,8 @@ body {
height: 100%; }
#headerbar {
float: right; }
float: right;
}
#searchform {
float: right;
......@@ -733,6 +734,7 @@ input[type="password"].form-control[readonly] {
margin-top: 15px;
cursor: pointer;
margin-right: 15px;
float: right;
}
.notification {
animation: pulse 2s infinite;
......@@ -742,6 +744,7 @@ input[type="password"].form-control[readonly] {
margin-top: 0px;
margin-right: 0px;
margin-left: 230px;
position: relative;
}
}
@keyframes pulse {
......@@ -755,7 +758,7 @@ input[type="password"].form-control[readonly] {
background: #ff000e;
}
}
.systemmonitor-state.state-info {
.systemmonitor-state.state-info .statusMsg {
display: none;
}
......
......@@ -60,8 +60,7 @@
</tmpl_if>
</tmpl_if>
</div>
</div>
<div class="notification" data-toggle="modal" data-target="#datalogModal" style="display: none;">
<div class="notification" data-toggle="modal" data-target="#datalogModal" style="display: none;">
<span class="notification_text">{tmpl_var name="datalog_changes_count"}</span>
</div>
<!-- Datalogstatus Modal -->
......@@ -86,6 +85,7 @@
</div>
</div>
<!-- END Datalogstatus Modal -->
</div>
<tmpl_if name='logged_in' value='y'><div id='topnav-container'>
</div></tmpl_if>
<div class='clear'>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment