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

Merge pull request #23 from zach-chai/ui_changes 

Ui changes
This commit is contained in:
Zachary Chai 2016-11-02 17:06:14 -04:00 committed by GitHub
parent 595ff619c8 4def9bbbb9
commit 9a6b75d15b
6 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/stylesheets/shared.scss
View File

@ -9,6 +9,10 @@ html, body {
height: 100%; height: 100%;
} }
.app-background {
background: linear-gradient(0, white 65%, #4DC0A2 35%);
}
.header { .header {
padding: 20px 40px; padding: 20px 40px;
@ -31,6 +35,9 @@ html, body {
.center-block { .center-block {
float: none; float: none;
} }
.center-panel-size {
width: 650px;
}
.input-spacing { .input-spacing {
margin-top: 15px; margin-top: 15px;

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

@ -20,7 +20,7 @@
<div class="page-wrapper meetings"> <div class="page-wrapper meetings">
<div class='container-fluid'> <div class='container-fluid'>
<%= render 'shared/title', title: 'Start A New Session' %> <%= render 'shared/title', title: 'Start A New Session' %>
<%= render layout: 'shared/center_panel' do %> <%= render layout: 'shared/center_panel' do %>
<div class="center-block col-sm-8"> <div class="center-block col-sm-8">

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

@ -9,7 +9,7 @@
<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
</head> </head>
<body data-controller="<%= params[:controller] %>" data-action="<%= params[:action] %>"> <body class="app-background" data-controller="<%= params[:controller] %>" data-action="<%= params[:action] %>">
<!-- Messages --> <!-- Messages -->
<div id='messages' class='hidden'> <div id='messages' class='hidden'>
</div> </div>

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

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

18
app/views/users/_form.html.erb
View File

@ -1,18 +0,0 @@
<div class="col-sm-4 col-sm-offset-4">
<div class="jumbotron">
<h4>Enter Username below</h4>
<%= form_for(user, html: {class: "form-inline"}) do |f| %>
<div class="form-group">
<%= f.text_field :username, placeholder: "Username", class: "form-control input" %>
</div>
<%= f.submit class: "btn btn-success", value: "Save" %>
<% end %>
<div class="error">
<p><%= error %></p>
</div>
<div class="description">
<p>This username will be used to identify your personal room</p>
</div>
</div>
</div>

30
app/views/users/edit.html.erb
View File

@ -1,3 +1,29 @@
<div class="page-wrapper user edit"> <% content_for :title do %>
<%= render 'form', user: @user, error: @error %> <div class="title">
Enter your Username below
</div>
<% end %>
<div class="page-wrapper user-edit">
<div class="container-fluid">
<%= render 'shared/title', title: 'Complete User Profile' %>
<%= render layout: 'shared/center_panel' do %>
<div class="center-block col-sm-8">
<%= form_for(@user) do |f| %>
<div class="input-group">
<%= f.text_field :username, placeholder: "Username", class: "form-control input" %>
<span class="input-group-btn">
<%= f.submit class: "btn btn-success", value: "Save" %>
</span>
</div>
<% end %>
<div class="error">
<p><%= @error %></p>
</div>
<% end %>
</div>
</div>
</div> </div>