diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-01-15 12:03:29 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-01-15 12:03:29 +0200 |
| commit | 60af43b98197e8338fdca7b23ebbc188908ee1df (patch) | |
| tree | bc37ebe73c33b63e44b5fb137bc31939956753d6 | |
| parent | d95cfc6144864065cfce1cf000b081b09389013e (diff) | |
| download | gitlab-ce-60af43b98197e8338fdca7b23ebbc188908ee1df.tar.gz | |
restored search input & project link added
| -rw-r--r-- | app/assets/stylesheets/style.scss | 16 | ||||
| -rw-r--r-- | app/views/layouts/_head_panel.html.haml | 5 |
2 files changed, 19 insertions, 2 deletions
diff --git a/app/assets/stylesheets/style.scss b/app/assets/stylesheets/style.scss index 2e28f648f31..62ed6320db1 100644 --- a/app/assets/stylesheets/style.scss +++ b/app/assets/stylesheets/style.scss @@ -553,7 +553,21 @@ header .account-links a:last-child{ } /* eo Account Box */ -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 } +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: 4px; + border: 1px solid #AAA; + background-color: #FFF; + padding: 5px; + padding-left: 26px; + margin-top: 4px; + margin-right: 10px; +} /*input.search-input:focus{ background-color: white; width: 216px;}*/ input.search-input::-webkit-input-placeholder {color: #666} /* eo Header */ diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/_head_panel.html.haml index 7381a877edf..0667ba3247a 100644 --- a/app/views/layouts/_head_panel.html.haml +++ b/app/views/layouts/_head_panel.html.haml @@ -18,10 +18,13 @@ = render :partial => "projects/refs", :locals => { :destination => controller.controller_name == "commits" ? "commits" : "tree" } = yield :rss_icon - - if controller.controller_name == "dashboard" + - if controller.controller_name == "dashboard" || current_page?(projects_path) = link_to "Activities", dashboard_path, :class => "dash_top_link #{"active" if current_page?(dashboard_path) || current_page?(root_path) }" + = link_to "Projects", projects_path, :class => "dash_top_link #{"active" if current_page?(projects_path)}" = link_to "Issues", dashboard_issues_path, :class => "dash_top_link #{"active" if current_page?(dashboard_issues_path)}", :id => "issues_slide" = link_to "Merge Requests", dashboard_merge_requests_path, :class => "dash_top_link #{"active" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide" + .search + = text_field_tag "search", nil, :placeholder => "Search", :class => "search-input" .account-box = link_to profile_path, :class => "pic" do |