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

increase width of center panel and make responsive

Browse Source
This commit is contained in:
Zachary Chai
2016-11-21 13:27:11 -05:00
parent 62dbefcb68
commit 6144a7b45b
8 changed files with 80 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/landing/_rooms_center_panel.html.erb
View File

@@ -11,14 +11,12 @@
<% end %>
<%= render layout: 'shared/center_panel' do %>
<div class="center-block col-sm-8">
<div class="center-block center-panel-conent-size col-xs-12">
<% if admin? %>
<%= render 'shared/meeting_url', hidden: false %>
<% else %>
<%= render 'shared/meeting_url', hidden: true %>
<% end %>
<div class="join-form-wrapper">
<%= render 'shared/join_form' %>
</div>
<%= render 'shared/join_form' %>
</div>
<% end %>

2
app/views/landing/meetings.html.erb
View File

@@ -24,7 +24,7 @@
<div class="center-panel-wrapper">
<%= render layout: 'shared/center_panel' do %>
<div class="center-block col-sm-8">
<div class="center-block center-panel-conent-size col-xs-12">
<%= render 'shared/meeting_url', hidden: false %>
<%= render 'shared/join_form' %>
</div>

5
app/views/layouts/application.html.erb
View File

@@ -4,6 +4,7 @@
<title>Greenlight</title>
<%= csrf_meta_tags %>
<%= action_cable_meta_tag %>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
@@ -31,7 +32,9 @@
<%= t('are_you', name: @user.username) %> |
<%= link_to t('login'), "/auth/#{@user.provider}" %>
<% else %>
<%= t('oauth_signup') %>
<span class="signup-description hidden-xs">
<%= t('oauth_signup') %>
</span>
<%= link_to('/auth/twitter', :class => "btn icon btn-lg btn-social-icon btn-twitter") do %>
<span class="fa fa-twitter"></span>
<% end %>

2
app/views/shared/_center_panel.html.erb
View File

@@ -1,6 +1,6 @@
<div class="center-panel">
<div class="row">
<div class="center-block center-panel-size">
<div class="center-block center-panel-size col-xs-12">
<div class="panel panel-default">
<div class="panel-body">
<h3 class="title-wrapper text-center">

70
app/views/shared/_join_form.html.erb
View File

@@ -1,36 +1,40 @@
<div class="join-form input-group input-spacing">
<% if current_user %>
<% @current_user = current_user %>
<%= text_field :current_user, :name, class: 'form-control meeting-user-name', type: 'hidden' %>
<% else %>
<%= text_field :nil, :nil, class: 'form-control meeting-user-name', placeholder: t('enter_name') %>
<% end %>
<% if admin? %>
<% if @meeting_running %>
<div class="col-sm-6">
<button type="button" class="btn btn-primary meeting-join pull-right">
<div class="join-form-wrapper">
<div class="center-block">
<div class="join-form input-group input-spacing">
<% if current_user %>
<% @current_user = current_user %>
<%= text_field :current_user, :name, class: 'form-control meeting-user-name', type: 'hidden' %>
<% else %>
<%= text_field :nil, :nil, class: 'form-control meeting-user-name', placeholder: t('enter_name') %>
<% end %>
<% if admin? %>
<% if @meeting_running %>
<div class="col-sm-6">
<button type="button" class="btn btn-primary meeting-join pull-right">
<%= t('join') %>
</button>
</div>
<div class="col-sm-6">
<button type="button" class="btn btn-danger meeting-end pull-left">
<%= t('end') %>
</button>
</div>
<% else %>
<button type="button" class="btn btn-primary center-block meeting-join">
<%= t('start') %>
</button>
<% end %>
<% elsif current_user %>
<button type="button" class="btn btn-primary center-block meeting-join">
<%= t('join') %>
</button>
</div>
<div class="col-sm-6">
<button type="button" class="btn btn-danger meeting-end pull-left">
<%= t('end') %>
</button>
</div>
<% else %>
<button type="button" class="btn btn-primary center-block meeting-join">
<%= t('start') %>
</button>
<% end %>
<% elsif current_user %>
<button type="button" class="btn btn-primary center-block meeting-join">
<%= t('join') %>
</button>
<% else %>
<span class="input-group-btn">
<button type="button" class="btn btn-primary meeting-join">
<%= t('join') %>
</button>
</span>
<% end %>
<% else %>
<span class="input-group-btn">
<button type="button" class="btn btn-primary meeting-join">
<%= t('join') %>
</button>
</span>
<% end %>
</div>
</div>
</div>