Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Several project view adjustments in CSS #17

Merged
merged 26 commits into from
Aug 29, 2016
Merged

Several project view adjustments in CSS #17

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
06cf548
Several project view adjustments in CSS, adding font-awesome to use t…
akitaonrails Aug 26, 2016
e7876a5
Fixing failing specs (specially feature specs for removing the projec…
akitaonrails Aug 26, 2016
c7baa1f
move icon styles into proper file
adbatista Aug 26, 2016
4f3ccf3
small refactor in screen.scss
adbatista Aug 26, 2016
cd6556d
add autoprefixer
adbatista Aug 26, 2016
6d7df35
user pointer cursor in estimatives
adbatista Aug 26, 2016
9c54ddb
Small CSS Adjustments to save more space between the columns in the p…
akitaonrails Aug 27, 2016
000fa9b
Adding a simple collapsible sidebar
akitaonrails Aug 27, 2016
21e3a5a
Repurposing the simple sidebar to not be the kind that is hidden in t…
akitaonrails Aug 27, 2016
bedd725
FIXME for some reason it seems like Backbone.sync actions such as add…
akitaonrails Aug 27, 2016
4e4ee22
Adjusting forms to be inside a grid and have proper margins
akitaonrails Aug 27, 2016
b86aa0a
Fixing most of Devise’s templates to fit mobile screens properly
akitaonrails Aug 27, 2016
0c0dac5
Use material icons for all task types
rscardinho Aug 28, 2016
da34ec5
Fixing failing specs. Removing the unnecessary ‘.story’ class from th…
akitaonrails Aug 28, 2016
07e2bf6
Adjusting the add icon to the ‘add story’ button
akitaonrails Aug 28, 2016
ba1271b
Rewriting the initial column view toggle to reflect on the link states
akitaonrails Aug 28, 2016
9d81939
Use image sprite on estimating points
rscardinho Aug 28, 2016
63c4051
Fix story type icon position on popover
rscardinho Aug 29, 2016
36283b5
Link the ColumnViews to the ProjectView
akitaonrails Aug 29, 2016
cabd9a0
Moving the story link to the top of the story card
akitaonrails Aug 29, 2016
b9493af
Estimates can’t be zero
akitaonrails Aug 29, 2016
e4c7e3c
sorting the requested by and owned by columns in the story form
akitaonrails Aug 29, 2016
416e7c4
Adding icons to the column toggles in the menu
akitaonrails Aug 29, 2016
a420bc5
Adjusting the inputs to be smaller in the story view
akitaonrails Aug 29, 2016
18d5fd6
Adding more explanations to the velocity override simulation box
akitaonrails Aug 29, 2016
1c5422b
Removing unnecessary devise links CSS class
akitaonrails Aug 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions app/assets/stylesheets/screen.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,9 +611,6 @@ div#keycut-help {
.edit-project,
.add-user,
.edit-user,
.sign-in {
width: 550px;
}

.members-list {
.member-name {
Expand All @@ -626,6 +623,11 @@ div#keycut-help {
.sign-in .checkbox {
margin-left: 50px;
}
.devise_links {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should use devise-links here instead of devise_links to follow the standard of the other class names.

a {
display: block;
}
}

.date-select-wrapper select {
display: inline-block;
Expand Down
30 changes: 19 additions & 11 deletions app/views/devise/confirmations/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
<% content_for :title_bar do %>
<h1>Resend confirmation instructions</h1>
<% end %>
<div class="form-wrapper">
<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
<%= devise_error_messages! %>
<div class="row">
<div class="col-sm-12 col-md-6">
<div class="form-wrapper">
<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
<%= devise_error_messages! %>

<div class="field-wrapper">
<%= f.label :email %>
<div class="field"><%= f.email_field :email %></div>
</div>

<div class="actions"><%= f.submit "Resend confirmation instructions" %></div>
<% end %>
<div class="field-wrapper">
<%= f.label :email %>
<div class="field"><%= f.email_field :email %></div>
</div>

<%= render :partial => "devise/shared/links" %>
<div class=""><%= f.submit "Resend confirmation instructions" %></div>
<% end %>
</div>
</div>
<div class="col-sm-12 col-md-6">
<div class="devise_links">
<%= render :partial => "devise/shared/links" %>
</div>
</div>
</div>

39 changes: 23 additions & 16 deletions app/views/devise/passwords/edit.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,30 @@
<% content_for :title_bar do %>
<h1>Change your password</h1>
<% end %>
<div class="form-wrapper">
<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
<%= devise_error_messages! %>
<%= f.hidden_field :reset_password_token %>
<div class="row">
<div class="col-sm-12 col-md-6">
<div class="form-wrapper">
<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
<%= devise_error_messages! %>
<%= f.hidden_field :reset_password_token %>

<div class="field-wrapper">
<%= f.label :password, "New password" %>
<div class="field"><%= f.password_field :password %></div>
</div>

<div class="field-wrapper">
<%= f.label :password_confirmation, "Confirm new password" %>
<div class="field"><%= f.password_field :password_confirmation %></div>
</div>
<div class="field-wrapper">
<%= f.label :password, "New password" %>
<div class="field"><%= f.password_field :password %></div>
</div>

<div class="actions"><%= f.submit "Change my password" %></div>
<% end %>
<div class="field-wrapper">
<%= f.label :password_confirmation, "Confirm new password" %>
<div class="field"><%= f.password_field :password_confirmation %></div>
</div>

<%= render :partial => "devise/shared/links" %>
<div class="actions"><%= f.submit "Change my password" %></div>
<% end %>
</div>
</div>
<div class="col-sm-12 col-md-6">
<div class="devise_links">
<%= render :partial => "devise/shared/links" %>
</div>
</div>
</div>
29 changes: 18 additions & 11 deletions app/views/devise/passwords/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@
<% content_for :title_bar do %>
<h1>Forgot your password?</h1>
<% end %>
<div class="form-wrapper">
<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
<%= devise_error_messages! %>
<div class="row">
<div class="col-sm-12 col-md-6">
<div class="form-wrapper">
<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
<%= devise_error_messages! %>

<div class="field-wrapper">
<%= f.label :email %>
<div class="field"><%= f.email_field :email %></div>
</div>

<div class="actions"><%= f.submit "Send me reset password instructions" %></div>
<% end %>
<div class="field-wrapper">
<%= f.label :email %>
<div class="field"><%= f.email_field :email %></div>
</div>

<%= render :partial => "devise/shared/links" %>
<div class=""><%= f.submit "Send me reset password instructions" %></div>
<% end %>
</div>
</div>
<div class="col-sm-12 col-md-6">
<div class="devise_links">
<%= render :partial => "devise/shared/links" %>
</div>
</div>
</div>
42 changes: 25 additions & 17 deletions app/views/devise/sessions/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,34 @@
<% content_for :title_bar do %>
<h1>Sign in</h1>
<% end %>
<div class="form-wrapper sign-in">
<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
<div class="field-wrapper">
<%= f.label :email, class: 'col-sm-2 control-label' %>
<div class="col-sm-10"><%= f.email_field :email %></div>
</div>
<div class="row">
<div class="col-sm-12 col-md-6">
<div class="form-wrapper sign-in">
<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
<div class="field-wrapper">
<%= f.label :email, class: 'col-sm-4 control-label' %>
<div class="col-sm-8"><%= f.email_field :email %></div>
</div>

<div class="field-wrapper">
<%= f.label :password, class: 'col-sm-2 control-label' %>
<div class="col-sm-10"><%= f.password_field :password %></div>
</div>
<div class="field-wrapper">
<%= f.label :password, class: 'col-sm-4 control-label' %>
<div class="col-sm-8"><%= f.password_field :password %></div>
</div>


<% if devise_mapping.rememberable? -%>
<div class="checkbox"><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
<% end -%>
<% if devise_mapping.rememberable? -%>
<div class="checkbox"><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
<% end -%>

<div class="actions clearfix">
<%= f.submit "Sign in", class: 'btn btn-primary pull-right' %>
<div class="actions clearfix">
<%= f.submit "Sign in", class: 'btn btn-primary pull-right' %>
</div>
<% end %>
</div>
</div>
<div class="col-sm-12 col-md-6">
<div class="devise_links">
<%= render :partial => "devise/shared/links" %>
</div>
</div>
<% end %>
<%= render :partial => "devise/shared/links" %>
</div>
52 changes: 27 additions & 25 deletions app/views/registrations/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,35 +7,37 @@
<div class="row">
<div class="col-xs-12 col-sm-6">
<div class="form-wrapper add-user">
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
<%= devise_error_messages! %>
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
<%= devise_error_messages! %>

<div class="field-wrapper">
<%= f.label :name, class: 'col-sm-2 control-label' %>
<div class="col-sm-10"><%= f.text_field :name %></div>
</div>
<div class="field-wrapper">
<%= f.label :name, class: 'col-sm-4 control-label' %>
<div class="col-sm-8"><%= f.text_field :name %></div>
</div>

<div class="field-wrapper">
<%= f.label :initials, class: 'col-sm-2 control-label' %>
<div class="col-sm-10"><%= f.text_field :initials %></div>
</div>
<div class="field-wrapper">
<%= f.label :username, class: 'col-sm-2 control-label' %>
<div class="col-sm-10"><%= f.text_field :username %></div>
</div>
<div class="field-wrapper">
<%= f.label :initials, class: 'col-sm-4 control-label' %>
<div class="col-sm-8"><%= f.text_field :initials %></div>
</div>
<div class="field-wrapper">
<%= f.label :username, class: 'col-sm-4 control-label' %>
<div class="col-sm-8"><%= f.text_field :username %></div>
</div>

<div class="field-wrapper">
<%= f.label :email, class: 'col-sm-2 control-label' %>
<div class="col-sm-10"><%= f.email_field :email %></div>
</div>
<div class="field-wrapper">
<%= f.label :email, class: 'col-sm-4 control-label' %>
<div class="col-sm-8"><%= f.email_field :email %></div>
</div>

<div class="actions clearfix">
<%= f.submit t('sign up'), class: 'btn btn-primary pull-right' %>
</div>
<% end %>

<%= render :partial => "devise/shared/links" %>
<div class="actions clearfix">
<%= f.submit t('sign up'), class: 'btn btn-primary pull-right' %>
</div>
<% end %>
</div>
</div>
<div class="col-sm-12 col-md-6">
<div class="devise_links">
<%= render :partial => "devise/shared/links" %>
</div>
</div>
</div>