Download as
Browse Code »

Commit 8cc25ef94e540e8512f0c22eb4a506f812e9982f

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

cleaning UI

Showing 6 changed files with 35 additions and 18 deletions   Show diff stats
app/assets/stylesheets/projects.css.scss
  Diff comments   View file @8cc25ef
... ... @@ -439,6 +439,11 @@ body.project-page .team_member_new .span-6, .team_member_edit .span-6{ padding:1
439 439 body.projects-page input.text.git-url.project_list_url { width:165px; }
440 440  
441 441  
  442 +body.project-page table.no-borders th {
  443 + background:none;
  444 + border-bottom:1px solid #CCC;
  445 + color:#333;
  446 +}
442 447  
443 448 body.project-page table.no-borders tr,
444 449 body.project-page table.no-borders td{
... ...
app/assets/stylesheets/style.scss
  Diff comments   View file @8cc25ef
... ... @@ -76,7 +76,7 @@ $blue_link: "#2fa0bb";
76 76 html{ -webkit-font-smoothing:antialiased; }
77 77 body {
78 78 font-size: 12px;
79   - background-color: #F7F7F7;
  79 + background-color: #FFFFFF;
80 80 }
81 81 a{text-decoration: none; font-weight: bold; color: #444}
82 82 a:hover{color: #555}
... ... @@ -190,12 +190,14 @@ input.button{margin-bottom: 1.5em}
190 190 /* eo Buttons */
191 191  
192 192 /* UI Box */
193   -.ui-box{border: 1px solid #DEDFE1; float: left; border-radius: 5px}
  193 +//.ui-box{border: 1px solid #DEDFE1; float: left; border-radius: 5px}
  194 +.ui-box{float: left;}
194 195 .ui-box h3{
195 196 background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #fefefe), to(#F6F7F8));
196 197 background-image: -webkit-linear-gradient(#fefefe 7.6%, #F6F7F8);
197 198 background-image: -moz-linear-gradient(#fefefe 7.6%, #F6F7F8);
198 199 background-image: -o-linear-gradient(#fefefe 7.6%, #F6F7F8);
  200 + background:none;
199 201 margin: 0;
200 202 padding: 1em;
201 203 font-size: 12px;
... ... @@ -406,7 +408,7 @@ header nav a.last_elem{
406 408 border-bottom-right-radius: 4px;
407 409 }
408 410  
409   -header .search{ display: inline-block; float: right; margin-right: 46px}
  411 +header .search{ display: inline-block; float: right; margin-right: 90px}
410 412  
411 413 header nav a span{width: 20px; height: 20px; display: inline-block; background: red; position: absolute; left: 8px; top: 6px;}
412 414  
... ... @@ -600,22 +602,22 @@ html, body { height: 100%; }
600 602  
601 603 body.dashboard-page h2.icon span{ background-position: 9px -69px; }
602 604 body.dashboard-page header{margin-bottom: 0}
603   -body.dashboard-page .news-feed{padding-left: 1em; margin-right: 450px; min-height: 600px; margin-left: 1%; margin-top: 20px;}
  605 +body.dashboard-page .news-feed{margin-left: 290px; min-height: 600px; margin-top: 20px; margin-right:2px;}
604 606 body.dashboard-page .dashboard-content{ position: relative; float: left; width: 100%; height: 100%; }
605 607 body.dashboard-page .news-feed h2{float: left;}
606   -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 }
607   -body.dashboard-page aside h4{margin: 0; border-bottom: 1px solid #ccc; padding: 10px 10px; font-size: 11px; font-weight: bold; text-transform: uppercase;}
  608 +body.dashboard-page aside{ min-height: 820px; position: relative; top: 0; bottom: 0; right: 0; width: 260px; float: left; border-right: 1px solid #ccc }
  609 +body.dashboard-page aside h4{margin: 0; border-bottom: 1px solid #ccc; padding: 20px 20px 20px 0px; font-size: 11px; font-weight: bold; text-transform: uppercase;}
608 610 body.dashboard-page aside h4 a.button-small{float: right; text-transform: none; border-radius: 4px; margin-right: 2%; margin-top: -4px; display: block;}
609 611 body.dashboard-page aside .project-list {list-style: none; margin: 0; padding: 0;}
610   -body.dashboard-page aside .project-list li a {background: white; color: #{$blue_link}; display: block; border-bottom: 1px solid #eee; padding: 14px 6% 14px 14px;}
611   -body.dashboard-page aside .project-list li a:hover {background: #f1f1f1}
612   -body.dashboard-page aside .project-list li a:hover span.arrow{background-color: #E3E5EA;}
  612 +body.dashboard-page aside .project-list li a {background: white; color: #{$blue_link}; display: block; border-bottom: 1px solid #eee; padding: 14px 6% 14px 0px;}
  613 +//body.dashboard-page aside .project-list li a:hover {background: #f1f1f1}
  614 +//body.dashboard-page aside .project-list li a:hover span.arrow{background-color: #E3E5EA;}
613 615 body.dashboard-page aside .project-list li a span.project-name{font-size: 14px; display: block; margin-bottom: 8px}
614 616 body.dashboard-page aside .project-list li a span.time{color: #666; font-weight: normal; font-size: 11px}
615 617 body.dashboard-page aside .project-list li a span.arrow{float: right; background: #E3E5EA; padding: 10px; border-radius: 5px; margin-top: 2px; text-shadow: none; color: #999}
616 618 body.dashboard-page .news-feed .project-updates {margin-bottom: 20px; display: block; width: 100%;}
617 619 body.dashboard-page .news-feed .project-updates .data{ padding: 0}
618   -body.dashboard-page .news-feed .project-updates a.project-update {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
  620 +body.dashboard-page .news-feed .project-updates a.project-update {padding: 10px; overflow: hidden; display: block;}
619 621 body.dashboard-page .news-feed .project-updates a.project-update:last-child{border-bottom: 0}
620 622 body.dashboard-page .news-feed .project-updates a.project-update img{float: left; margin-right: 10px;}
621 623 body.dashboard-page .news-feed .project-updates a.project-update span.update-title, .dashboard-page .news-feed .project-updates li a span.update-author{display: block;}
... ... @@ -642,7 +644,7 @@ body.project-page h2.icon .project-name i.arrow{float: right;
642 644 body.project-page h2.icon span{ background-position: -78px -68px; }
643 645 body.project-page .project-container{ position: relative; float: left; width: 100%; height: 100%; padding-bottom: 10px;}
644 646 body.project-page .page-title{margin-bottom: 0}
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; }
  647 +body.project-page .project-sidebar {width: 110px; left: 0; top: 0; height: 100%; bottom: 0; position: absolute; float: left; display: inline-block; background: #FFF; padding: 20px 0 20px 0; margin: 0; border-right: 1px solid #ddd; }
646 648  
647 649 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}
648 650 body.projects-page input.text.git-url {margin:10px 0 0 }
... ... @@ -657,8 +659,10 @@ body.project-page .project-sidebar aside a{
657 659 //background: #FFF;
658 660 padding: 15px 10px;
659 661 //border: 1px solid #ccc;
660   - margin: 10px 20px 0 0;
  662 + margin: 10px 0 0 0;
661 663 //border-radius:5px;
  664 +
  665 +
662 666 }
663 667 //body.project-page .project-sidebar aside a:hover{background-color: #FFFFFF;}
664 668 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}
... ... @@ -667,6 +671,15 @@ body.project-page .project-sidebar aside a.current {
667 671 background: #79C3E0;
668 672 border: 1px solid #2FA0BB;
669 673 border-radius:5px;
  674 +
  675 +
  676 + -webkit-border-top-right-radius: 0;
  677 + -webkit-border-bottom-right-radius: 0;
  678 + -moz-border-radius-topright: 0px;
  679 + -moz-border-radius-bottomright: 0px;
  680 + border-top-right-radius: 0;
  681 + border-bottom-right-radius: 0;
  682 + margin-right: -1px;
670 683 }
671 684 body.project-page .project-content{ padding: 20px; display: block; margin-left: 110px; min-height: 600px}
672 685 body.project-page .project-content h2{ margin-top: 6px}
... ... @@ -676,7 +689,6 @@ body.project-page table th, body.project-page table td{ border-bottom: 1px soli
676 689 body.project-page .fixed{position: fixed; }
677 690  
678 691 /* New project Page */
679   -.new-project-page .container{ margin:20px}
680 692 .new-project-page .container table{background: white}
681 693 /* eo New Project Page */
682 694  
... ... @@ -712,7 +724,7 @@ body.project-page.commits-page .commit-button i{
712 724 body.project-page.commits-page .commits-date {display: block; width: 100%; margin-bottom: 20px}
713 725 body.project-page.commits-page .commits-date .data {padding: 0}
714 726 body.project-page.commits-page a.commit{padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
715   -body.project-page.commits-page .commits-date a.commit {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
  727 +body.project-page.commits-page .commits-date a.commit {padding: 10px; border-bottom: none; overflow: hidden; display: block;}
716 728 body.project-page.commits-page .commits-date a.commit:last-child{border-bottom: 0}
717 729 body.project-page.commits-page .commits-date a.commit img{float: left; margin-right: 10px;}
718 730 body.project-page.commits-page .commits-date a.commit span.commit-title{display: block;}
... ...
app/views/dashboard/_sidebar.html.haml
  Diff comments   View file @8cc25ef
... ... @@ -7,7 +7,7 @@
7 7 - @projects.each do |project|
8 8 %li
9 9 %a{:href => project_path(project)}
10   - %span.arrow →
  10 + -#%span.arrow →
11 11 %span.project-name= project.name
12 12 %span.time
13 13 %strong Last activity:
... ...
app/views/layouts/project.html.haml
  Diff comments   View file @8cc25ef
... ... @@ -28,7 +28,7 @@
28 28  
29 29 = link_to "Repository", project_repository_path(@project), :class => repository_tab_class
30 30 = link_to "Tree", tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class
31   - = link_to "Commits", project_commits_path(@project), :class => current_page?(:controller => "commits", :action => "index", :project_id => @project) ? "current" : nil
  31 + = link_to "Commits", project_commits_path(@project), :class => (controller.controller_name == "commits") ? "current" : nil
32 32 = link_to "Network", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil
33 33 = link_to project_issues_filter_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do
34 34 Issues
... ...
app/views/projects/_team.html.haml
  Diff comments   View file @8cc25ef
1   -%table.round-borders#team-table
  1 +%table.no-borders#team-table
2 2 %thead
3 3 %th Name
4 4 %th Project
... ...
app/views/refs/_tree.html.haml
  Diff comments   View file @8cc25ef
... ... @@ -13,7 +13,7 @@
13 13 = render :partial => "refs/tree_file", :locals => { :name => tree.name, :content => tree.data, :file => tree }
14 14 - else
15 15 - contents = tree.contents
16   - %table#tree-slider.round-borders
  16 + %table#tree-slider.no-borders
17 17 %thead
18 18 %th Name
19 19 %th Last Update
... ...