deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'bootstrap'

Browse source 
Conflicts:
	Gemfile
	app/views/commits/_commits.html.haml
	app/views/projects/empty.html.haml
This commit is contained in:
Dmitriy Zaporozhets 2012-01-30 00:45:35 +02:00
commit 8ebfae9a07
127 changed files with 2464 additions and 2991 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/devise/sessions/new.html.erb
View file

@ -4,10 +4,10 @@
<%= f.password_field :password, :class => "text bottom", :placeholder => "Password" %>
<% if devise_mapping.rememberable? -%>
<div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
<div class="clearfix"> <%= f.label :remember_me %><%= f.check_box :remember_me %></div>
<% end -%>
<br/>
<%= f.submit "Sign in", :class => "grey-button" %>
<%= f.submit "Sign in", :class => "primary btn" %>
<div class="right"> <%= render :partial => "devise/shared/links" %></div>
<% if ldap_enable? -%>
<p><%= link_to "via LDAP", user_omniauth_authorize_path(:ldap)%></p>