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

styling again

This commit is contained in:
Josh 2018-06-01 14:20:40 -04:00
parent 45fb18e609
commit a9d5215d2b
6 changed files with 53 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/application.scss
View File

@ -38,6 +38,8 @@
@import "tabler";
@import "tabler.plugins";
@import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300i,400,400i,500,500i,600,600i,700,700i&subset=latin-ext);
$background-color: #F5F7FB;
$rule-color: lightblue;

5
app/controllers/rooms_controller.rb
View File

@ -56,9 +56,10 @@ class RoomsController < ApplicationController
# POST /r/:room_uid
def join
opts = default_meeting_options
puts
puts @room.invite_path
# If you're unauthenticated, you must enter a name to join the meeting.
if params[:join_name]
if params[@room.invite_path][:join_name]
redirect_to @room.join_path(params[:join_name], opts)
end
end

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

@ -18,12 +18,14 @@
<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">
<%= form_for room_path, method: :post do |f| %>
<div class="input-group" style="height: 60px;">
<input type="text" id="name-input" class="form-control main-large" placeholder="Enter your name!"></input>
<%= f.text_field :join_name, class: "form-control main-large", placeholder: "Enter your name!" %>
<span class="input-group-append">
<button class="btn btn-primary px-7 main-large">Join</button>
<%= f.submit "Join", class: "btn btn-primary px-7 main-large" %>
</span>
</div>
<% end %>
</div>
</div>
</div>

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

@ -2,13 +2,13 @@
<div class="container">
<div class="row pt-9">
<div class="col-lg-9 col-sm-12">
<h1 id="user-text" class="display-3 text-left text-primary mb-3"><%= @room.name %>
<h1 id="user-text" class="display-3 text-left 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"><%= @room.sessions %> Sessions | <%= @recordings.length %> Recordings</h4>
<label class="form-label text-primary">Invite Participants</label>
<h4 class="text-left mb-6"><%= @room.sessions %> Sessions | <%= @recordings.length %> Recordings</h4>
<label class="form-label">Invite Participants</label>
<form class="form-inline">
<div class="input-icon" style="width: 45%;">
<span class="input-icon-addon">

3
app/views/shared/_sessions.html.erb
View File

@ -2,7 +2,7 @@
<div class="container pt-6">
<%= render "shared/components/subtitle", subtitle: "Recordings", search: true %>
<div class="row">
<div class="col-12">
<div class="card">
<div class="table-responsive">
@ -36,4 +36,5 @@
</div>
</div>
</div>
</div>
</div>

8
app/views/shared/components/_room_block.html.erb
View File

@ -1,18 +1,18 @@
<div class="card">
<div class="card-body p-1">
<table class="table table-hover table-outline table-vcenter text-nowrap card-table">
<table class="table table-hover table-vcenter text-nowrap table-no-border" style="border-bottom: none;">
<tbody>
<td>
<span class="stamp stamp-md bg-primary">
<span class="stamp stamp-md bg-cyan">
<% if room == current_user.main_room %>
<i class="fas fa-home"></i>
<% else %>
<i class="fas fa-<%= room.icon %>"></i>
<i class="fas fa-chalkboard-teacher"></i>
<% end %>
</span>
</td>
<td>
<div><%= room.name %></div>
<h4 class="font-weight-normal p-0"><%= room.name %></h4>
<div class="small text-muted">
<i>Last Session on <%= recording_date(room.created_at) %></i>
</div>