diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 86576359..6fd03272 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -82,12 +82,16 @@ a { .container { width:$min_app_width; - margin-top:50px; - padding:$app_padding; + padding-top:0; + z-index:5; +} + +.container .content { + margin:0 $app_padding; } .container .sidebar { - width: 220px; + width: 200px; height:100%; min-height:450px; float:right; @@ -95,10 +99,8 @@ a { nav.main_menu { border-radius: 4px; - width: 100%; margin: auto; - margin-top:30px; - margin-bottom:30px; + margin:30px $app_padding; background:#f1f1f1; border:1px solid #ccc; height:38px; @@ -154,7 +156,6 @@ aside.projects, aside.project-side { margin-left: 0; - padding-left: 20px; } img.avatar { @@ -327,3 +328,7 @@ img.lil_av { .borders { border: 1px solid #ccc; } + +.well.padded { + padding:29px; +} diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index 9fd78583..df61cc81 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -9,8 +9,8 @@ $active_bg_color:#79C3E0; $active_bd_color: #2FA0BB; $border_color:#CCC; $lite_border_color:#EEE; -$min_app_width:960px; -$max_app_width:960px; +$min_app_width:980px; +$max_app_width:980px; $app_padding:20px; $bg_color: #FFF; $styled_border_color: #2FA0BB; diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss index d12143ae..b54e12c8 100644 --- a/app/assets/stylesheets/projects.css.scss +++ b/app/assets/stylesheets/projects.css.scss @@ -216,3 +216,8 @@ input.git_clone_url { #new_issue_dialog textarea{ height: 100px; } + +.project_list_url { + width:270px; + background:#fff !important; +} diff --git a/app/assets/stylesheets/top_panel.scss b/app/assets/stylesheets/top_panel.scss index 5c18eb2b..c4d4fb2e 100644 --- a/app/assets/stylesheets/top_panel.scss +++ b/app/assets/stylesheets/top_panel.scss @@ -1,5 +1,4 @@ body header { - position:absolute; width:100%; padding:0; margin:0; @@ -19,9 +18,15 @@ body header { min-width:$min_app_width; max-width:$max_app_width; position:relative; - padding:15px $app_padding; + padding:15px 0; + + .top_panel_content { + margin:0 $app_padding; + } } + + .project_name { float:left; width:400px; diff --git a/app/views/projects/_tile.html.haml b/app/views/projects/_tile.html.haml index e5fa597d..70bc301b 100644 --- a/app/views/projects/_tile.html.haml +++ b/app/views/projects/_tile.html.haml @@ -1,11 +1,11 @@ - @projects.in_groups_of(2, false) do |projects| .row - projects.each_with_index do |project, i| - .span5.well + %div.span5.well.padded = link_to project_path(project) do - %h3= truncate(project.name, :length => 20) - %p.title.repository.git_url_wrapper + %h3= truncate(project.name, :length => 28) + %p %input{ :value => project.url_to_repo, :class => ['git-url', 'one_click_select', 'text', 'project_list_url'], :readonly => 'readonly' } - %a.btn{:href => tree_project_ref_path(project, project.root_ref)} Browse code + %a.btn.info{:href => tree_project_ref_path(project, project.root_ref)} Browse code %a.btn{:href => project_commits_path(project)} Commits