Download as
Browse Code »

Commit 693ff1c6445e5abd4cf29cf9689d22899239597e

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

dashboard restyled. colors improved

Showing 9 changed files with 44 additions and 31 deletions   Show diff stats
app/assets/stylesheets/projects.css.scss
  Diff comments   View file @693ff1c
... ... @@ -543,7 +543,7 @@ h4.middle-panel {
543 543  
544 544 .project_name {
545 545 float:left;
546   - width:160px;
  546 + width:235px;
547 547 margin-right:30px;
548 548 font-size:16px;
549 549 font-weight:bold;
... ... @@ -572,7 +572,7 @@ h4.middle-panel {
572 572  
573 573 color: #666;
574 574 border: 1px solid #AAA;
575   - padding: 0 0 0 30px;
  575 + padding: 0 10px 0 30px;
576 576 background: white url('images.png') no-repeat 8px -42px;
577 577 width: 160px;
578 578 height:26px;
... ... @@ -624,6 +624,10 @@ h4.middle-panel {
624 624 margin-bottom:20px;
625 625 height:26px;
626 626  
  627 + -moz-border-radius: 4px;
  628 + -webkit-border-radius: 4px;
  629 + border-radius: 4px;
  630 +
627 631 .tab {
628 632 font-weight: bold;
629 633 border-right: 1px solid #ddd;
... ... @@ -733,7 +737,6 @@ a.project-update.titled {
733 737 .title-block {
734 738 padding: 10px;
735 739 width: 205px;
736   - background: #f5f5f5;
737 740 position: absolute;
738 741 left: 0;
739 742 top: 0;
... ... @@ -829,3 +832,16 @@ tr.line_notes_row {
829 832 }
830 833 }
831 834  
  835 +
  836 +.dash_top_link {
  837 + margin: 4px 14px;
  838 + float: left;
  839 + font-size: 14px;
  840 +
  841 + &.active {
  842 + color:#2FA0BB;
  843 + }
  844 + &:hover {
  845 + color:#2FA0BB;
  846 + }
  847 +}
... ...
app/assets/stylesheets/style.scss
  Diff comments   View file @693ff1c
... ... @@ -569,7 +569,7 @@ html, body { height: 100%; }
569 569  
570 570 body.dashboard-page h2.icon span{ background-position: 9px -69px; }
571 571 body.dashboard-page header{margin-bottom: 0}
572   -body.dashboard-page .news-feed{padding-left: 1em; margin-right: 450px; min-height: 600px; margin-left: 1%}
  572 +body.dashboard-page .news-feed{padding-left: 1em; margin-right: 450px; min-height: 600px; margin-left: 1%; margin-top: 20px;}
573 573 body.dashboard-page .dashboard-content{ position: relative; float: left; width: 100%; height: 100%; }
574 574 body.dashboard-page .news-feed h2{float: left;}
575 575 body.dashboard-page aside{ min-height: 820px; position: relative; top: 0; bottom: 0; right: 0; width: 420px; float: right; background-color: #f7f7f7; border-left: 1px solid #ccc }
... ... @@ -611,7 +611,7 @@ body.project-page h2.icon .project-name i.arrow{float: right;
611 611 body.project-page h2.icon span{ background-position: -78px -68px; }
612 612 body.project-page .project-container{ position: relative; float: left; width: 100%; height: 100%; padding-bottom: 10px;}
613 613 body.project-page .page-title{margin-bottom: 0}
614   -body.project-page .project-sidebar {width: 110px; left: 0; top: 0; height: 100%; bottom: 0; position: absolute; background-color: #eee; float: left; display: inline-block; background: #eee; padding: 20px 0 20px 2%; margin: 0; border-right: 1px solid #ddd; }
  614 +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; }
615 615  
616 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}
617 617 body.projects-page input.text.git-url {margin:10px 0 0 }
... ... @@ -621,11 +621,15 @@ body.projects-page input.text.git-url {margin:10px 0 0 }
621 621  
622 622 body.project-page .project-sidebar aside{width: 109px}
623 623 body.project-page .project-sidebar aside a{
624   - display: block; position: relative; background: #F5F5F5; padding: 15px 10px;
625   - border: 1px solid #ccc; margin: 10px 20px 0 0;
  624 + display: block;
  625 + position: relative;
  626 + background: #FFF;
  627 + padding: 15px 10px;
  628 + border: 1px solid #ccc;
  629 + margin: 10px 20px 0 0;
626 630 border-radius:5px;
627 631 }
628   -body.project-page .project-sidebar aside a:hover{background-color: #eee;}
  632 +body.project-page .project-sidebar aside a:hover{background-color: #FFFFFF;}
629 633 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}
630 634 body.project-page .project-sidebar aside a.current{border: 2px solid #79c3e0; background:white; }
631 635 body.project-page .project-content{ padding: 20px; display: block; margin-left: 130px; min-height: 600px}
... ... @@ -636,7 +640,7 @@ body.project-page table th, body.project-page table td{ border-bottom: 1px soli
636 640 body.project-page .fixed{position: fixed; }
637 641  
638 642 /* New project Page */
639   -.new-project-page .container{width: 600px; background-color: rgba(0,0,0,.02); margin: auto; border: 1px solid #eee; padding: 0 20px; margin: 30px auto 60px auto; border-radius: 5px}
  643 +.new-project-page .container{ margin:20px}
640 644 .new-project-page .container table{background: white}
641 645 /* eo New Project Page */
642 646  
... ...
app/views/commits/index.html.haml
  Diff comments   View file @693ff1c
... ... @@ -6,13 +6,11 @@
6 6 = image_tag "rss_icon_gray.png", :width => 16, :title => "feed"
7 7  
8 8 - if params[:path]
9   - %h2.icon
10   - %span
11   - %d
12   - = link_to project_commits_path(@project) do
13   - = @project.code
14   - \/
15   - %a{:href => "#"}= params[:path].split("/").join(" / ")
  9 + %h2
  10 + = link_to project_commits_path(@project) do
  11 + = @project.code
  12 + \/
  13 + %a{:href => "#"}= params[:path].split("/").join(" / ")
16 14  
17 15 %div{:id => dom_id(@project)}
18 16 #commits_list= render "commits"
... ...
app/views/dashboard/_menu.html.haml
  Diff comments   View file @693ff1c
1   -%h4.dash-tabs
  1 +-#%h4.dash-tabs
2 2 = link_to "Activities", dashboard_path, :remote => true, :class => "dash-button #{"active" if current_page?(dashboard_path) || current_page?(root_path) }", :id => "activities_slide"
3 3 = link_to "Issues", dashboard_issues_path, :remote => true, :class => "dash-button #{"active" if current_page?(dashboard_issues_path)}", :id => "issues_slide"
4 4 = link_to "Merge Requests", dashboard_merge_requests_path, :remote => true, :class => "dash-button #{"active" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide"
... ...
app/views/layouts/_head_panel.html.haml
  Diff comments   View file @693ff1c
... ... @@ -10,7 +10,7 @@
10 10  
11 11 - if @project && !@project.new_record?
12 12 .project_name
13   - = truncate @project.name, :length => 20
  13 + = truncate @project.name, :length => 28
14 14 .git_url_wrapper
15 15 %input.git-url.text{:id => "", :name => "", :readonly => "", :type => "text", :value => @project.url_to_repo, :class => "one_click_select"}
16 16 - if @project.repo_exists?
... ... @@ -18,6 +18,11 @@
18 18 = render :partial => "projects/refs", :locals => { :destination => controller.controller_name == "commits" ? "commits" : "tree" }
19 19 = yield :rss_icon
20 20  
  21 + - if controller.controller_name == "dashboard"
  22 + = link_to "Activities", dashboard_path, :class => "dash_top_link #{"active" if current_page?(dashboard_path) || current_page?(root_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 "Merge Requests", dashboard_merge_requests_path, :class => "dash_top_link #{"active" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide"
  25 +
21 26 .account-box
22 27 = link_to profile_path, :class => "pic" do
23 28 = image_tag gravatar_icon(current_user.email)
... ...
app/views/layouts/_middle_panel.html.haml
View file @0ba0819
... ... @@ -1,10 +0,0 @@
1   -%h4.middle-panel
2   - .project_name
3   - = truncate @project.name, :length => 20
4   - .git_url_wrapper
5   - %input.git-url.text{:id => "", :name => "", :readonly => "", :type => "text", :value => @project.url_to_repo, :class => "one_click_select"}
6   - = yield :rss_icon
7   -
8   - - if @project.repo_exists?
9   - .right= render :partial => "projects/refs", :locals => { :destination => controller.controller_name == "commits" ? "commits" : "tree" }
10   -
app/views/layouts/project.html.haml
  Diff comments   View file @693ff1c
... ... @@ -39,7 +39,7 @@
39 39 - if @project.common_notes.today.count > 0
40 40 %span{ :class => "number" }= @project.common_notes.today.count
41 41 = link_to project_merge_requests_path(@project), :class => (controller.controller_name == "merge_requests") ? "current" : nil do
42   - Merge
  42 + Requests
43 43 -#- if @project.merge_requests.opened.count > 0
44 44 %span{ :class => "number" }= @project.merge_requests.opened.count
45 45  
... ...
app/views/projects/show.html.haml
  Diff comments   View file @693ff1c
... ... @@ -2,7 +2,7 @@
2 2  
3 3 = render "project_head"
4 4 #news-feed.news-feed
5   - .project-box.project-updates.ui-box.ui-box-small.ui-box-big
  5 + .project-box.project-updates
6 6 - @activities.each do |update|
7 7 = render "projects/feed", :update => update, :project => @project
8 8  
... ...
app/views/repositories/show.html.haml
  Diff comments   View file @693ff1c
... ... @@ -2,7 +2,7 @@
2 2 = render "head"
3 3  
4 4 #news-feed.news-feed
5   - .project-box.project-updates.ui-box.ui-box-small.ui-box-big
  5 + .project-box.project-updates
6 6 - @activities.each do |update|
7 7 = render "repositories/feed", :update => update, :project => @project
8 8  
... ...