Skip to content

Commit 1dd9438

Browse files
ahukkanenahukkanen
committed
[TAC022] Unify button and link styling across application
1 parent a54ed1f commit 1dd9438

58 files changed

Lines changed: 175 additions & 84 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎decidim-accountability/app/cells/decidim/accountability/highlighted_results_for_component/show.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
<%= link_to(
1717
t("decidim.participatory_spaces.highlighted_results.see_all", count: results_count),
1818
main_component_path(model),
19-
class: "button button--sc light secondary button--right"
19+
class: "button button--sc hollow button--right"
2020
) %>
2121
</section>

‎decidim-accountability/app/views/decidim/accountability/results/_search.html.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="input-group">
44
<%= search_field_tag "filter[search_text]", nil, class: "input-group-field", placeholder: t(".search"), value: "", title: t(".search") %>
55
<div class="input-group-button">
6-
<button type="submit" class="button button--muted" aria-label="<%= t(".search") %>">
6+
<button type="submit" class="button" aria-label="<%= t(".search") %>">
77
<%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
88
</button>
99
</div>

‎decidim-accountability/app/views/decidim/accountability/results/_stats_box.html.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<span class="definition-data__title"><%= t("results.show.stats.version_number", scope: "decidim.accountability") %></span>
2424
<%= result.versions.count %>
2525
<div class="pr-s pl-s">
26-
<%= link_to t("results.show.stats.show_all_versions", scope: "decidim.accountability"), result_versions_path(result), class: "button button--sc hollow secondary small expanded" %>
26+
<%= link_to t("results.show.stats.show_all_versions", scope: "decidim.accountability"), result_versions_path(result), class: "button button--sc hollow small expanded" %>
2727
</div>
2828
</div>
2929
<% if result.last_editor.present? %>

‎decidim-accountability/app/views/decidim/accountability/versions/index.html.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<div class="definition-data__item versions_count">
2222
<span class="definition-data__title"><%= t("results.show.stats.number_of_versions", scope: "decidim.accountability") %></span>
2323
<%= result.versions.count %>
24-
<%= link_to t("results.show.stats.back_to_result", scope: "decidim.accountability"), result_path(result), class: "button button--sc hollow secondary small expanded" %>
24+
<%= link_to t("results.show.stats.back_to_result", scope: "decidim.accountability"), result_path(result), class: "button button--sc hollow small expanded" %>
2525
</div>
2626
</div>
2727
</div>

‎decidim-accountability/app/views/decidim/accountability/versions/show.html.erb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<div class="definition-data__item versions_count">
1919
<span class="definition-data__title"><%= t("results.show.stats.version_number", scope: "decidim.accountability") %></span>
2020
<%= t("results.show.stats.version_number_out_of_total", scope: "decidim.accountability", current_version: params[:id], total_count: result.versions_count) %>
21-
<%= link_to t("results.show.stats.show_all_versions", scope: "decidim.accountability"), result_versions_path(result), class: "button button--sc hollow secondary small expanded" %>
22-
<%= link_to t("results.show.stats.back_to_result", scope: "decidim.accountability"), result_path(result), class: "button button--sc hollow secondary small expanded" %>
21+
<%= link_to t("results.show.stats.show_all_versions", scope: "decidim.accountability"), result_versions_path(result), class: "button button--sc hollow small expanded" %>
22+
<%= link_to t("results.show.stats.back_to_result", scope: "decidim.accountability"), result_path(result), class: "button button--sc hollow small expanded" %>
2323
</div>
2424
<% if current_version.whodunnit.present? %>
2525
<div class="definition-data__item last_revision_by">

‎decidim-admin/app/views/decidim/admin/impersonatable_users/index.html.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<%= search_field_tag :q, @query,label: false, class: "input-group-field", placeholder: t(".search") %>
3434
<%= hidden_field_tag :state, @state %>
3535
<div class="input-group-button">
36-
<button type="submit" class="button button--muted">
36+
<button type="submit" class="button">
3737
<%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
3838
</button>
3939
</div>

‎decidim-admin/app/views/decidim/admin/shared/_filters.html.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
scope: "decidim.admin.filters.search_placeholder")
2323
) %>
2424
<div class="input-group-button">
25-
<button type="submit" class="button button--muted">
25+
<button type="submit" class="button">
2626
<%= icon "magnifying-glass", aria_label: t("search_label", scope: "decidim.admin.filters") %>
2727
</button>
2828
</div>

‎decidim-admin/app/views/decidim/admin/user_groups/index.html.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<%= search_field_tag :q, @query,label: false, class: "input-group-field", placeholder: t(".search") %>
2727
<%= hidden_field_tag :state, @state %>
2828
<div class="input-group-button">
29-
<button type="submit" class="button button--muted">
29+
<button type="submit" class="button">
3030
<%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
3131
</button>
3232
</div>

‎decidim-assemblies/app/cells/decidim/assemblies/assembly_m/footer.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<%= link_to(
1010
t(model.cta_button_text_key, scope: "layouts.decidim.assemblies.assembly"),
1111
resource_path,
12-
class: "card__button button button--sc secondary light small"
12+
class: "card__button button button--sc small"
1313
) %>
1414
</div>
1515
</div>

‎decidim-assemblies/app/views/decidim/assemblies/admin/assembly_members/index.html.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<%= search_field_tag :q, @query,label: false, class: "input-group-field", placeholder: t(".search") %>
3636
<%= hidden_field_tag :status, @status %>
3737
<div class="input-group-button">
38-
<button type="submit" class="button button--muted">
38+
<button type="submit" class="button">
3939
<%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
4040
</button>
4141
</div>

0 commit comments

Comments
 (0)