Download as
Browse Code »

Commit 87f07f68bb12075c8181709fccbfc9829ea30c2a

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

new layout

Showing 3 changed files with 84 additions and 60 deletions   Show diff stats
app/assets/stylesheets/projects.css.scss
  Diff comments   View file @87f07f6
... ... @@ -525,22 +525,28 @@ h4.dash-tabs {
525 525 }
526 526 }
527 527  
528   -body header,
529   -h4.middle-panel {
530   -
  528 +body header {
  529 + position:absolute;
  530 + width:100%;
  531 + padding:0;
  532 + margin:0;
  533 + top:0;
  534 + left:0;
531 535 background: #999; /* for non-css3 browsers */
532   -
533 536 filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FAFAFA', endColorstr='#EAEAEA'); /* for IE */
534 537 background: -webkit-gradient(linear, left top, left bottom, from(#FAFAFA), to(#EAEAEA)); /* for webkit browsers */
535 538 background: -moz-linear-gradient(top, #FAFAFA, #EAEAEA); /* for firefox 3.6+ */
536   -
537   - margin: 0;
538 539 border-bottom: 1px solid #ccc;
539   - padding: 10px 20px;
540   - font-size: 11px;
541   - //background: #F7F7F7;
542   - height:30px;
543 540  
  541 + height:50px;
  542 +
  543 + .wrapper {
  544 + margin:auto;
  545 + width:980px;
  546 + padding: 10px 0;
  547 + font-size: 11px;
  548 + position:relative;
  549 + }
544 550 .project_name {
545 551 float:left;
546 552 width:235px;
... ...
app/assets/stylesheets/style.scss
  Diff comments   View file @87f07f6
... ... @@ -74,7 +74,10 @@ $blue_link: "#2fa0bb";
74 74 /* eo Vars */
75 75  
76 76 html{ -webkit-font-smoothing:antialiased; }
77   -body{font-size: 12px; background-color: #F5F5F5;}
  77 +body {
  78 + font-size: 12px;
  79 + background-color: #F7F7F7;
  80 +}
78 81 a{text-decoration: none; font-weight: bold; color: #444}
79 82 a:hover{color: #555}
80 83 /* Typography */
... ... @@ -330,7 +333,12 @@ body.login-page{background-color: #f1f1f1; padding-top: 10%}
330 333  
331 334 /* General */
332 335 #container{background-color: white; overflow: hidden; }
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)}
  336 +body.collapsed #container{
  337 + margin: auto;
  338 + margin-top:51px;
  339 + width: 980px;
  340 + border-top: 0;
  341 +}
334 342  
335 343 /* Header */
336 344 header{
... ... @@ -429,7 +437,16 @@ header{margin-bottom: 0; clear: both; position:relative;}
429 437 .right{float: right;}
430 438  
431 439 /* Account box */
432   -header .account-box{position: absolute; right: 0; top: 8px; z-index: 10000; width: 128px; font-size: 11px; float: right; display: block; cursor: pointer;}
  440 +header .account-box{
  441 + position: absolute;
  442 + right: 0;
  443 + top: 8px;
  444 + z-index: 10000;
  445 + width: 128px;
  446 + font-size: 11px;
  447 + float: right;
  448 + display: block;
  449 + cursor: pointer;}
433 450 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;}
434 451 header .account-box img:after{
435 452 content: " ";
... ... @@ -625,7 +642,7 @@ body.project-page h2.icon .project-name i.arrow{float: right;
625 642 body.project-page h2.icon span{ background-position: -78px -68px; }
626 643 body.project-page .project-container{ position: relative; float: left; width: 100%; height: 100%; padding-bottom: 10px;}
627 644 body.project-page .page-title{margin-bottom: 0}
628   -body.project-page .project-sidebar {width: 110px; left: 0; top: 0; height: 100%; bottom: 0; position: absolute; float: left; display: inline-block; background: #F7F7F7; padding: 20px 0 20px 2%; margin: 0; border-right: 1px solid #ddd; }
  645 +body.project-page .project-sidebar {width: 110px; left: 0; top: 0; height: 100%; bottom: 0; position: absolute; float: left; display: inline-block; background: #F7F7F7; padding: 20px 0 20px 0; margin: 0; border-right: 1px solid #ddd; }
629 646  
630 647 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}
631 648 body.projects-page input.text.git-url {margin:10px 0 0 }
... ... @@ -651,7 +668,7 @@ body.project-page .project-sidebar aside a.current {
651 668 border: 1px solid #2FA0BB;
652 669 border-radius:5px;
653 670 }
654   -body.project-page .project-content{ padding: 20px; display: block; margin-left: 130px; min-height: 600px}
  671 +body.project-page .project-content{ padding: 20px; display: block; margin-left: 110px; min-height: 600px}
655 672 body.project-page .project-content h2{ margin-top: 6px}
656 673 body.project-page .project-content .button.right{margin-left: 20px}
657 674 body.project-page table .commit a{color: #{$blue_link}}
... ...
app/views/layouts/_head_panel.html.haml
  Diff comments   View file @87f07f6
1 1 / Page Header
2 2 %header.top_panel_holder
3   - %div.top_links_holder
4   - = link_to root_path, :class => "top_link home", :title => "Home" do
5   - = image_tag "Home-UI.PNG", :width => 26
6   - - if current_user.is_admin?
7   - = link_to admin_root_path, :class => "top_link admin", :title => "Admin" do
8   - = image_tag "Gear-UI.PNG", :width => 20
  3 + .wrapper
  4 + %div.top_links_holder
  5 + = link_to root_path, :class => "top_link home", :title => "Home" do
  6 + = image_tag "Home-UI.PNG", :width => 26
  7 + - if current_user.is_admin?
  8 + = link_to admin_root_path, :class => "top_link admin", :title => "Admin" do
  9 + = image_tag "Gear-UI.PNG", :width => 20
9 10  
10 11  
11   - - if project_layout
12   - .project_name
13   - = truncate @project.name, :length => 28
14   - .git_url_wrapper
15   - %input.git-url.text{:id => "", :name => "", :readonly => "", :type => "text", :value => @project.url_to_repo, :class => "one_click_select"}
16   - - if @project.repo_exists?
17   - .left{:style => "margin-left:5px;"}
18   - = render :partial => "projects/refs", :locals => { :destination => controller.controller_name == "commits" ? "commits" : "tree" }
19   - = yield :rss_icon
  12 + - if project_layout
  13 + .project_name
  14 + = truncate @project.name, :length => 28
  15 + .git_url_wrapper
  16 + %input.git-url.text{:id => "", :name => "", :readonly => "", :type => "text", :value => @project.url_to_repo, :class => "one_click_select"}
  17 + - if @project.repo_exists?
  18 + .left{:style => "margin-left:5px;"}
  19 + = render :partial => "projects/refs", :locals => { :destination => controller.controller_name == "commits" ? "commits" : "tree" }
  20 + = yield :rss_icon
20 21  
21   - - elsif profile_layout
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)}"
24   - = link_to "Issues", dashboard_issues_path, :class => "dash_top_link #{"active" if current_page?(dashboard_issues_path)}", :id => "issues_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"
  22 + - elsif profile_layout
  23 + = link_to "Activities", dashboard_path, :class => "dash_top_link #{"active" if current_page?(dashboard_path) || current_page?(root_path) }"
  24 + = link_to "Projects", projects_path, :class => "dash_top_link #{"active" if current_page?(projects_path)}"
  25 + = link_to "Issues", dashboard_issues_path, :class => "dash_top_link #{"active" if current_page?(dashboard_issues_path)}", :id => "issues_slide"
  26 + = link_to "Merge Requests", dashboard_merge_requests_path, :class => "dash_top_link #{"active" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide"
  27 + .search
  28 + = text_field_tag "search", nil, :placeholder => "Search", :class => "search-input"
28 29  
29   - .account-box
30   - = link_to profile_path, :class => "pic" do
31   - = image_tag gravatar_icon(current_user.email)
32   - .account-links
33   - = link_to profile_path, :class => "username" do
34   - My profile
35   - = link_to 'Logout', destroy_user_session_path, :class => "logout", :method => :delete
36   - / .account-box
37   - -#.search
38   - = text_field_tag "search", nil, :placeholder => "Search", :class => "search-input"
39   - / .login-top
40   -- if current_user
41   - = javascript_tag do
42   - $(function(){
43   - $("#search").autocomplete({
44   - source: #{raw search_autocomplete_source},
45   - select: function(event, ui) { location.href = ui.item.url }
46   - });
47   - });
  30 + .account-box
  31 + = link_to profile_path, :class => "pic" do
  32 + = image_tag gravatar_icon(current_user.email)
  33 + .account-links
  34 + = link_to profile_path, :class => "username" do
  35 + My profile
  36 + = link_to 'Logout', destroy_user_session_path, :class => "logout", :method => :delete
  37 + / .account-box
  38 + -#.search
  39 + = text_field_tag "search", nil, :placeholder => "Search", :class => "search-input"
  40 + / .login-top
  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 + });
48 49  
49   -- if current_user.require_ssh_key?
50   - #no_ssh_key_defined.big-message.error
51   - %p
52   - No SSH Key is defined. You won't be able to use any Git command!. Click #{link_to( 'here', keys_path )} to add one!
  50 + - if current_user.require_ssh_key?
  51 + #no_ssh_key_defined.big-message.error
  52 + %p
  53 + No SSH Key is defined. You won't be able to use any Git command!. Click #{link_to( 'here', keys_path )} to add one!
... ...