main-block-fixes.diff

Anonymous, 2019-01-15 12:41

Download (2.46 KB)

View differences:

app/views/layouts/base.html.erb (working copy)
100 100
</div>
101 101

  
102 102
<div id="main" class="<%= sidebar_content? ? '' : 'nosidebar' %>">
103
    <div id="sidebar">
104
        <%= yield :sidebar %>
105
        <%= view_layouts_base_sidebar_hook_response %>
106
    </div>
107 103

  
108
    <div id="content">
109
        <%= render_flash_messages %>
110
        <%= yield %>
111
        <%= call_hook :view_layouts_base_content %>
112
        <div style="clear:both;"></div>
113
    </div>
104
  <div id="content">
105
      <%= render_flash_messages %>
106
      <%= yield %>
107
      <%= call_hook :view_layouts_base_content %>
108
      <div style="clear:both;"></div>
109
  </div>
110

  
111
  <div id="sidebar">
112
      <%= yield :sidebar %>
113
      <%= view_layouts_base_sidebar_hook_response %>
114
  </div>
115

  
114 116
</div>
115 117
</div>
116 118

  
public/stylesheets/application.css (working copy)
80 80
#admin-menu ul {margin: 0;  padding: 0;}
81 81
#admin-menu li {margin: 0;  padding: 0 0 6px 0; list-style-type:none;}
82 82

  
83
#main {background-color:#EEEEEE;}
83
#main {display: flex}
84 84

  
85
#sidebar{ float: right; width: 22%; position: relative; z-index: 9; padding: 0; margin: 0;}
85
#sidebar{ width: 220px; padding: 20px; background: #eee; border-left: 1px solid #ddd;}
86 86
* html #sidebar{ width: 22%; }
87 87
#sidebar h3{ font-size: 14px; margin-top:14px; color: #666;  }
88 88
#sidebar hr{ width: 100%; margin: 0 auto; height: 1px; background: #ccc; border: 0; }
......
93 93
#sidebar div.wiki ul {margin:inherit; padding-left:40px;}
94 94
#sidebar div.wiki ul li {list-style-type:inherit;}
95 95

  
96
#content { width: 75%; background-color: #fff; margin: 0px; border-right: 1px solid #ddd; padding: 6px 10px 10px 10px; z-index: 10; }
96
#content { width: 100%; background-color: #fff; margin: 0px; padding: 6px 10px 10px 10px; }
97 97
* html #content{ width: 75%; padding-left: 0; margin-top: 0px; padding: 6px 10px 10px 10px;}
98 98
html>body #content { min-height: 600px; }
99 99
* html body #content { height: 600px; } /* IE */
100 100

  
101 101
#main.nosidebar #sidebar{ display: none; }
102
#main.nosidebar #content{ width: auto; border-right: 0; }
103 102

  
104 103
#footer {clear: both; border-top: 1px solid #bbb; font-size: 0.9em; color: #aaa; padding: 5px; text-align:center; background:#fff;}
105 104