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

styling

Browse Source
This commit is contained in:
joshua-arts
2018-05-31 22:15:18 -04:00
parent 39414e269b
commit 1bcd176285
14 changed files with 137 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,30 @@
<p>The join the meeting, enter a name.</p>
<div class="room-section pb-9">
<div class="container">
<div class="row pt-9">
<div class="col-lg-12 col-sm-12">
<h4 class="text-left text-primary">You have been invited to join</h4>
<h1 class="display-3 text-left text-primary mb-3"><%= @room.name %></h1>
<hr class="mt-2 float-left bg-azure" style="width: 20%;">
</div>
</div>
<p>Enter a name to start a session.</p>
<%= form_tag room_path(@room) do %>
<%= text_field_tag "join_name" %>
<%= submit_tag "Join" %>
<% end %>
<div class="row">
<div class="col-lg-6 col-md-8 col-sm-12 form-inline mb-5">
<% if @room.owner.image.nil? %>
<span class="avatar"><%= @room.owner.name.first %></span>
<% else %>
<span class="avatar" style="background-image: url(<%= @room.owner.image %>)"></span>
<% end %>
<h5 class="font-weight-normal ml-4 mt-3 text-primary"><%= @room.owner.name %> (Owner)</h5>
</div>
<div class="col-lg-6 col-md-4 col-sm-12">
<div class="input-group" style="height: 60px;">
<input type="text" id="name-input" class="form-control main-large" placeholder="Enter your name!"></input>
<span class="input-group-append">
<button class="btn btn-primary px-7 main-large">Join</button>
</span>
</div>
</div>
</div>
</div>
</div>

14
app/views/rooms/show.html.erb
View File

@ -1,8 +1,12 @@
<div class="room-section">
<div class="room-section pb-1">
<div class="container">
<div class="row pt-9">
<div class="row pt-8">
<div class="col-lg-9 col-sm-12">
<h1 id="user-text" class="display-3 text-left text-primary mb-3"><%= @room.name %></h1>
<h1 id="user-text" class="display-3 text-left text-primary mb-3"><%= @room.name %>
<% if current_user.main_room == @room %>
<i class="fas fa-home align-top" style="font-size: 22px;"></i>
<% end %>
</h1>
<h4 class="text-left text-primary mb-6">0 Sessions | 0 Recordings</h4>
<label class="form-label text-primary">Invite Participants</label>
<form class="form-inline">
@ -29,7 +33,7 @@
<div class="row mt-7 mb-2">
<% (current_user.rooms - [@room]).each do |room| %>
<div class="col-4">
<div class="col-lg-4 col-md-6 col-sm-12">
<%= link_to room do %>
<%= render "shared/components/room_block", room: room %>
<% end %>
@ -39,7 +43,7 @@
</div>
</div>
<%= render "shared/sessions" %>
<%= render "shared/sessions", recordings: @room.recordings %>
<script>
var invite_url;