Merge pull request #2003 from annando/1511-vier-styles

Vier: The different styles are now working with the right menubar
This commit is contained in:
Tobias Diekershoff 2015-11-01 10:08:22 +01:00
commit 288d4e0d7b
6 changed files with 25 additions and 22 deletions

View File

@ -23,7 +23,7 @@ a.on {
background-color: #2C77AE !important 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; color: #989898 !important;
background-color: #252C33 !important; background-color: #252C33 !important;
border-right: 1px solid #D2D2D2; border-right: 1px solid #D2D2D2;

View File

@ -12,3 +12,7 @@ div.pager, ul.tabs {
aside { aside {
border-right: 1px solid #D2D2D2; border-right: 1px solid #D2D2D2;
} }
right_aside {
border-left: 1px solid #D2D2D2;
}

View File

@ -31,4 +31,3 @@
/* background-color: #FFFFF9; */ /* background-color: #FFFFF9; */
background-color: #fffafa; background-color: #fffafa;
} }

View File

@ -145,6 +145,10 @@ aside {
height: calc(100% - 54px); height: calc(100% - 54px);
} }
right_aside {
top: 44px;
}
section { section {
top: 44px; top: 44px;
} }

View File

@ -872,9 +872,23 @@ ul.menu-popup .empty {
} }
right_aside { right_aside {
width: 0px;
top: 32px;
display: none; 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 */ /* aside */

View File

@ -1,23 +1,5 @@
right_aside { 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; display: block;
margin-left: calc(100% - 215px);
box-shadow: 1px 2px 0px 0px #D8D8D8;
} }
#forumlist-sidebar { #forumlist-sidebar {