From 8241243f6b7dbfa00ada14ce859b91a5e7b17ea5 Mon Sep 17 00:00:00 2001 From: Peter Jaszkowiak Date: Tue, 10 Feb 2015 21:34:19 -0700 Subject: [PATCH 1/2] Make ACP sidebar fixed If you want to implement some kind of replacement for the CSS calc I used, go ahead and do it yourself. I'm hoping webmasters can either deal with a tad bit of overlap or have a modern browser. --- public/less/admin/admin.less | 12 +++++++++++- src/views/admin/advanced/events.tpl | 3 +-- src/views/admin/advanced/logs.tpl | 2 +- src/views/admin/appearance/skins.tpl | 4 ++-- src/views/admin/development/logger.tpl | 2 +- src/views/admin/extend/plugins.tpl | 4 ++-- src/views/admin/general/languages.tpl | 4 ++-- src/views/admin/general/sounds.tpl | 4 ++-- src/views/admin/manage/categories.tpl | 4 ++-- src/views/admin/manage/flags.tpl | 4 +--- src/views/admin/manage/groups.tpl | 2 +- src/views/admin/manage/tags.tpl | 14 +++++++------- src/views/admin/manage/users.tpl | 4 ++-- src/views/admin/settings/footer.tpl | 4 ++-- 14 files changed, 37 insertions(+), 30 deletions(-) diff --git a/public/less/admin/admin.less b/public/less/admin/admin.less index 2e5b868048..6beb1525fd 100644 --- a/public/less/admin/admin.less +++ b/public/less/admin/admin.less @@ -266,4 +266,14 @@ // See: https://github.com/twbs/bootstrap/commit/8e2348e9eda51296eb680192379ab37f10355ca3 .navbar-brand > img { display: inline-block; -} \ No newline at end of file +} + +@media (min-width: 768px) { + .acp-sidebar { + position: fixed; + top: 70px; + right: 15px; + width: initial; + max-width: calc( ~"(100% - 200px)/4" ); + } +} diff --git a/src/views/admin/advanced/events.tpl b/src/views/admin/advanced/events.tpl index e3231b0099..eb22fb13db 100644 --- a/src/views/admin/advanced/events.tpl +++ b/src/views/admin/advanced/events.tpl @@ -20,7 +20,7 @@ -
+
Events Control Panel
@@ -29,4 +29,3 @@
- diff --git a/src/views/admin/advanced/logs.tpl b/src/views/admin/advanced/logs.tpl index 0311573d25..24f91ce60b 100644 --- a/src/views/admin/advanced/logs.tpl +++ b/src/views/admin/advanced/logs.tpl @@ -7,7 +7,7 @@
-
+
Logs Control Panel
diff --git a/src/views/admin/appearance/skins.tpl b/src/views/admin/appearance/skins.tpl index e3e91680af..10211893f5 100644 --- a/src/views/admin/appearance/skins.tpl +++ b/src/views/admin/appearance/skins.tpl @@ -12,7 +12,7 @@
-
+
Revert to Default
@@ -29,4 +29,4 @@ t.render(data); }); }; - \ No newline at end of file + diff --git a/src/views/admin/development/logger.tpl b/src/views/admin/development/logger.tpl index 826f9e5bcc..6e9a932230 100644 --- a/src/views/admin/development/logger.tpl +++ b/src/views/admin/development/logger.tpl @@ -40,7 +40,7 @@
-
+
Logger Control Panel
diff --git a/src/views/admin/extend/plugins.tpl b/src/views/admin/extend/plugins.tpl index eb709885a2..b44c2461bc 100644 --- a/src/views/admin/extend/plugins.tpl +++ b/src/views/admin/extend/plugins.tpl @@ -79,7 +79,7 @@
-
+
Plugin Search
@@ -96,4 +96,4 @@
-
\ No newline at end of file +
diff --git a/src/views/admin/general/languages.tpl b/src/views/admin/general/languages.tpl index bc75b2fee4..b2365e91a3 100644 --- a/src/views/admin/general/languages.tpl +++ b/src/views/admin/general/languages.tpl @@ -25,7 +25,7 @@
-
+
Languages Control Panel
@@ -37,4 +37,4 @@ \ No newline at end of file + diff --git a/src/views/admin/general/sounds.tpl b/src/views/admin/general/sounds.tpl index 3556bcbb7d..fb43c138aa 100644 --- a/src/views/admin/general/sounds.tpl +++ b/src/views/admin/general/sounds.tpl @@ -58,7 +58,7 @@
-
+
Sounds Control Panel
@@ -66,4 +66,4 @@
-
\ No newline at end of file +
diff --git a/src/views/admin/manage/categories.tpl b/src/views/admin/manage/categories.tpl index 2c0dcf48da..711cdbce72 100644 --- a/src/views/admin/manage/categories.tpl +++ b/src/views/admin/manage/categories.tpl @@ -132,7 +132,7 @@
-
+
Categories Control Panel
@@ -153,4 +153,4 @@
-
\ No newline at end of file +
diff --git a/src/views/admin/manage/flags.tpl b/src/views/admin/manage/flags.tpl index 929fd6674d..23a5d6f796 100644 --- a/src/views/admin/manage/flags.tpl +++ b/src/views/admin/manage/flags.tpl @@ -41,7 +41,7 @@
-
+
Flags Control Panel
@@ -52,5 +52,3 @@
- - diff --git a/src/views/admin/manage/groups.tpl b/src/views/admin/manage/groups.tpl index 69f8bad37b..26fe157dac 100644 --- a/src/views/admin/manage/groups.tpl +++ b/src/views/admin/manage/groups.tpl @@ -37,7 +37,7 @@
-
+
Groups Control Panel
diff --git a/src/views/admin/manage/tags.tpl b/src/views/admin/manage/tags.tpl index afacffb2d4..1b8c687b00 100644 --- a/src/views/admin/manage/tags.tpl +++ b/src/views/admin/manage/tags.tpl @@ -1,11 +1,11 @@
- -
- Your forum does not have any topics with tags yet! -
-
+ +
+ Your forum does not have any topics with tags yet! +
+
Tag Management
@@ -34,7 +34,7 @@
-
+
Modify Tag
@@ -52,4 +52,4 @@
-
\ No newline at end of file +
diff --git a/src/views/admin/manage/users.tpl b/src/views/admin/manage/users.tpl index 1e034474b8..e68cef75ee 100644 --- a/src/views/admin/manage/users.tpl +++ b/src/views/admin/manage/users.tpl @@ -123,7 +123,7 @@
-
+
Users Control Panel
@@ -132,4 +132,4 @@
-
\ No newline at end of file +
diff --git a/src/views/admin/settings/footer.tpl b/src/views/admin/settings/footer.tpl index 77b495e33c..78e62335c5 100644 --- a/src/views/admin/settings/footer.tpl +++ b/src/views/admin/settings/footer.tpl @@ -1,6 +1,6 @@
-
+
Save Settings
@@ -14,4 +14,4 @@ require(['admin/settings'], function(Settings) { Settings.prepare(); }); - \ No newline at end of file + From a583f9d77adf1e666cc6bd56e82a51ff3a2e83c3 Mon Sep 17 00:00:00 2001 From: Peter Jaszkowiak Date: Wed, 11 Feb 2015 14:56:57 -0700 Subject: [PATCH 2/2] Fixed sidebar overlay issue on window width Had the wrong `min-width` --- public/less/admin/admin.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/less/admin/admin.less b/public/less/admin/admin.less index 6beb1525fd..8a508db2e0 100644 --- a/public/less/admin/admin.less +++ b/public/less/admin/admin.less @@ -268,7 +268,7 @@ display: inline-block; } -@media (min-width: 768px) { +@media (min-width: 1200px) { .acp-sidebar { position: fixed; top: 70px;