0001-Remove-wrapper2-and-wrapper3-wrapping-containers-304.patch

Marius BALTEANU, 2021-07-04 15:31

Download (3.11 KB)

View differences:

app/views/layouts/base.html.erb
58 58

  
59 59
</div>
60 60

  
61
<div id="wrapper2">
62
<div id="wrapper3">
61

  
63 62
<div id="top-menu">
64 63
    <div id="account">
65 64
        <%= render_menu :account_menu -%>
......
118 117
<div id="footer">
119 118
    Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2021 Jean-Philippe Lang
120 119
</div>
121
</div>
122 120

  
123 121
<div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
124 122
<div id="ajax-modal" style="display:none;"></div>
125 123

  
126
</div>
127 124
</div>
128 125
<%= call_hook :view_layouts_base_body_bottom %>
129 126
</body>
public/javascripts/responsive.js
2 2

  
3 3
function openFlyout() {
4 4
  $('html').addClass('flyout-is-active');
5
  $('#wrapper2').on('click', function(e){
5
  $('#wrapper').on('click', function(e){
6 6
    e.preventDefault();
7 7
    e.stopPropagation();
8 8
    closeFlyout();
......
11 11

  
12 12
function closeFlyout() {
13 13
  $('html').removeClass('flyout-is-active');
14
  $('#wrapper2').off('click');
14
  $('#wrapper').off('click');
15 15
}
16 16

  
17 17

  
public/stylesheets/application.css
16 16
.wiki h6 {font-size: 1em; color: #8e8e8e;}
17 17

  
18 18
/***** Layout *****/
19
div#wrapper, div#wrapper2, div#wrapper3 { min-height: inherit; }
20
#wrapper {background: white;overflow: hidden;}
21
#wrapper3 { display: flex; flex-direction: column; }
19
#wrapper {
20
  min-height: inherit;
21
  background: white;
22
  overflow: hidden;
23
  display: flex;
24
  flex-direction: column;
25
}
22 26

  
23 27
#top-menu {background: #3E5B76; color: #fff; height:1.8em; font-size: 0.8em; padding: 2px 10px 0px 12px;}
24 28
#top-menu ul {margin: 0;  padding: 0;}
......
113 117
#sidebar li input[type=checkbox] {height: 20px;}
114 118

  
115 119
#content { flex-grow: 1; background-color: #fff; margin: 0px; padding: 10px 16px 10px 16px; overflow-x: auto;}
116
html>body #content { min-height: 600px; }
117
* html body #content { height: 600px; } /* IE */
118 120

  
119 121
#main.nosidebar #sidebar{ display: none; }
120 122

  
public/stylesheets/responsive.css
76 76
    position: relative;
77 77
    overflow-x: hidden; /* hide horizontal overflow */
78 78
    max-width: 100%;
79
  }
80

  
81
  #wrapper,
82
  #wrapper2 {
83 79
    margin: 0;
84 80
  }
85 81

  
86
-