diff --git a/app/assets/javascripts/merge_requests.js b/app/assets/javascripts/merge_requests.js index 7885048079201450f5310d238736fb4d096e68cf..1c262afc6413c095812d6e133385eb7e4e32596b 100644 --- a/app/assets/javascripts/merge_requests.js +++ b/app/assets/javascripts/merge_requests.js @@ -9,17 +9,19 @@ var MergeRequest = { $(this).parent().addClass("active"); }); - $(".tabs a.merge-notes-tab").live("click", function() { + $(".tabs a.merge-notes-tab").live("click", function(e) { $(".merge-request-diffs").hide(); $(".merge-request-notes").show(); + e.preventDefault(); }); - $(".tabs a.merge-diffs-tab").live("click", function() { + $(".tabs a.merge-diffs-tab").live("click", function(e) { if(!MergeRequest.diffs_loaded) { MergeRequest.loadDiff(); } $(".merge-request-notes").hide(); $(".merge-request-diffs").show(); + e.preventDefault(); }); }, diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index a7612169218199635cd539a7f0411fb390af5fbb..19baf272eb6edd5f4210a9a026f1df28edf88ea7 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -253,14 +253,12 @@ img.lil_av { } .widget { + @include shade; padding:20px; margin-bottom:20px; - background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #fff), to(#f1f1f1)); - background-image: -webkit-linear-gradient(#fff 6.6%, #f1f1f1); - background-image: -moz-linear-gradient(#fff 6.6%, #f1f1f1); - background-image: -o-linear-gradient(#fff 6.6%, #f1f1f1); border: 1px solid #DDD; border-radius: 5px; + background:#fafafa; .link_holder { background:#eee; @@ -304,6 +302,9 @@ img.lil_av { .row_title { font-weight:bold; color:#444; + &:hover { + text-decoration:underline; + } } li, .wll { @@ -345,10 +346,6 @@ img.lil_av { @include shade; } -.well.padded { - padding:29px; -} - .download_repo_link { background: url("images.png") no-repeat 0 -48px; padding-left:20px; @@ -369,3 +366,7 @@ table a code { top: -2px; margin-right: 3px; } + +.span12 hr{ + margin-top: 5px; +} diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss index 566ebbeca338227f63818e8b044b5bcaedec14e0..3bba7062a249d3d81efbcb9eec186c92755a660a 100644 --- a/app/assets/stylesheets/login.scss +++ b/app/assets/stylesheets/login.scss @@ -1,7 +1,7 @@ /* Login Page */ body.login-page{ padding-top: 10%; - background:$style_color; + background:#f1f1f1; } .login-box{ diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss index 487925db7af92fbd926e529da7ccc968df4d23bd..b3ba1cd90be2c6cd52969da260ff3c01d556990b 100644 --- a/app/assets/stylesheets/projects.css.scss +++ b/app/assets/stylesheets/projects.css.scss @@ -222,6 +222,33 @@ input.git_clone_url { background:#fff !important; } -.span12 hr{ - margin-top: 2px; +.project_tile { + @include shade; + @include round-borders-all(4px); + margin-bottom:20px; + width:338px; + float:left; + margin-left:20px; + border: 1px solid #DDD; + padding-bottom:20px; + + .title { + background:#f5f5f5; + padding: 5px 10px 2px 20px; + border-bottom: 1px solid #DDD; + margin-bottom: 15px; + + h3 { + &:hover { + text-decoration: underline; + } + } + } + .data { + margin: 0 20px; + } + .buttons { + margin: 0 20px; + } } + diff --git a/app/views/deploy_keys/_show.html.haml b/app/views/deploy_keys/_show.html.haml index 919b2d0ce0c77ed080f48edc0b0a6f79807fb86e..ff17b3cd66c07329a4949cc8122dae8355dffa8c 100644 --- a/app/views/deploy_keys/_show.html.haml +++ b/app/views/deploy_keys/_show.html.haml @@ -1,12 +1,12 @@ %tr %td %a{:href => project_deploy_key_path(key.project, key)} - = key.title + %strong= key.title %td %span.update-author Added = time_ago_in_words(key.created_at) ago %td - = link_to 'Remove', project_deploy_key_path(key.project, key), :confirm => 'Are you sure?', :method => :delete, :class => "danger btn delete-key small" + = link_to 'Remove', project_deploy_key_path(key.project, key), :confirm => 'Are you sure?', :method => :delete, :class => "danger btn delete-key small right" diff --git a/app/views/layouts/_projects_side.html.haml b/app/views/layouts/_projects_side.html.haml index 3b567044e3456501b63982cf056ef459348e4ae6..0c292394ca2a107f7369089d34fb1b9f156f0b3e 100644 --- a/app/views/layouts/_projects_side.html.haml +++ b/app/views/layouts/_projects_side.html.haml @@ -3,7 +3,7 @@ .widget You can create at least = current_user.projects_limit - projects. Click on button to add a new one + projects. Click on link below to add a new one .link_holder = link_to new_project_path, :class => "" do New Project ยป diff --git a/app/views/projects/_tile.html.haml b/app/views/projects/_tile.html.haml index 70bc301bfe9e25c844e026c114718f12b2608f19..6b489303cc1e780f0ad64b42f05803b20cd34865 100644 --- a/app/views/projects/_tile.html.haml +++ b/app/views/projects/_tile.html.haml @@ -1,11 +1,13 @@ - @projects.in_groups_of(2, false) do |projects| .row - projects.each_with_index do |project, i| - %div.span5.well.padded - = link_to project_path(project) do - %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.info{:href => tree_project_ref_path(project, project.root_ref)} Browse code - %a.btn{:href => project_commits_path(project)} Commits + %div.project_tile + .title + = link_to project_path(project) do + %h3= truncate(project.name, :length => 28) + .data + %p + %input{ :value => project.url_to_repo, :class => ['git-url', 'one_click_select', 'text', 'project_list_url'], :readonly => 'readonly' } + .buttons + %a.btn.info{:href => tree_project_ref_path(project, project.root_ref)} Browse code + %a.btn{:href => project_commits_path(project)} Commits diff --git a/app/views/wikis/_form.html.haml b/app/views/wikis/_form.html.haml index f88e67bf4274837a2b648050ebd9e72d8f0c3126..55191250ceb06206017a3c8591779aa9c7396a2d 100644 --- a/app/views/wikis/_form.html.haml +++ b/app/views/wikis/_form.html.haml @@ -6,6 +6,12 @@ - @wiki.errors.full_messages.each do |msg| %li= msg + .alert-message.block-message.warning + %p + Wiki content is parsed with #{link_to "Markdown", "http://en.wikipedia.org/wiki/Markdown"}. + %br + To add link to new page you can just type + %code [Link Title](page-slug) .clearfix = f.label :title .input= f.text_field :title, :class => :xxlarge diff --git a/app/views/wikis/edit.html.haml b/app/views/wikis/edit.html.haml index df3274b1ac78c414ed054281c970fb38a432acc1..26cbd52a9a883c84406c6284516c27c182016e3c 100644 --- a/app/views/wikis/edit.html.haml +++ b/app/views/wikis/edit.html.haml @@ -1,3 +1,3 @@ -%h1 Editing page - +%h3 Editing page +%hr = render 'form' diff --git a/app/views/wikis/history.html.haml b/app/views/wikis/history.html.haml index 53bfe7ae840b13b1abf7dd908d74efd2e7d6dbd8..ad5a50b81369300d452c087a171709c72ad039fd 100644 --- a/app/views/wikis/history.html.haml +++ b/app/views/wikis/history.html.haml @@ -1,4 +1,4 @@ -%h2 Versions +%h3 Versions %table %thead %tr diff --git a/app/views/wikis/show.html.haml b/app/views/wikis/show.html.haml index 63a166fe88828bfa48bb97aa9426fd9b6f0f6469..685b76c44421716238c3481e7d14c530413e36b4 100644 --- a/app/views/wikis/show.html.haml +++ b/app/views/wikis/show.html.haml @@ -1,10 +1,11 @@ %h3 = @wiki.title - = link_to edit_project_wiki_path(@project, @wiki), :class => "right btn small" do - Edit - - if can? current_user, :write_wiki, @project - = link_to history_project_wiki_path(@project, @wiki), :class => "right btn small" do - History + %span.right + - if can? current_user, :write_wiki, @project + = link_to history_project_wiki_path(@project, @wiki), :class => "btn small" do + History + = link_to edit_project_wiki_path(@project, @wiki), :class => "btn small" do + Edit %hr = markdown_to_html @wiki.content