From 02dc25651411d5a60d760265903ebf629959ba59 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 18 May 2012 00:23:18 +0300 Subject: [PATCH] Branches pages polished. few css improvements --- app/assets/stylesheets/gitlab_bootstrap.scss | 7 +++++ app/assets/stylesheets/main.scss | 5 ++++ app/assets/stylesheets/ui_basic.scss | 6 ++++ app/views/protected_branches/index.html.haml | 29 ++++++++++--------- app/views/refs/_head.html.haml | 2 +- .../repositories/_branches_head.html.haml | 1 - app/views/repositories/branches.html.haml | 9 +++++- app/views/repositories/show.html.haml | 8 ++++- app/views/snippets/_form.html.haml | 2 +- app/views/team_members/_show.html.haml | 2 +- 10 files changed, 51 insertions(+), 20 deletions(-) diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss index b520c3bc..60090dbd 100644 --- a/app/assets/stylesheets/gitlab_bootstrap.scss +++ b/app/assets/stylesheets/gitlab_bootstrap.scss @@ -1,3 +1,6 @@ +body { + margin-bottom:20px; +} a { outline: none; color: $link_color; @@ -67,6 +70,10 @@ h3, h4, h5, h6 { line-height: 36px; } +h5 { + font-size:14px; +} + code { background:#FCEEC1; color:$style_color; diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index dfc93153..23108561 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -31,6 +31,11 @@ $hover: #FDF5D9; box-shadow: 0 0 3px #ddd; } +@mixin border-radius($radius) { + -moz-border-radius: $radius; + -webkit-border-radius: $radius; + border-radius: $radius; +} @mixin round-borders-bottom($radius) { border-top: 1px solid #eaeaea; diff --git a/app/assets/stylesheets/ui_basic.scss b/app/assets/stylesheets/ui_basic.scss index a2ddb203..251083df 100644 --- a/app/assets/stylesheets/ui_basic.scss +++ b/app/assets/stylesheets/ui_basic.scss @@ -87,6 +87,12 @@ padding: 5px; margin-right:10px; float:right; + background: #EEE; + @include border-radius(5px); + border: 1px solid #DDD; + img { + vertical-align:top; + } } .project_name { diff --git a/app/views/protected_branches/index.html.haml b/app/views/protected_branches/index.html.haml index 392a135d..fa80a489 100644 --- a/app/views/protected_branches/index.html.haml +++ b/app/views/protected_branches/index.html.haml @@ -8,10 +8,24 @@ %li forced code review before merge to protected branches %p Read more about project permissions #{link_to "here", help_permissions_path, :class => "vlink"} +- if can? current_user, :admin_project, @project + = form_for [@project, @protected_branch] do |f| + -if @protected_branch.errors.any? + .alert-message.block-message.error + %ul + - @protected_branch.errors.full_messages.each do |msg| + %li= msg + + .entry.clearfix + = f.label :name, "Branch" + .span3 + = f.select(:name, @project.open_branches.map { |br| [br.name, br.name] } , { :include_blank => "-- Select branch" }, { :class => "span3" }) +   + = f.submit 'Protect', :class => "primary btn" - unless @branches.empty? - %table.table-striped + %table.admin-table %thead %tr %th Name @@ -36,19 +50,6 @@ -- if can? current_user, :admin_project, @project - = form_for [@project, @protected_branch] do |f| - -if @protected_branch.errors.any? - .alert-message.block-message.error - %ul - - @protected_branch.errors.full_messages.each do |msg| - %li= msg - - .clearfix - = f.label :name - .input= f.select(:name, @project.open_branches.map { |br| [br.name, br.name] } , { :include_blank => "Select branch" }, { :style => "width:300px" }) - .actions - = f.submit 'Add', :class => "primary btn" :javascript diff --git a/app/views/refs/_head.html.haml b/app/views/refs/_head.html.haml index d76a4aca..afec5af8 100644 --- a/app/views/refs/_head.html.haml +++ b/app/views/refs/_head.html.haml @@ -6,5 +6,5 @@ = hidden_field_tag :path, params[:path] %li{:class => "#{'active' if (controller.controller_name == "refs") }"} = link_to tree_project_ref_path(@project, @ref) do - Code + Source diff --git a/app/views/repositories/_branches_head.html.haml b/app/views/repositories/_branches_head.html.haml index dd0b343b..63cbee6c 100644 --- a/app/views/repositories/_branches_head.html.haml +++ b/app/views/repositories/_branches_head.html.haml @@ -9,4 +9,3 @@ %li{:class => ("active" if current_page?(branches_project_repository_path(@project)))} = link_to branches_project_repository_path(@project) do All -%hr diff --git a/app/views/repositories/branches.html.haml b/app/views/repositories/branches.html.haml index 75e34da5..52c0bf8e 100644 --- a/app/views/repositories/branches.html.haml +++ b/app/views/repositories/branches.html.haml @@ -1,6 +1,13 @@ = render "repositories/branches_head" - unless @branches.empty? - %table.table-striped.borders + %table.admin-table + %thead + %tr + %th Name + %th Last commit + %th Updated at + %th + %tbody - @branches.each do |branch| = render "repositories/branch", :branch => branch diff --git a/app/views/repositories/show.html.haml b/app/views/repositories/show.html.haml index 43514551..ceb971a4 100644 --- a/app/views/repositories/show.html.haml +++ b/app/views/repositories/show.html.haml @@ -1,6 +1,12 @@ = render "branches_head" -%table.zebra-striped.borders +%table.admin-table + %thead + %tr + %th Name + %th Last commit + %th Updated at + %th - @activities.each do |update| = render "repositories/branch", :branch => update.head diff --git a/app/views/snippets/_form.html.haml b/app/views/snippets/_form.html.haml index a0a00556..5a28a350 100644 --- a/app/views/snippets/_form.html.haml +++ b/app/views/snippets/_form.html.haml @@ -19,7 +19,7 @@ .input= f.select :expires_at, lifetime_select_options, {}, :style => "width:200px;" .clearfix = f.label :content, "Code" - = f.text_area :content, :class => "xxlarge" + .input= f.text_area :content, :class => "span8" .actions = f.submit 'Save', :class => "primary btn" diff --git a/app/views/team_members/_show.html.haml b/app/views/team_members/_show.html.haml index ac648f7c..00d06601 100644 --- a/app/views/team_members/_show.html.haml +++ b/app/views/team_members/_show.html.haml @@ -6,7 +6,7 @@ = link_to project_team_member_path(@project, member), :title => user.name, :class => "dark" do = image_tag gravatar_icon(user.email, 40), :class => "avatar" %strong= truncate(user.name, :lenght => 40) - .prepend-top-10= user.email + %div.cgray= user.email .span3 = form_for(member, :as => :team_member, :url => project_team_member_path(@project, member)) do |f|