main-menu-unwrap.patch

Anonymous, 2018-12-18 08:54

Download (2.51 KB)

View differences:

app/views/layouts/base.html.erb (working copy)
69 69
</div>
70 70

  
71 71
<div id="header">
72

  
73 72
    <a href="#" class="mobile-toggle-button js-flyout-menu-toggle-button"></a>
74 73

  
75 74
    <% if User.current.logged? || !Setting.login_required? %>
......
87 86
    <% end %>
88 87

  
89 88
    <h1><%= page_header_title %></h1>
89
</div>
90 90

  
91
    <% if display_main_menu?(@project) %>
92
    <div id="main-menu" class="tabs">
93
        <%= render_main_menu(@project) %>
94
        <div class="tabs-buttons" style="display:none;">
95
            <button class="tab-left" onclick="moveTabLeft(this); return false;"></button>
96
            <button class="tab-right" onclick="moveTabRight(this); return false;"></button>
97
        </div>
98
    </div>
99
    <% end %>
91
<% if display_main_menu?(@project) %>
92
<div id="main-menu" class="tabs">
93
    <%= render_main_menu(@project) %>
94
        <div class="tabs-buttons" style="display:none;">
95
        <button class="tab-left" onclick="moveTabLeft(this); return false;"></button>
96
        <button class="tab-right" onclick="moveTabRight(this); return false;"></button>
97
    </div>
100 98
</div>
99
<% end %>
101 100

  
102 101
<div id="main" class="<%= sidebar_content? ? '' : 'nosidebar' %>">
103 102
    <div id="sidebar">
public/stylesheets/application.css (working copy)
26 26

  
27 27
#account {float:right;}
28 28

  
29
#header {min-height:5.3em;margin:0;background-color:#628DB6;color:#f8f8f8; padding: 4px 8px 20px 6px; position:relative;}
29
#header {min-height:5.3em;margin:0;background-color:#628DB6;color:#f8f8f8; padding: 4px 8px 4px 6px; position:relative;}
30 30
#header a {color:#f8f8f8;}
31 31
#header h1 { overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
32 32
#header h1 .breadcrumbs { display:block; font-size: .5em; font-weight: normal; }
......
34 34
#quick-search {float:right;}
35 35
#quick-search #q {width:130px; height:24px; box-sizing:border-box; vertical-align:middle; border:1px solid #ccc; border-radius:3px;}
36 36

  
37
#main-menu {position: absolute;  bottom: 0px;  left:6px; margin-right: -500px; width: 100%;}
37
#main-menu {position: relative;  bottom: 0px; margin-right: -500px; width: 100%; background: #628db6;}
38 38
#main-menu ul {margin: 0;  padding: 0; width: 100%; white-space: nowrap;}
39 39
#main-menu li {
40 40
  float:none;