Download as
Browse Code »

Commit 60af43b98197e8338fdca7b23ebbc188908ee1df

Authored by Dmitriy Zaporozhets
1 parent d95cfc61
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

restored search input & project link added

Showing 2 changed files with 19 additions and 2 deletions   Show diff stats
app/assets/stylesheets/style.scss
  Diff comments   View file @60af43b
@@ -553,7 +553,21 @@ header .account-links a:last-child{ @@ -553,7 +553,21 @@ header .account-links a:last-child{
553 } 553 }
554 554
555 /* eo Account Box */ 555 /* eo Account Box */
556 -input.search-input{float: left; text-shadow: none; width: 116px; background-image: url('icon-search.png') ; background-repeat: no-repeat; background-position: 10px; border-radius: 100px; border: 1px solid rgba(0,0,0,.7); box-shadow: 0 1px 0 rgba(255,255,255,.2), 0 2px 2px rgba(0,0,0,.4) inset ; background-color: #D2D5DA; background-color: rgba(255,255,255,.5); padding: 5px; padding-left: 26px; margin-top: 4px; margin-right: 10px } 556 +input.search-input{
  557 + float: left;
  558 + text-shadow: none;
  559 + width: 116px;
  560 + background-image: url('icon-search.png') ;
  561 + background-repeat: no-repeat;
  562 + background-position: 10px;
  563 + border-radius: 4px;
  564 + border: 1px solid #AAA;
  565 + background-color: #FFF;
  566 + padding: 5px;
  567 + padding-left: 26px;
  568 + margin-top: 4px;
  569 + margin-right: 10px;
  570 +}
557 /*input.search-input:focus{ background-color: white; width: 216px;}*/ 571 /*input.search-input:focus{ background-color: white; width: 216px;}*/
558 input.search-input::-webkit-input-placeholder {color: #666} 572 input.search-input::-webkit-input-placeholder {color: #666}
559 /* eo Header */ 573 /* eo Header */
app/views/layouts/_head_panel.html.haml
  Diff comments   View file @60af43b
@@ -18,10 +18,13 @@ @@ -18,10 +18,13 @@
18 = render :partial => "projects/refs", :locals => { :destination => controller.controller_name == "commits" ? "commits" : "tree" } 18 = render :partial => "projects/refs", :locals => { :destination => controller.controller_name == "commits" ? "commits" : "tree" }
19 = yield :rss_icon 19 = yield :rss_icon
20 20
21 - - if controller.controller_name == "dashboard" 21 + - if controller.controller_name == "dashboard" || current_page?(projects_path)
22 = link_to "Activities", dashboard_path, :class => "dash_top_link #{"active" if current_page?(dashboard_path) || current_page?(root_path) }" 22 = link_to "Activities", dashboard_path, :class => "dash_top_link #{"active" if current_page?(dashboard_path) || current_page?(root_path) }"
  23 + = link_to "Projects", projects_path, :class => "dash_top_link #{"active" if current_page?(projects_path)}"
23 = link_to "Issues", dashboard_issues_path, :class => "dash_top_link #{"active" if current_page?(dashboard_issues_path)}", :id => "issues_slide" 24 = link_to "Issues", dashboard_issues_path, :class => "dash_top_link #{"active" if current_page?(dashboard_issues_path)}", :id => "issues_slide"
24 = link_to "Merge Requests", dashboard_merge_requests_path, :class => "dash_top_link #{"active" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide" 25 = link_to "Merge Requests", dashboard_merge_requests_path, :class => "dash_top_link #{"active" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide"
  26 + .search
  27 + = text_field_tag "search", nil, :placeholder => "Search", :class => "search-input"
25 28
26 .account-box 29 .account-box
27 = link_to profile_path, :class => "pic" do 30 = link_to profile_path, :class => "pic" do