diff options
| author | Marius Balteanu <marius.balteanu@zitec.com> | 2021-08-10 19:59:00 +0000 |
|---|---|---|
| committer | Marius Balteanu <marius.balteanu@zitec.com> | 2021-08-10 19:59:00 +0000 |
| commit | 420781e9318314a27ab9206988a379269f15ec01 (patch) | |
| tree | 815a049c4003c71b312264720b99cbb3cbe3e7b4 | |
| parent | 3bae6bfac34229064e5b539e7aa0b82dd14d9a8d (diff) | |
| download | redmine-420781e9318314a27ab9206988a379269f15ec01.tar.gz redmine-420781e9318314a27ab9206988a379269f15ec01.zip | |
Remove wrapper2 and wrapper3 wrapping containers (#30448).
git-svn-id: http://svn.redmine.org/redmine/trunk@21151 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/layouts/base.html.erb | 5 | ||||
| -rw-r--r-- | public/javascripts/responsive.js | 4 | ||||
| -rw-r--r-- | public/stylesheets/application.css | 12 | ||||
| -rw-r--r-- | public/stylesheets/responsive.css | 4 |
4 files changed, 10 insertions, 15 deletions
diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb index 43e7459e7..5b7f23f79 100644 --- a/app/views/layouts/base.html.erb +++ b/app/views/layouts/base.html.erb @@ -58,8 +58,7 @@ </div> -<div id="wrapper2"> -<div id="wrapper3"> + <div id="top-menu"> <div id="account"> <%= render_menu :account_menu -%> @@ -118,13 +117,11 @@ <div id="footer"> Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> © 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> </html> diff --git a/public/javascripts/responsive.js b/public/javascripts/responsive.js index ec1611132..0bc5c3452 100644 --- a/public/javascripts/responsive.js +++ b/public/javascripts/responsive.js @@ -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'); } diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 17b536e09..4fe480208 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -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; } diff --git a/public/stylesheets/responsive.css b/public/stylesheets/responsive.css index a4902af67..89b34aeff 100644 --- a/public/stylesheets/responsive.css +++ b/public/stylesheets/responsive.css @@ -76,10 +76,6 @@ position: relative; overflow-x: hidden; /* hide horizontal overflow */ max-width: 100%; - } - - #wrapper, - #wrapper2 { margin: 0; } |