From 8cc25ef94e540e8512f0c22eb4a506f812e9982f Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sun, 15 Jan 2012 22:36:32 +0200 Subject: [PATCH] cleaning UI --- app/assets/stylesheets/projects.css.scss | 5 +++ app/assets/stylesheets/style.scss | 40 +++++++++++++++--------- app/views/dashboard/_sidebar.html.haml | 2 +- app/views/layouts/project.html.haml | 2 +- app/views/projects/_team.html.haml | 2 +- app/views/refs/_tree.html.haml | 2 +- 6 files changed, 35 insertions(+), 18 deletions(-) diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss index 3437c8fb..b82076bc 100644 --- a/app/assets/stylesheets/projects.css.scss +++ b/app/assets/stylesheets/projects.css.scss @@ -439,6 +439,11 @@ body.project-page .team_member_new .span-6, .team_member_edit .span-6{ padding:1 body.projects-page input.text.git-url.project_list_url { width:165px; } +body.project-page table.no-borders th { + background:none; + border-bottom:1px solid #CCC; + color:#333; +} body.project-page table.no-borders tr, body.project-page table.no-borders td{ diff --git a/app/assets/stylesheets/style.scss b/app/assets/stylesheets/style.scss index 17fb5ed2..916f6744 100644 --- a/app/assets/stylesheets/style.scss +++ b/app/assets/stylesheets/style.scss @@ -76,7 +76,7 @@ $blue_link: "#2fa0bb"; html{ -webkit-font-smoothing:antialiased; } body { font-size: 12px; - background-color: #F7F7F7; + background-color: #FFFFFF; } a{text-decoration: none; font-weight: bold; color: #444} a:hover{color: #555} @@ -190,12 +190,14 @@ input.button{margin-bottom: 1.5em} /* eo Buttons */ /* UI Box */ -.ui-box{border: 1px solid #DEDFE1; float: left; border-radius: 5px} +//.ui-box{border: 1px solid #DEDFE1; float: left; border-radius: 5px} +.ui-box{float: left;} .ui-box h3{ background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #fefefe), to(#F6F7F8)); background-image: -webkit-linear-gradient(#fefefe 7.6%, #F6F7F8); background-image: -moz-linear-gradient(#fefefe 7.6%, #F6F7F8); background-image: -o-linear-gradient(#fefefe 7.6%, #F6F7F8); + background:none; margin: 0; padding: 1em; font-size: 12px; @@ -406,7 +408,7 @@ header nav a.last_elem{ border-bottom-right-radius: 4px; } -header .search{ display: inline-block; float: right; margin-right: 46px} +header .search{ display: inline-block; float: right; margin-right: 90px} header nav a span{width: 20px; height: 20px; display: inline-block; background: red; position: absolute; left: 8px; top: 6px;} @@ -600,22 +602,22 @@ html, body { height: 100%; } body.dashboard-page h2.icon span{ background-position: 9px -69px; } body.dashboard-page header{margin-bottom: 0} -body.dashboard-page .news-feed{padding-left: 1em; margin-right: 450px; min-height: 600px; margin-left: 1%; margin-top: 20px;} +body.dashboard-page .news-feed{margin-left: 290px; min-height: 600px; margin-top: 20px; margin-right:2px;} body.dashboard-page .dashboard-content{ position: relative; float: left; width: 100%; height: 100%; } body.dashboard-page .news-feed h2{float: left;} -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 } -body.dashboard-page aside h4{margin: 0; border-bottom: 1px solid #ccc; padding: 10px 10px; font-size: 11px; font-weight: bold; text-transform: uppercase;} +body.dashboard-page aside{ min-height: 820px; position: relative; top: 0; bottom: 0; right: 0; width: 260px; float: left; border-right: 1px solid #ccc } +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;} body.dashboard-page aside h4 a.button-small{float: right; text-transform: none; border-radius: 4px; margin-right: 2%; margin-top: -4px; display: block;} body.dashboard-page aside .project-list {list-style: none; margin: 0; padding: 0;} -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;} -body.dashboard-page aside .project-list li a:hover {background: #f1f1f1} -body.dashboard-page aside .project-list li a:hover span.arrow{background-color: #E3E5EA;} +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;} +//body.dashboard-page aside .project-list li a:hover {background: #f1f1f1} +//body.dashboard-page aside .project-list li a:hover span.arrow{background-color: #E3E5EA;} body.dashboard-page aside .project-list li a span.project-name{font-size: 14px; display: block; margin-bottom: 8px} body.dashboard-page aside .project-list li a span.time{color: #666; font-weight: normal; font-size: 11px} 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} body.dashboard-page .news-feed .project-updates {margin-bottom: 20px; display: block; width: 100%;} body.dashboard-page .news-feed .project-updates .data{ padding: 0} -body.dashboard-page .news-feed .project-updates a.project-update {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;} +body.dashboard-page .news-feed .project-updates a.project-update {padding: 10px; overflow: hidden; display: block;} body.dashboard-page .news-feed .project-updates a.project-update:last-child{border-bottom: 0} body.dashboard-page .news-feed .project-updates a.project-update img{float: left; margin-right: 10px;} 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; body.project-page h2.icon span{ background-position: -78px -68px; } body.project-page .project-container{ position: relative; float: left; width: 100%; height: 100%; padding-bottom: 10px;} body.project-page .page-title{margin-bottom: 0} -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; } +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; } 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} body.projects-page input.text.git-url {margin:10px 0 0 } @@ -657,8 +659,10 @@ body.project-page .project-sidebar aside a{ //background: #FFF; padding: 15px 10px; //border: 1px solid #ccc; - margin: 10px 20px 0 0; + margin: 10px 0 0 0; //border-radius:5px; + + } //body.project-page .project-sidebar aside a:hover{background-color: #FFFFFF;} 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 { background: #79C3E0; border: 1px solid #2FA0BB; border-radius:5px; + + + -webkit-border-top-right-radius: 0; + -webkit-border-bottom-right-radius: 0; + -moz-border-radius-topright: 0px; + -moz-border-radius-bottomright: 0px; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + margin-right: -1px; } body.project-page .project-content{ padding: 20px; display: block; margin-left: 110px; min-height: 600px} 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 body.project-page .fixed{position: fixed; } /* New project Page */ -.new-project-page .container{ margin:20px} .new-project-page .container table{background: white} /* eo New Project Page */ @@ -712,7 +724,7 @@ body.project-page.commits-page .commit-button i{ body.project-page.commits-page .commits-date {display: block; width: 100%; margin-bottom: 20px} body.project-page.commits-page .commits-date .data {padding: 0} body.project-page.commits-page a.commit{padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;} -body.project-page.commits-page .commits-date a.commit {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;} +body.project-page.commits-page .commits-date a.commit {padding: 10px; border-bottom: none; overflow: hidden; display: block;} body.project-page.commits-page .commits-date a.commit:last-child{border-bottom: 0} body.project-page.commits-page .commits-date a.commit img{float: left; margin-right: 10px;} body.project-page.commits-page .commits-date a.commit span.commit-title{display: block;} diff --git a/app/views/dashboard/_sidebar.html.haml b/app/views/dashboard/_sidebar.html.haml index 9f6378b4..dec71186 100644 --- a/app/views/dashboard/_sidebar.html.haml +++ b/app/views/dashboard/_sidebar.html.haml @@ -7,7 +7,7 @@ - @projects.each do |project| %li %a{:href => project_path(project)} - %span.arrow → + -#%span.arrow → %span.project-name= project.name %span.time %strong Last activity: diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml index 3afb762d..4b710d58 100644 --- a/app/views/layouts/project.html.haml +++ b/app/views/layouts/project.html.haml @@ -28,7 +28,7 @@ = link_to "Repository", project_repository_path(@project), :class => repository_tab_class = link_to "Tree", tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class - = link_to "Commits", project_commits_path(@project), :class => current_page?(:controller => "commits", :action => "index", :project_id => @project) ? "current" : nil + = link_to "Commits", project_commits_path(@project), :class => (controller.controller_name == "commits") ? "current" : nil = link_to "Network", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil = link_to project_issues_filter_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do Issues diff --git a/app/views/projects/_team.html.haml b/app/views/projects/_team.html.haml index 36629f51..3d033a85 100644 --- a/app/views/projects/_team.html.haml +++ b/app/views/projects/_team.html.haml @@ -1,4 +1,4 @@ -%table.round-borders#team-table +%table.no-borders#team-table %thead %th Name %th Project diff --git a/app/views/refs/_tree.html.haml b/app/views/refs/_tree.html.haml index 4c60e03c..e842f740 100644 --- a/app/views/refs/_tree.html.haml +++ b/app/views/refs/_tree.html.haml @@ -13,7 +13,7 @@ = render :partial => "refs/tree_file", :locals => { :name => tree.name, :content => tree.data, :file => tree } - else - contents = tree.contents - %table#tree-slider.round-borders + %table#tree-slider.no-borders %thead %th Name %th Last Update