kolan/obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[#798] Fixed the sidebar design by moving #sidebar out of #main-menu

Browse Source 
The #main-menu was used as the entire left column but was having styles
applied to it for the menu which were leaking onto the #sidebar. By
wrapping the column in a unique div the menu styles were isolated from
the sidebar styles.
This commit is contained in:
Eric Davis 2011-12-28 11:14:38 -08:00
parent 15428fc092
commit ef00061568
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/layouts/base.rhtml
View File

@ -113,9 +113,12 @@
<% end %> <% end %>
<div id="main" class="<%= side_displayed ? '' : "nosidebar" %>"> <div id="main" class="<%= side_displayed ? '' : "nosidebar" %>">
<% if (side_displayed) %> <% if (side_displayed) %>
<div id="side-container">
<div id="main-menu"> <div id="main-menu">
<%= main_menu %> <%= main_menu %>
<%= yield :main_menu %> <%= yield :main_menu %>
</div>
<% if display_sidebar %> <% if display_sidebar %>
<!-- Sidebar --> <!-- Sidebar -->
<div id="sidebar"> <div id="sidebar">

8
public/stylesheets/application.css
View File

@ -26,7 +26,7 @@ h5, .wiki h4 {font-size: 11px;padding: 2px 10px 1px 0px;margin-bottom: 5px; bord
#quick-search {float:right;} #quick-search {float:right;}
#main-menu {position: absolute; bottom: auto; left:6px; margin-right: -500px;} #side-container {position: absolute; bottom: auto; left:6px; margin-right: -500px;}
#main-menu ul {margin: 0; padding: 0;} #main-menu ul {margin: 0; padding: 0;}
#main-menu li { #main-menu li {
float: none; float: none;
@ -1369,12 +1369,12 @@ div#optional_login_fields {
margin-left:2px; margin-left:2px;
} }
/*------------------------------------------------------------------------------- /*-------------------------------------------------------------------------------
* =02 - Main Menu * =02 - Side container
* *
* This section includes the layout and styles for the left navigation column. * This section includes the layout and styles for the left navigation column and menu.
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
#main-menu { #side-container {
width:185px; width:185px;
height:100%; height:100%;
position:absolute; position:absolute;