Merge pull request #2715 from pitaj/master

Make ACP sidebar fixed
This commit is contained in:
psychobunny
2015-02-11 17:57:20 -05:00
14 changed files with 37 additions and 30 deletions

View File

@@ -266,4 +266,14 @@
// See: https://github.com/twbs/bootstrap/commit/8e2348e9eda51296eb680192379ab37f10355ca3
.navbar-brand > img {
display: inline-block;
}
}
@media (min-width: 1200px) {
.acp-sidebar {
position: fixed;
top: 70px;
right: 15px;
width: initial;
max-width: calc( ~"(100% - 200px)/4" );
}
}

View File

@@ -20,7 +20,7 @@
</div>
</div>
</div>
<div class="col-lg-3">
<div class="col-lg-3 acp-sidebar">
<div class="panel panel-default affix">
<div class="panel-heading">Events Control Panel</div>
<div class="panel-body">
@@ -29,4 +29,3 @@
</div>
</div>
</div>

View File

@@ -7,7 +7,7 @@
</div>
</div>
</div>
<div class="col-lg-3">
<div class="col-lg-3 acp-sidebar">
<div class="panel panel-default affix">
<div class="panel-heading">Logs Control Panel</div>
<div class="panel-body">

View File

@@ -12,7 +12,7 @@
</div>
</div>
</div>
<div class="col-lg-3">
<div class="col-lg-3 acp-sidebar">
<div class="panel panel-default">
<div class="panel-heading">Revert to Default</div>
<div class="panel-body">
@@ -29,4 +29,4 @@
t.render(data);
});
};
</script>
</script>

View File

@@ -40,7 +40,7 @@
</div>
</div>
<div class="col-lg-3">
<div class="col-lg-3 acp-sidebar">
<div class="panel panel-default">
<div class="panel-heading">Logger Control Panel</div>
<div class="panel-body">

View File

@@ -79,7 +79,7 @@
</div>
</div>
<div class="col-lg-3">
<div class="col-lg-3 acp-sidebar">
<div class="panel panel-default">
<div class="panel-heading">Plugin Search</div>
<div class="panel-body">
@@ -96,4 +96,4 @@
</div>
</div>
</div>
</div>
</div>

View File

@@ -25,7 +25,7 @@
</div>
</div>
<div class="col-lg-3">
<div class="col-lg-3 acp-sidebar">
<div class="panel panel-default">
<div class="panel-heading">Languages Control Panel</div>
<div class="panel-body">
@@ -37,4 +37,4 @@
<script type="text/javascript">
$('#language').val(translator.getLanguage());
</script>
</script>

View File

@@ -58,7 +58,7 @@
</form>
</div>
<div class="col-lg-3">
<div class="col-lg-3 acp-sidebar">
<div class="panel panel-default">
<div class="panel-heading">Sounds Control Panel</div>
<div class="panel-body">
@@ -66,4 +66,4 @@
</div>
</div>
</div>
</div>
</div>

View File

@@ -132,7 +132,7 @@
</div>
</div>
<div class="col-lg-3">
<div class="col-lg-3 acp-sidebar">
<div class="panel panel-default">
<div class="panel-heading">Categories Control Panel</div>
<div class="panel-body">
@@ -153,4 +153,4 @@
</div>
</div>
</div>
</div>
</div>

View File

@@ -41,7 +41,7 @@
</div>
</div>
</div>
<div class="col-lg-3">
<div class="col-lg-3 acp-sidebar">
<div class="panel panel-default">
<div class="panel-heading">Flags Control Panel</div>
<div class="panel-body">
@@ -52,5 +52,3 @@
</div>
</div>
</div>

View File

@@ -37,7 +37,7 @@
</div>
</div>
<div class="col-lg-3">
<div class="col-lg-3 acp-sidebar">
<div class="panel panel-default">
<div class="panel-heading">Groups Control Panel</div>
<div class="panel-body">

View File

@@ -1,11 +1,11 @@
<div class="tags">
<!-- IF !tags.length -->
<div class="alert alert-warning">
<strong>Your forum does not have any topics with tags yet!</strong>
</div>
<!-- ENDIF !tags.length -->
<div class="col-lg-9">
<!-- IF !tags.length -->
<div class="alert alert-warning">
<strong>Your forum does not have any topics with tags yet!</strong>
</div>
<!-- ENDIF !tags.length -->
<div class="panel panel-default tag-management">
<div class="panel-heading">Tag Management</div>
<div class="panel-body">
@@ -34,7 +34,7 @@
</div>
</div>
<div class="col-lg-3">
<div class="col-lg-3 acp-sidebar">
<div class="panel panel-default">
<div class="panel-heading">Modify Tag</div>
<div class="panel-body">
@@ -52,4 +52,4 @@
</div>
</div>
</div>
</div>

View File

@@ -124,7 +124,7 @@
</div>
</div>
<div class="col-lg-3">
<div class="col-lg-3 acp-sidebar">
<div class="panel panel-default">
<div class="panel-heading">Users Control Panel</div>
<div class="panel-body">
@@ -133,4 +133,4 @@
</div>
</div>
</div>
</div>
</div>

View File

@@ -1,6 +1,6 @@
</div>
<div class="col-lg-3">
<div class="col-lg-3 acp-sidebar">
<div class="panel panel-default">
<div class="panel-heading">Save Settings</div>
<div class="panel-body">
@@ -14,4 +14,4 @@
require(['admin/settings'], function(Settings) {
Settings.prepare();
});
</script>
</script>