diff --git a/app/assets/stylesheets/print.css b/app/assets/stylesheets/print.css index 29096ae13..de5a56a31 100644 --- a/app/assets/stylesheets/print.css +++ b/app/assets/stylesheets/print.css @@ -12,6 +12,8 @@ #print_link { display: none !important; } +#responsive-menu { display: none !important; } + .admin-sidebar { display: none !important; } img.left { display: none !important; } diff --git a/app/views/admin/shared/_proposal_search.html.erb b/app/views/admin/shared/_proposal_search.html.erb index 8fae3b543..895b6ea55 100644 --- a/app/views/admin/shared/_proposal_search.html.erb +++ b/app/views/admin/shared/_proposal_search.html.erb @@ -4,7 +4,7 @@ <%= text_field_tag :search, "", placeholder: t("admin.shared.proposal_search.placeholder") %>
- <%= f.submit t("admin.shared.proposal_search.button"), class: "button success" %> + <%= f.submit t("admin.shared.proposal_search.button"), class: "button" %>
<% end %> \ No newline at end of file diff --git a/app/views/admin/shared/_spending_proposal_search.html.erb b/app/views/admin/shared/_spending_proposal_search.html.erb index c3e276ebe..cfb7e45f9 100644 --- a/app/views/admin/shared/_spending_proposal_search.html.erb +++ b/app/views/admin/shared/_spending_proposal_search.html.erb @@ -4,7 +4,7 @@ <%= text_field_tag :search, "", placeholder: t("admin.shared.spending_proposal_search.placeholder") %>
- <%= f.submit t("admin.shared.spending_proposal_search.button"), class: "button success expanded" %> + <%= f.submit t("admin.shared.spending_proposal_search.button"), class: "button" %>
<% end %> \ No newline at end of file diff --git a/app/views/layouts/management.html.erb b/app/views/layouts/management.html.erb index 735175155..ff7531295 100644 --- a/app/views/layouts/management.html.erb +++ b/app/views/layouts/management.html.erb @@ -16,13 +16,7 @@
-
-
- <%= render 'shared/locale_switcher' %> -
-
- -
+
<%= link_to Setting['org_name'], management_root_path, class: "logo show-for-small-only" %> @@ -45,21 +39,18 @@
-
-
-
- <%= render "/management/menu" %> -
+
+
+ <%= render "/management/menu" %> +
- <%= render "management/account_info" %> + <%= render "management/account_info" %> -
+
+ <%= render 'layouts/flash' %> + <%= yield %> +
+
- <%= render 'layouts/flash' %> - - <%= yield %> -
- - diff --git a/app/views/management/_account_info.html.erb b/app/views/management/_account_info.html.erb index 20a6bc24d..30af66cb6 100644 --- a/app/views/management/_account_info.html.erb +++ b/app/views/management/_account_info.html.erb @@ -1,5 +1,5 @@ <% if managed_user.document_number.present? %> -
+
- <%= f.submit t("management.check") %> + <%= f.submit t("management.check"), class: "button" %> <% end %> diff --git a/app/views/management/email_verifications/new.html.erb b/app/views/management/email_verifications/new.html.erb index ca13a3c43..6bbbdc3a5 100644 --- a/app/views/management/email_verifications/new.html.erb +++ b/app/views/management/email_verifications/new.html.erb @@ -15,7 +15,7 @@ <%= f.hidden_field :document_number %> <%= f.text_field :email, label: false, placeholder: t('management.email_verifications.email_placeholder') %> - <%= f.submit t("management.email_verifications.send_email"), class: "button success" %> + <%= f.submit t("management.email_verifications.send_email"), class: "button hollow" %> <% end %> @@ -23,7 +23,7 @@ <%= t("management.email_verifications.if_no_existing_account") %>

- <%= link_to t('management.users.create_user'), new_management_user_path(user: params[:email_verification]), class: "button warning" %> + <%= link_to t('management.users.create_user'), new_management_user_path(user: params[:email_verification]), class: "button success" %>

diff --git a/app/views/management/proposals/new.html.erb b/app/views/management/proposals/new.html.erb index 680552b9a..e3e2087e9 100644 --- a/app/views/management/proposals/new.html.erb +++ b/app/views/management/proposals/new.html.erb @@ -1,8 +1,10 @@ -
+
- <%= render '/shared/print' %> +
+ <%= render '/shared/print' %> +
-
+

<%= t("management.proposals.create_proposal") %>

<%= render "proposals/form", form_url: management_proposals_url %>
diff --git a/app/views/management/spending_proposals/new.html.erb b/app/views/management/spending_proposals/new.html.erb index c04c81b03..e036a04cb 100644 --- a/app/views/management/spending_proposals/new.html.erb +++ b/app/views/management/spending_proposals/new.html.erb @@ -1,8 +1,10 @@ -
+
- <%= render '/shared/print' %> +
+ <%= render '/shared/print' %> +
-
+

<%= t("management.spending_proposals.create") %>

<%= render "spending_proposals/form", form_url: management_spending_proposals_url %>
diff --git a/app/views/management/users/_erase_user_account.html.erb b/app/views/management/users/_erase_user_account.html.erb index af2e3b75b..8d5a545a3 100644 --- a/app/views/management/users/_erase_user_account.html.erb +++ b/app/views/management/users/_erase_user_account.html.erb @@ -1,9 +1,9 @@ -<%= link_to t("management.users.erase_account_link"), "#", class: "delete js-toggle-link", data: { "toggle-selector" => "#erase-account-form" } %> +<%= link_to t("management.users.erase_account_link"), "#", class: "button hollow alert js-toggle-link", data: { "toggle-selector" => "#erase-account-form" } %> \ No newline at end of file diff --git a/app/views/management/users/new.html.erb b/app/views/management/users/new.html.erb index 4283a9760..6602e4978 100644 --- a/app/views/management/users/new.html.erb +++ b/app/views/management/users/new.html.erb @@ -5,7 +5,7 @@ permissions: [:debates, :create_proposals, :support_proposals, :vote_proposals] %>
-
+
<%= form_for @user, url: management_users_path do |f| %> <%= f.hidden_field :document_type %> <%= f.hidden_field :document_number %>