diff --git a/app/assets/stylesheets/shared.scss b/app/assets/stylesheets/shared.scss index 73718437..378788d6 100644 --- a/app/assets/stylesheets/shared.scss +++ b/app/assets/stylesheets/shared.scss @@ -9,6 +9,10 @@ html, body { height: 100%; } +.app-background { + background: linear-gradient(0, white 65%, #4DC0A2 35%); +} + .header { padding: 20px 40px; @@ -31,6 +35,9 @@ html, body { .center-block { float: none; } + .center-panel-size { + width: 650px; + } .input-spacing { margin-top: 15px; diff --git a/app/views/landing/meetings.html.erb b/app/views/landing/meetings.html.erb index c6bb97e6..49812b87 100644 --- a/app/views/landing/meetings.html.erb +++ b/app/views/landing/meetings.html.erb @@ -20,7 +20,7 @@
- <%= render 'shared/title', title: 'Start A New Session' %> + <%= render 'shared/title', title: 'Start A New Session' %> <%= render layout: 'shared/center_panel' do %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 7d921a3c..6b708afb 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,7 +9,7 @@ <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> - + diff --git a/app/views/shared/_center_panel.html.erb b/app/views/shared/_center_panel.html.erb index b2cf8d3f..cde84a49 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/users/_form.html.erb b/app/views/users/_form.html.erb deleted file mode 100644 index 2b2cd828..00000000 --- a/app/views/users/_form.html.erb +++ /dev/null @@ -1,18 +0,0 @@ -
-
-

Enter Username below

- - <%= form_for(user, html: {class: "form-inline"}) do |f| %> -
- <%= f.text_field :username, placeholder: "Username", class: "form-control input" %> -
- <%= f.submit class: "btn btn-success", value: "Save" %> - <% end %> -
-

<%= error %>

-
-
-

This username will be used to identify your personal room

-
-
-
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index 948afb7e..788898cd 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -1,3 +1,29 @@ -
- <%= render 'form', user: @user, error: @error %> +<% content_for :title do %> +
+ Enter your Username below +
+<% end %> + +
+
+ + <%= render 'shared/title', title: 'Complete User Profile' %> + + <%= render layout: 'shared/center_panel' do %> +
+ <%= form_for(@user) do |f| %> +
+ <%= f.text_field :username, placeholder: "Username", class: "form-control input" %> + + <%= f.submit class: "btn btn-success", value: "Save" %> + +
+ <% end %> +
+

<%= @error %>

+
+ <% end %> +
+ +