meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-02-21 02:52:03 +00:00
Code Issues Releases Wiki Activity

Remove wrapper2 and wrapper3 wrapping containers (#30448).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@21151 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu 2021-08-10 19:59:00 +00:00
parent 3bae6bfac3
commit 420781e931
4 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/layouts/base.html.erb
View File

@ -58,8 +58,7 @@
</div>
<div id="wrapper2">
<div id="wrapper3">
<div id="top-menu">
<div id="account">
<%= render_menu :account_menu -%>
@ -118,12 +117,10 @@
<div id="footer">
Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2021 Jean-Philippe Lang
</div>
</div>
<div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
<div id="ajax-modal" style="display:none;"></div>
</div>
</div>
<%= call_hook :view_layouts_base_body_bottom %>
</body>

4
public/javascripts/responsive.js
View File

@ -2,7 +2,7 @@
function openFlyout() {
$('html').addClass('flyout-is-active');
$('#wrapper2').on('click', function(e){
$('#wrapper').on('click', function(e){
e.preventDefault();
e.stopPropagation();
closeFlyout();
@ -11,7 +11,7 @@ function openFlyout() {
function closeFlyout() {
$('html').removeClass('flyout-is-active');
$('#wrapper2').off('click');
$('#wrapper').off('click');
}

12
public/stylesheets/application.css
View File

@ -16,9 +16,13 @@ pre, code {font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace;}
.wiki h6 {font-size: 1em; color: #8e8e8e;}
/***** Layout *****/
div#wrapper, div#wrapper2, div#wrapper3 { min-height: inherit; }
#wrapper {background: white;overflow: hidden;}
#wrapper3 { display: flex; flex-direction: column; }
#wrapper {
min-height: inherit;
background: white;
overflow: hidden;
display: flex;
flex-direction: column;
}
#top-menu {background: #3E5B76; color: #fff; height:1.8em; font-size: 0.8em; padding: 2px 10px 0px 12px;}
#top-menu ul {margin: 0; padding: 0;}
@ -113,8 +117,6 @@ div#wrapper, div#wrapper2, div#wrapper3 { min-height: inherit; }
#sidebar li input[type=checkbox] {height: 20px;}
#content { flex-grow: 1; background-color: #fff; margin: 0px; padding: 10px 16px 10px 16px; overflow-x: auto;}
html>body #content { min-height: 600px; }
* html body #content { height: 600px; } /* IE */
#main.nosidebar #sidebar{ display: none; }

4
public/stylesheets/responsive.css
View File

@ -76,10 +76,6 @@
position: relative;
overflow-x: hidden; /* hide horizontal overflow */
max-width: 100%;
}
#wrapper,
#wrapper2 {
margin: 0;
}