Update gems, use d3 gem, initial bootstrap v3 port
This commit is contained in:
parent
24e40a5c90
commit
587126218d
71 changed files with 798 additions and 10411 deletions
|
|
@ -1,15 +1,14 @@
|
|||
.row-fluid
|
||||
.span10
|
||||
.row
|
||||
.col-md-12
|
||||
%h3
|
||||
= @event.title
|
||||
%br
|
||||
%span.muted
|
||||
%small
|
||||
= @event.subtitle
|
||||
.span2
|
||||
= link_to "Edit", edit_admin_conference_event_path(@conference.short_title, @event), :class => "btn btn-mini btn-primary"
|
||||
= link_to "Edit", edit_admin_conference_event_path(@conference.short_title, @event), :class => "btn btn-mini btn-default pull-right"
|
||||
|
||||
.row-fluid
|
||||
.span12
|
||||
.row
|
||||
.col-md-12
|
||||
%table.table
|
||||
%tr
|
||||
%td{:style => "width:15%"}
|
||||
|
|
@ -161,7 +160,7 @@
|
|||
= link_to "Delete", conference_proposal_event_attachment_path(@conference.short_title, @event.id, a.id),
|
||||
:method => :delete, :confirm => "Are you sure you want to delete this attachment? It's permanant!"
|
||||
|
||||
.row-fluid
|
||||
.row
|
||||
= link_to "Comments (#{@comment_count})", "#", :id => "event-comment-link"
|
||||
#comments-div
|
||||
%hr
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue