move-search+projectselector-to-topbar.patch

Anonymous, 2019-09-22 23:42

Download (2.21 KB)

View differences:

app/views/layouts/base.html.erb (working copy)
66 66
    </div>
67 67
    <%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %>
68 68
    <%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%>
69
</div>
70

  
71
<div id="header">
72

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

  
75 69
    <% if User.current.logged? || !Setting.login_required? %>
76 70
    <div id="quick-search">
77 71
        <%= form_tag({:controller => 'search', :action => 'index', :id => @project}, :method => :get ) do %>
......
89 83
        <%= render_project_jump_box %>
90 84
    </div>
91 85
    <% end %>
86
</div>
92 87

  
88
<div id="header">
89

  
90
    <a href="#" class="mobile-toggle-button js-flyout-menu-toggle-button"></a>
91

  
92

  
93

  
93 94
    <h1><%= page_header_title %></h1>
94 95

  
95 96
    <% if display_main_menu?(@project) %>
public/stylesheets/application.css (working copy)
15 15
#wrapper {background: white;overflow: hidden;}
16 16
#wrapper3 { display: flex; flex-direction: column; }
17 17

  
18
#top-menu {background: #3E5B76; color: #fff; height:1.8em; font-size: 0.8em; padding: 2px 2px 0px 6px;}
18
#top-menu {background: #3E5B76; color: #fff; height:2.3em; padding: 2px 2px 0px 6px;}
19 19
#top-menu ul {margin: 0;  padding: 0;}
20 20
#top-menu li {
21 21
  float:left;
22 22
  list-style-type:none;
23
  margin: 0px 0px 0px 0px;
23
  margin: 6px 0px 0px 6px;
24 24
  padding: 0px 0px 0px 0px;
25 25
  white-space:nowrap;
26 26
}
27 27
#top-menu a {color: #fff; margin-right: 8px; font-weight: bold;}
28
#top-menu #loggedas { float: right; margin-right: 0.5em; color: #fff; }
28
#top-menu #loggedas { float: right; margin: 6px 0px 0px 6px; color: #fff; }
29 29

  
30
#account {float:right;}
30
#account {float:right}
31 31

  
32 32
#header {min-height:5.3em;margin:0;background-color:#628DB6;color:#f8f8f8; padding: 4px 8px 20px 6px; position:relative;}
33 33
#header a {color:#f8f8f8;}