lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Join button now expands to fit text (#921)

This commit is contained in:
Ahmad Farhat 2020-01-22 16:41:59 -05:00 committed by farhatahmad
parent eb965e5c52
commit df1705d9ea
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/rooms/components/_room_event.html.erb
View File

@ -24,7 +24,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-6 col-md-8 col-sm-12 form-inline mb-5 align-top"> <div class="col-lg-6 col-md-6 col-sm-12 form-inline mb-5 align-top">
<% if @room.owner.image.blank? %> <% if @room.owner.image.blank? %>
<span class="avatar"><%= @room.owner.name.first %></span> <span class="avatar"><%= @room.owner.name.first %></span>
<% else %> <% else %>
@ -33,7 +33,7 @@
<h5 class="font-weight-normal ml-4 mt-3"><%= @room.owner.name %> (<%= t("room.owner") %>)</h5> <h5 class="font-weight-normal ml-4 mt-3"><%= @room.owner.name %> (<%= t("room.owner") %>)</h5>
</div> </div>
<div class="col-lg-6 col-md-4 col-sm-12"> <div class="col-lg-6 col-md-6 col-sm-12">
<%= yield %> <%= yield %>
</div> </div>
</div> </div>

8
app/views/rooms/join.html.erb
View File

@ -31,7 +31,7 @@
<% end %> <% end %>
<% else %> <% else %>
<%= form_for room_path(@room), method: :post do |f| %> <%= form_for room_path(@room), method: :post do |f| %>
<div class="input-group join-input"> <div class="input-group">
<%= f.hidden_field(:search, :value => params[:search])%> <%= f.hidden_field(:search, :value => params[:search])%>
<%= f.hidden_field(:column, :value => params[:column])%> <%= f.hidden_field(:column, :value => params[:column])%>
<%= f.hidden_field(:direction, :value => params[:direction])%> <%= f.hidden_field(:direction, :value => params[:direction])%>
@ -43,7 +43,11 @@
readonly: !current_user.nil?, readonly: !current_user.nil?,
autofocus: true autofocus: true
%> %>
<%= f.submit (!@room_running && @anyone_can_start)? t("room.start") : t("room.join"), class: "btn btn-primary btn-sm col-sm-3 form-control join-form" %> <span class="input-group-append">
<button type="submit" class="btn btn-primary btn-sm px-7 form-control join-form">
<%= (!@room_running && @anyone_can_start) ? t("room.start") : t("room.join") %>
</button>
</span>
</div> </div>
<% end %> <% end %>
<% end %> <% end %>