diff --git a/app/assets/javascripts/recordings.coffee b/app/assets/javascripts/recordings.coffee index 94f6ba52..1e4938c6 100644 --- a/app/assets/javascripts/recordings.coffee +++ b/app/assets/javascripts/recordings.coffee @@ -9,7 +9,7 @@ class @Recordings data: [], rowId: 'id', paging: false, - dom: 'lrtip', + dom: 't', info: false, order: [[ 0, "desc" ]], language: { diff --git a/app/assets/stylesheets/landing.scss b/app/assets/stylesheets/landing.scss index 35ff5a10..f93d71b8 100644 --- a/app/assets/stylesheets/landing.scss +++ b/app/assets/stylesheets/landing.scss @@ -2,22 +2,6 @@ // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ -.center-panel-wrapper { - .join-form { - width: 100%; - } - - .meeting-url-wrapper { - .meeting-url { - cursor: default; - } - } - - .loading-wrapper { - text-align: center; - } -} - .rooms { .table-wrapper { diff --git a/app/assets/stylesheets/shared.scss b/app/assets/stylesheets/shared.scss index 77628fe2..a243f9c9 100644 --- a/app/assets/stylesheets/shared.scss +++ b/app/assets/stylesheets/shared.scss @@ -7,17 +7,17 @@ html, body { width: 100%; height: 100%; + background: #ffffff; } .app-background { - background: #4dc0a2; - background: -moz-linear-gradient(top, #4dc0a2 0%, #4dc0a2 35%, #ffffff 35%, #ffffff 100%); - background: -webkit-gradient(left top, left bottom, color-stop(0%, #4dc0a2), color-stop(35%, #4dc0a2), color-stop(35%, #ffffff), color-stop(100%, #ffffff)); - background: -webkit-linear-gradient(top, #4dc0a2 0%, #4dc0a2 35%, #ffffff 35%, #ffffff 100%); - background: -o-linear-gradient(top, #4dc0a2 0%, #4dc0a2 35%, #ffffff 35%, #ffffff 100%); - background: -ms-linear-gradient(top, #4dc0a2 0%, #4dc0a2 35%, #ffffff 35%, #ffffff 100%); - background: linear-gradient(to bottom, #4dc0a2 0%, #4dc0a2 35%, #ffffff 35%, #ffffff 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4dc0a2', endColorstr='#ffffff', GradientType=0 ); + background: #ffffff; + background: -moz-linear-gradient(top, #4dc0a2 0%, #4dc0a2 350px, #ffffff 350px, #ffffff 100%); + background: -webkit-gradient(left top, left bottom, color-stop(0%, #4dc0a2), color-stop(350px, #4dc0a2), color-stop(350px, #ffffff), color-stop(100%, #ffffff)); + background: -webkit-linear-gradient(top, #4dc0a2 0%, #4dc0a2 350px, #ffffff 350px, #ffffff 100%); + background: -o-linear-gradient(top, #4dc0a2 0%, #4dc0a2 350px, #ffffff 350px, #ffffff 100%); + background: -ms-linear-gradient(top, #4dc0a2 0%, #4dc0a2 350px, #ffffff 350px, #ffffff 100%); + background: linear-gradient(to bottom, #4dc0a2 0%, #4dc0a2 350px, #ffffff 350px, #ffffff 100%); } #alerts { @@ -52,7 +52,10 @@ html, body { float: none; } .center-panel-size { - width: 650px; + max-width: 900px + } + .center-panel-conent-size { + max-width: 800px; } .input-spacing { @@ -71,4 +74,26 @@ html, body { .title-wrapper { margin-bottom: 30px; } + + .join-form-wrapper { + .center-block { + max-width: 400px; + } + .join-form { + width: 100%; + } + .btn { + width: initial; + } + } + + .meeting-url-wrapper { + .meeting-url { + cursor: default; + } + } + + .loading-wrapper { + text-align: center; + } } diff --git a/app/views/landing/_rooms_center_panel.html.erb b/app/views/landing/_rooms_center_panel.html.erb index f805d6b3..a978897f 100644 --- a/app/views/landing/_rooms_center_panel.html.erb +++ b/app/views/landing/_rooms_center_panel.html.erb @@ -11,14 +11,12 @@ <% end %> <%= render layout: 'shared/center_panel' do %> -
+
<% if admin? %> <%= render 'shared/meeting_url', hidden: false %> <% else %> <%= render 'shared/meeting_url', hidden: true %> <% end %> -
- <%= render 'shared/join_form' %> -
+ <%= render 'shared/join_form' %>
<% end %> diff --git a/app/views/landing/meetings.html.erb b/app/views/landing/meetings.html.erb index 0eb74733..7f157f22 100644 --- a/app/views/landing/meetings.html.erb +++ b/app/views/landing/meetings.html.erb @@ -24,7 +24,7 @@
<%= render layout: 'shared/center_panel' do %> -
+
<%= render 'shared/meeting_url', hidden: false %> <%= render 'shared/join_form' %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 830fb1be..6acd914f 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -4,6 +4,7 @@ Greenlight <%= csrf_meta_tags %> <%= action_cable_meta_tag %> + <%= 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') %> + <%= link_to('/auth/twitter', :class => "btn icon btn-lg btn-social-icon btn-twitter") do %> <% end %> diff --git a/app/views/shared/_center_panel.html.erb b/app/views/shared/_center_panel.html.erb index 99b1f194..96461c4b 100644 --- a/app/views/shared/_center_panel.html.erb +++ b/app/views/shared/_center_panel.html.erb @@ -1,6 +1,6 @@
-
+

diff --git a/app/views/shared/_join_form.html.erb b/app/views/shared/_join_form.html.erb index 2731d1e5..d828bd58 100644 --- a/app/views/shared/_join_form.html.erb +++ b/app/views/shared/_join_form.html.erb @@ -1,36 +1,40 @@ -
- <% 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 %> -
- +
+
+ +
+ <% else %> + + <% end %> + <% elsif current_user %> + -
-
- -
- <% else %> - - <% end %> - <% elsif current_user %> - - <% else %> - - - - <% end %> + <% else %> + + + + <% end %> +

+