Commit bc6915f24a7f17c3cd61b94cc8c6383e1703ae48
1 parent
d6b051c5
Exists in
master
and in
4 other branches
projects page finished
Showing
2 changed files
with
54 additions
and
33 deletions
Show diff stats
app/assets/stylesheets/common.scss
| @@ -78,6 +78,10 @@ a:focus { | @@ -78,6 +78,10 @@ a:focus { | ||
| 78 | .prepend-top-10 { | 78 | .prepend-top-10 { |
| 79 | margin-top:10px; | 79 | margin-top:10px; |
| 80 | } | 80 | } |
| 81 | + | ||
| 82 | +.padded { | ||
| 83 | + padding:20px; | ||
| 84 | +} | ||
| 81 | .no-borders { | 85 | .no-borders { |
| 82 | border:none; | 86 | border:none; |
| 83 | } | 87 | } |
| @@ -643,22 +647,6 @@ p.time { | @@ -643,22 +647,6 @@ p.time { | ||
| 643 | .wll:hover { background:none } | 647 | .wll:hover { background:none } |
| 644 | } | 648 | } |
| 645 | 649 | ||
| 646 | - | ||
| 647 | -.projects_list { | ||
| 648 | - a.project { | ||
| 649 | - h4 { | ||
| 650 | - color:#888; | ||
| 651 | - } | ||
| 652 | - &.active { | ||
| 653 | - h4 { | ||
| 654 | - color:#111; | ||
| 655 | - .ico.project { | ||
| 656 | - background-position:-209px -21px; | ||
| 657 | - } | ||
| 658 | - } | ||
| 659 | - } | ||
| 660 | - } | ||
| 661 | -} | ||
| 662 | .ico { | 650 | .ico { |
| 663 | background: url("images.png") no-repeat -85px -77px; | 651 | background: url("images.png") no-repeat -85px -77px; |
| 664 | width: 19px; | 652 | width: 19px; |
| @@ -679,3 +667,36 @@ p.time { | @@ -679,3 +667,36 @@ p.time { | ||
| 679 | background-position:-209px -21px; | 667 | background-position:-209px -21px; |
| 680 | } | 668 | } |
| 681 | } | 669 | } |
| 670 | + | ||
| 671 | +.leftbar { | ||
| 672 | + | ||
| 673 | + h5, .title { | ||
| 674 | + padding:5px 10px; | ||
| 675 | + } | ||
| 676 | + | ||
| 677 | + h4 { | ||
| 678 | + font-size:14px; | ||
| 679 | + padding:2px 10px; | ||
| 680 | + color:#888; | ||
| 681 | + border-bottom:1px solid #eee; | ||
| 682 | + &:last-child { border:none; } | ||
| 683 | + } | ||
| 684 | + | ||
| 685 | + a.active { | ||
| 686 | + h4 { | ||
| 687 | + color:#111; | ||
| 688 | + border-right:4px solid $styled_border_color; | ||
| 689 | + .ico.project { | ||
| 690 | + background-position:-209px -21px; | ||
| 691 | + } | ||
| 692 | + } | ||
| 693 | + } | ||
| 694 | +} | ||
| 695 | + | ||
| 696 | +.btn { | ||
| 697 | + &.very_small { | ||
| 698 | + font-size:11px; | ||
| 699 | + padding:4px; | ||
| 700 | + margin:2px; | ||
| 701 | + } | ||
| 702 | +} |
app/views/projects/index.html.haml
| 1 | -%h3 | ||
| 2 | - Projects | ||
| 3 | - %small= "( #{current_user.projects.count} )" | ||
| 4 | - - if current_user.can_create_project? | ||
| 5 | - %span.right | ||
| 6 | - = link_to new_project_path, :class => "btn small" do | ||
| 7 | - New Project | ||
| 8 | -%hr | ||
| 9 | - unless @projects.empty? | 1 | - unless @projects.empty? |
| 10 | .row | 2 | .row |
| 11 | - .span5 | ||
| 12 | - %div.content_list.projects_list | ||
| 13 | - - @projects.each do |project| | ||
| 14 | - = link_to project_path(project), :remote => true, :class => dom_class(project) do | ||
| 15 | - %h4 | ||
| 16 | - %span.ico.project | ||
| 17 | - = truncate(project.name, :length => 26) | ||
| 18 | - .span11.right.show_holder | ||
| 19 | - .loading | 3 | + .span4 |
| 4 | + %div.leftbar.ui-box | ||
| 5 | + %h5 | ||
| 6 | + Projects | ||
| 7 | + - if current_user.can_create_project? | ||
| 8 | + %span.right | ||
| 9 | + = link_to new_project_path, :class => "btn very_small info" do | ||
| 10 | + New Project | ||
| 11 | + .content_list | ||
| 12 | + - @projects.each do |project| | ||
| 13 | + = link_to project_path(project), :remote => true, :class => dom_class(project) do | ||
| 14 | + %h4 | ||
| 15 | + %span.ico.project | ||
| 16 | + = truncate(project.name, :length => 22) | ||
| 17 | + .span12.right | ||
| 18 | + .show_holder.ui-box.padded | ||
| 19 | + .loading | ||
| 20 | 20 | ||
| 21 | - else | 21 | - else |
| 22 | %h2 Nothing here | 22 | %h2 Nothing here |