From 6a53e3959f852e15b54e524813357ee989f9151c Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 1 Nov 2015 09:45:02 +0100 Subject: [PATCH] Vier: The different styles are now working with the right menubar --- view/theme/vier/dark.css | 2 +- view/theme/vier/flat.css | 4 ++++ view/theme/vier/netcolour.css | 1 - view/theme/vier/plus.css | 4 ++++ view/theme/vier/style.css | 18 ++++++++++++++++-- view/theme/vier/wide.css | 18 ------------------ 6 files changed, 25 insertions(+), 22 deletions(-) diff --git a/view/theme/vier/dark.css b/view/theme/vier/dark.css index 9501ecfe0..01045b6ff 100644 --- a/view/theme/vier/dark.css +++ b/view/theme/vier/dark.css @@ -23,7 +23,7 @@ a.on { background-color: #2C77AE !important } -aside, .menu-popup, .fc-state-highlight, a.off, .autocomplete { +aside, right_aside, .menu-popup, .fc-state-highlight, a.off, .autocomplete { color: #989898 !important; background-color: #252C33 !important; border-right: 1px solid #D2D2D2; diff --git a/view/theme/vier/flat.css b/view/theme/vier/flat.css index d71ab2177..a00d19c39 100644 --- a/view/theme/vier/flat.css +++ b/view/theme/vier/flat.css @@ -12,3 +12,7 @@ div.pager, ul.tabs { aside { border-right: 1px solid #D2D2D2; } + +right_aside { + border-left: 1px solid #D2D2D2; +} diff --git a/view/theme/vier/netcolour.css b/view/theme/vier/netcolour.css index c76e5b0af..77fea09f5 100644 --- a/view/theme/vier/netcolour.css +++ b/view/theme/vier/netcolour.css @@ -31,4 +31,3 @@ /* background-color: #FFFFF9; */ background-color: #fffafa; } - diff --git a/view/theme/vier/plus.css b/view/theme/vier/plus.css index 2ae6e5000..5faf069c2 100644 --- a/view/theme/vier/plus.css +++ b/view/theme/vier/plus.css @@ -145,6 +145,10 @@ aside { height: calc(100% - 54px); } +right_aside { + top: 44px; +} + section { top: 44px; } diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index a041eb3f1..15e42e79a 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -872,9 +872,23 @@ ul.menu-popup .empty { } right_aside { - width: 0px; - top: 32px; display: none; + vertical-align: top; + width: 185px; + padding-top: 10px; + padding-right: 20px; + padding-bottom: 0px; + padding-left: 10px; + background-color: #FFFFFF; + font-size: 13px; + overflow-y: auto; + z-index: 2; + line-height: 17px; + color: #737373; + box-shadow: 1px 2px 0px 0px #D8D8D8; + top: 32px; + position: absolute; + margin-left: calc(100% - 215px); } /* aside */ diff --git a/view/theme/vier/wide.css b/view/theme/vier/wide.css index 6f8d5427c..72c267326 100644 --- a/view/theme/vier/wide.css +++ b/view/theme/vier/wide.css @@ -1,23 +1,5 @@ right_aside { - vertical-align: top; - width: 185px; - padding-top: 10px; - padding-right: 20px; - padding-bottom: 0px; - padding-left: 10px; - background-color: #FFFFFF; - font-size: 13px; - overflow-y: auto; - z-index: 2; - line-height: 17px; - color: #737373; - top: 44px; - position: absolute; -/* position: fixed; - height: calc(100% - 54px); */ display: block; - margin-left: calc(100% - 215px); - box-shadow: 1px 2px 0px 0px #D8D8D8; } #forumlist-sidebar {