Download as
Browse Code »

Commit 84d1dead668d8b4ecbb4317c0e05fedfa27ebbb9

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

new layout style

Showing 6 changed files with 62 additions and 83 deletions   Show diff stats
app/assets/images/Home-UI.PNG 0 → 100644
View file @84d1dea

891 Bytes
app/assets/stylesheets/projects.css.scss
  Diff comments   View file @84d1dea
... ... @@ -525,6 +525,7 @@ h4.dash-tabs {
525 525 }
526 526 }
527 527  
  528 +body header,
528 529 h4.middle-panel {
529 530 margin: 0;
530 531 border-bottom: 1px solid #ccc;
... ...
app/assets/stylesheets/style.scss
  Diff comments   View file @84d1dea
... ... @@ -333,8 +333,12 @@ body.login-page{background-color: #f1f1f1; padding-top: 10%}
333 333 body.collapsed #container{margin: auto; width: 980px; border: 1px solid rgba(0,0,0,.22); border-top: 0; box-shadow: 0 0 0px 4px rgba(0,0,0,.04)}
334 334  
335 335 /* Header */
336   -header{background: #474D57 url('bg-header.png') repeat-x bottom; z-index: 10000; height: 44px; padding: 10px 2% 6px 2%; position: relative}
337   -header a{color: white; text-shadow: 0 -1px 0 black}
  336 +header{
  337 + background: #474D57 url('bg-header.png') repeat-x bottom;
  338 + z-index: 10000;
  339 + height: 44px;
  340 + padding: 10px 2% 6px 2%;
  341 +}
338 342 header a:hover{color: #f1f1f1}
339 343 header h1{
340 344 width: 65px;
... ... @@ -417,7 +421,7 @@ header .login-top a.pic{float: left; margin-right: 10px;
417 421 }
418 422 header .login-top a.username{margin-bottom: 5px}
419 423 header .login-top a.logout{color: #ccc}
420   -header{margin-bottom: 0; clear: both; }
  424 +header{margin-bottom: 0; clear: both; position:relative;}
421 425  
422 426 .page-title{background-color: #f1f1f1;display: block; float: left; clear: both; width: 98%; padding: 1% 1%; border-bottom: 1px solid #ccc; box-shadow: 0 -1px 0 white inset; margin-bottom: 1.5em}
423 427 .page-title h1{font-size: 20px; width: 400px; margin: 0; padding-top: 8px }
... ... @@ -426,7 +430,7 @@ header{margin-bottom: 0; clear: both; }
426 430  
427 431 /* Account box */
428 432 header .account-box{position: absolute; right: 0; top: 8px; z-index: 10000; width: 128px; font-size: 11px; float: right; display: block; cursor: pointer;}
429   -header .account-box img{ border-radius: 4px; right: 20px; position: absolute; width: 38px; height: 38px; display: block; box-shadow: 0 1px 2px black}
  433 +header .account-box img{ border-radius: 4px; right: 20px; position: absolute; width: 38px; height: 38px; display: block; box-shadow: 0 1px 2px black; top:-3px;}
430 434 header .account-box img:after{
431 435 content: " ";
432 436 display: block;
... ... @@ -550,7 +554,7 @@ header .account-links a:last-child{
550 554  
551 555 /* eo Account Box */
552 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 }
553   -input.search-input:focus{ background-color: white; width: 216px;}
  557 +/*input.search-input:focus{ background-color: white; width: 216px;}*/
554 558 input.search-input::-webkit-input-placeholder {color: #666}
555 559 /* eo Header */
556 560  
... ... @@ -607,7 +611,7 @@ body.project-page h2.icon .project-name i.arrow{float: right;
607 611 body.project-page h2.icon span{ background-position: -78px -68px; }
608 612 body.project-page .project-container{ position: relative; float: left; width: 100%; height: 100%; padding-bottom: 10px;}
609 613 body.project-page .page-title{margin-bottom: 0}
610   -body.project-page .project-sidebar {width: 180px; left: 0; top: 0; height: 100%; bottom: 0; position: absolute; background-color: #f7f7f7; float: left; display: inline-block; background: #f7f7f7; padding: 20px 0 20px 2%; margin: 0; }
  614 +body.project-page .project-sidebar {width: 110px; left: 0; top: 0; height: 100%; bottom: 0; position: absolute; background-color: #f7f7f7; float: left; display: inline-block; background: #f7f7f7; padding: 20px 0 20px 2%; margin: 0; }
611 615  
612 616 body.projects-page input.text.git-url { font-size: 12px; border-radius: 5px; color: #666; box-shadow: 0 1px 2px rgba(0,0,0,.2) inset; padding: 8px 0 8px 30px; margin-bottom: 20px; background: white url('images.png') no-repeat 8px -40px; width: 136px}
613 617 body.projects-page input.text.git-url {margin:10px 0 0 }
... ... @@ -615,22 +619,15 @@ body.projects-page input.text.git-url {margin:10px 0 0 }
615 619  
616 620 .projects_selector:hover > .project-box{ -moz-box-shadow:0px 0px 10px rgba(0, 0, 0, .1); -webkit-box-shadow:0px 0px 10px rgba(0, 0, 0, .1); box-shadow:0px 0px 10px rgba(0, 0, 0, .1); }
617 621  
618   -body.project-page .project-sidebar aside{width: 179px}
619   -body.project-page .project-sidebar aside a{display: block; position: relative; background: white; padding: 15px 10px; border-bottom: 1px solid #eee}
620   -body.project-page .project-sidebar aside a:first-child{
621   - -webkit-border-top-left-radius: 5px;
622   - -moz-border-radius-topleft: 5px;
623   - border-top-left-radius: 5px;
624   -}
625   -.project-page .project-sidebar aside a:last-child{
626   - -webkit-border-bottom-left-radius: 5px;
627   - -moz-border-radius-bottomleft: 5px;
628   - border-bottom-left-radius: 5px;
  622 +body.project-page .project-sidebar aside{width: 109px}
  623 +body.project-page .project-sidebar aside a{
  624 + display: block; position: relative; background: white; padding: 15px 10px; border-bottom: 1px solid #eee; margin: 10px 20px 0 0;
  625 + border-radius:5px;
629 626 }
630 627 body.project-page .project-sidebar aside a:hover{background-color: #eee;}
631 628 body.project-page .project-sidebar aside a span.number{float: right; border-radius: 5px; text-shadow: none; background: rgba(0,0,0,.12); text-align: center; padding: 5px 8px; position: absolute; top: 10px; right: 10px}
632   -body.project-page .project-sidebar aside a.current{background-color: #79c3e0; color: white; text-shadow: none; border-color: transparent}
633   -body.project-page .project-content{ padding: 20px; display: block; margin-left: 205px; min-height: 600px}
  629 +body.project-page .project-sidebar aside a.current{border: 2px solid #79c3e0; }
  630 +body.project-page .project-content{ padding: 20px; display: block; margin-left: 125px; min-height: 600px}
634 631 body.project-page .project-content h2{ margin-top: 6px}
635 632 body.project-page .project-content .button.right{margin-left: 20px}
636 633 body.project-page table .commit a{color: #{$blue_link}}
... ...
app/views/layouts/_head_panel.html.erb
View file @6cf000f
... ... @@ -1,56 +0,0 @@
1   -<!-- Page Header -->
2   -<header>
3   - <h1 class="logo">
4   - <%= link_to "GITLAB", root_url %>
5   - </h1>
6   - <div class="account-box">
7   - <%= link_to profile_path, :class => "pic" do %>
8   - <%= image_tag gravatar_icon(current_user.email) %>
9   - <% end %>
10   -
11   - <div class="account-links">
12   - <%= link_to profile_path, :class => "username" do %>
13   - <%#= current_user.name %>
14   - My profile
15   - <% end %>
16   - <%= link_to 'Logout', destroy_user_session_path, :class => "logout", :method => :delete %>
17   - </div>
18   - </div><!-- .account-box -->
19   -
20   - <div class="search">
21   - <%= text_field_tag "search", nil, :placeholder => "Search", :class => "search-input" %>
22   - </div>
23   - <!-- .login-top -->
24   - <nav class="<%= 'shorter_nav' unless current_user.is_admin? %>">
25   - <%= link_to dashboard_path, :class => "#{'current' if current_page?(root_path)} dashboard" do %>
26   - <span></span>Dashboard
27   - <% end %>
28   - <%= link_to projects_path, :class =>"#{'current' if current_page?(projects_path)} project #{'last_elem' unless current_user.is_admin?}" do %>
29   - <span></span>Projects
30   - <% end %>
31   - <% if current_user.is_admin? %>
32   - <%= link_to((current_user.is_admin? ? admin_root_path : "#"), :class => "#{'current' if admin_namespace?} admin last_elem") do %>
33   - <span></span>Admin
34   - <% end %>
35   - <% end %>
36   - </nav>
37   -
38   -</header>
39   -<!-- eo Page Header -->
40   -
41   -<% if current_user %>
42   - <%= javascript_tag do %>
43   - $(function() {
44   - $("#search" ).autocomplete({
45   - source: <%= raw search_autocomplete_source %>,
46   - select: function(event, ui) { location.href = ui.item.url }
47   - });
48   - });
49   - <% end %>
50   -<% end %>
51   -
52   -<% if current_user.require_ssh_key? %>
53   - <div id="no_ssh_key_defined" class="big-message error">
54   - <p>No SSH Key is defined. You won't be able to use any Git command!. Click <%=link_to( 'here', keys_path ) %> to add one!
55   - </div>
56   -<% end %>
app/views/layouts/_head_panel.html.haml 0 → 100644
  Diff comments   View file @84d1dea
... ... @@ -0,0 +1,36 @@
  1 +/ Page Header
  2 +%header
  3 + - if @project && !@project.new_record?
  4 + .project_name
  5 + = truncate @project.name, :length => 20
  6 + .git_url_wrapper
  7 + %input.git-url.text{:id => "", :name => "", :readonly => "", :type => "text", :value => @project.url_to_repo, :class => "one_click_select"}
  8 + = yield :rss_icon
  9 +
  10 + - if @project.repo_exists?
  11 + .left{:style => "margin-left:5px;"}
  12 + = render :partial => "projects/refs", :locals => { :destination => controller.controller_name == "commits" ? "commits" : "tree" }
  13 + .account-box
  14 + = link_to profile_path, :class => "pic" do
  15 + = image_tag gravatar_icon(current_user.email)
  16 + .account-links
  17 + = link_to profile_path, :class => "username" do
  18 + My profile
  19 + = link_to 'Logout', destroy_user_session_path, :class => "logout", :method => :delete
  20 + / .account-box
  21 + -#.search
  22 + = text_field_tag "search", nil, :placeholder => "Search", :class => "search-input"
  23 + / .login-top
  24 +- if current_user
  25 + = javascript_tag do
  26 + $(function(){
  27 + $("#search").autocomplete({
  28 + source: #{raw search_autocomplete_source},
  29 + select: function(event, ui) { location.href = ui.item.url }
  30 + });
  31 + });
  32 +
  33 +- if current_user.require_ssh_key?
  34 + #no_ssh_key_defined.big-message.error
  35 + %p
  36 + No SSH Key is defined. You won't be able to use any Git command!. Click #{link_to( 'here', keys_path )} to add one!
... ...
app/views/layouts/project.html.haml
  Diff comments   View file @84d1dea
... ... @@ -18,31 +18,32 @@
18 18 = render :partial => "layouts/flash"
19 19 #container
20 20 = render :partial => "layouts/head_panel"
21   - = render :partial => "layouts/middle_panel" if @project && !@project.new_record?
  21 + -#= render :partial => "layouts/middle_panel" if @project && !@project.new_record?
22 22 .project-container
23 23 .project-sidebar
24 24 .fixed
25 25 %aside
26   - = link_to "Project", project_path(@project), :class => project_tab_class
  26 + = link_to project_path(@project), :class => project_tab_class do
  27 + = image_tag "Home-UI.PNG", :width => 26
  28 + %span{ :class => "number" } Pr
  29 +
27 30 = link_to "Repository", project_repository_path(@project), :class => repository_tab_class
28 31 = link_to "Tree", tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class
29 32 = link_to "Commits", project_commits_path(@project), :class => current_page?(:controller => "commits", :action => "index", :project_id => @project) ? "current" : nil
30   - = link_to "Network graph", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil
  33 + = link_to "Network", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil
31 34 = link_to project_issues_filter_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do
32 35 Issues
33   - - if @project.issues.open_for(current_user).count > 0
  36 + -#- if @project.issues.open_for(current_user).count > 0
34 37 %span{ :class => "number" }= @project.issues.open_for(current_user).count
35 38 = link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do
36 39 Wall
37 40 - if @project.common_notes.today.count > 0
38 41 %span{ :class => "number" }= @project.common_notes.today.count
39 42 = link_to project_merge_requests_path(@project), :class => (controller.controller_name == "merge_requests") ? "current" : nil do
40   - Merge Requests
41   - - if @project.merge_requests.opened.count > 0
  43 + Merge
  44 + -#- if @project.merge_requests.opened.count > 0
42 45 %span{ :class => "number" }= @project.merge_requests.opened.count
43 46  
44 47  
45   - .medium-tags{:style => 'padding: 10px 0 0 10px; width: 210px;'}= tag_list @project
46   -
47 48 .project-content
48 49 = yield
... ...