Skip to content
Snippets Groups Projects
Commit 02dc2565 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Branches pages polished. few css improvements

parent 2b319d04
No related branches found
No related tags found
No related merge requests found
body {
margin-bottom:20px;
}
a {
outline: none;
color: $link_color;
Loading
Loading
@@ -67,6 +70,10 @@ h3, h4, h5, h6 {
line-height: 36px;
}
 
h5 {
font-size:14px;
}
code {
background:#FCEEC1;
color:$style_color;
Loading
Loading
Loading
Loading
@@ -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;
Loading
Loading
Loading
Loading
@@ -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 {
Loading
Loading
Loading
Loading
@@ -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
Loading
Loading
@@ -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
Loading
Loading
Loading
Loading
@@ -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
 
Loading
Loading
@@ -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
= 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
= 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
 
Loading
Loading
@@ -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"
Loading
Loading
Loading
Loading
@@ -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|
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment