Skip to content

Commit 4684eac

Browse files
authored
[DT-262] Fix button colors are not consistent (#254)
* [DT-262] Fix button colors are not consistent - [x] Align back button to the left (I think it's more user friendly) - [x] [Tried to follow Ariel's convention colors](#99 (comment)) [DT-262](https://ombulabs.atlassian.net/browse/DT-262) * Fix merge conflict
1 parent 5465ec0 commit 4684eac

15 files changed

Lines changed: 32 additions & 29 deletions

File tree

app/assets/stylesheets/4-molecules/_floors.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
justify-content: center;
1414
width: 100%;
1515
overflow: hidden;
16-
background-color: #D9F1F1;
1716
height: calc(100vh - 160px);
1817
margin: -100px 0;
1918
}
20-
}
19+
}

app/views/devise/sessions/new.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<%- if devise_mapping.omniauthable? %>
99
<%- resource_class.omniauth_providers.each do |provider| %>
10-
<%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider), class: "button", id:"back", method: :post %><br />
10+
<%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider), class: "button green", id:"back", method: :post %><br />
1111
<% end -%>
1212
<% end -%>
1313
</div>

app/views/estimates/_form.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</div>
2727

2828
<div class="btn-group">
29-
<%= f.submit t(".button_text"), value: t(".button_text"), class: "button", id: "edit" %>
29+
<%= f.submit t(".button_text"), value: t(".button_text"), class: "button green", id: "edit" %>
3030
</div>
3131

3232
<% if estimate.persisted? %>

app/views/home/index.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<div class="fluid-container center floor signin">
22
<h1>Welcome to the Points App</h1>
3-
<%= link_to "Sign in", new_user_session_path, class: "button", id: "edit" %>
3+
<%= link_to "Sign in", new_user_session_path, class: "button green", id: "edit" %>
44
</div>

app/views/layouts/_header.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<% if current_user %>
1111
<%= link_to "Sign out", destroy_user_session_path, method: :delete, class: "button magenta" %>
1212
<% else %>
13-
<%= link_to "Sign in", new_user_session_path, class: "button" %>
13+
<%= link_to "Sign in", new_user_session_path, class: "button green" %>
1414
<% end %>
1515
</ul>
1616
</nav>

app/views/projects/_form.html.erb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
<div class="field">
1515
<%= f.label :title %>
1616
<%= f.text_field :title, placeholder: "Project Title", class: "project-story-title", autofocus: true %>
17-
</div><div class="btn-group">
18-
<%= f.submit yield(:button_text), class: "button", id: "edit" %>
17+
</div>
18+
19+
<div class="btn-group">
20+
<%= f.submit yield(:button_text), class: "button green", id: "edit" %>
1921
</div>
2022
<% end %>

app/views/projects/_import_export.html.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<%= form_with(url: import_project_stories_path(@project), method: :patch, remote: false) do |f| %>
2222
<%= f.file_field :file %>
2323
<div class="btn-group">
24-
<%= f.submit 'Import', class: 'button magenta' %>
24+
<%= f.submit 'Import', class: 'button green' %>
2525
</div>
2626
<% end %>
2727
</div>
@@ -31,7 +31,7 @@
3131
<h4 class="my-0 font-weight-normal">Export CSV</h4>
3232
</div>
3333
<div class="card-body">
34-
<%= link_to 'Export', export_project_stories_path(@project), class:"button magenta" %>
34+
<%= link_to 'Export', export_project_stories_path(@project), class: "button green" %>
3535
</div>
3636
</div>
3737
</div>

app/views/projects/_sub_project_form.html.erb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
<%= f.label :title %>
1616
<%= f.text_field :title, placeholder: "Subproject Title", class: "project-story-title", autofocus: true %>
1717
<%= f.hidden_field :parent_id, value: parent.id %>
18-
</div><div class="btn-group">
19-
<%= f.submit yield(:button_text), class: "button", id: "edit" %>
18+
</div>
19+
20+
<div class="btn-group">
21+
<%= f.submit yield(:button_text), class: "button green", id: "edit" %>
2022
</div>
2123
<% end %>

app/views/projects/index.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<% end %>
2828

2929
<div class="btn-group">
30-
<%= link_to "Add a Project", new_project_path, class: "button", id: "create-button" %>
30+
<%= link_to "Add a Project", new_project_path, class: "button green", id: "create-button" %>
3131
<% if params[:archived] == "true" %>
3232
<%= link_to "Hide Archived Projects", projects_path, class: "button" %>
3333
<% else %>

app/views/projects/new_clone.html.erb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
<% end %>
3030

3131
<div class="actions">
32-
<%= button_tag "Clone", class: "button", type: "submit" %>
33-
<%= link_to 'Back', project_path(@original.id), id:"back", class: "button" %>
32+
<%= button_tag "Clone", class: "button green", type: "submit" %>
33+
<%= link_to 'Back', project_path(@original.id), id: "back", class: "button" %>
3434
</div>
3535
<% end %>
36-
</div>
36+
</div>

0 commit comments

Comments
 (0)