diff --git a/.travis.yml b/.travis.yml index cb4ffd0ac..a1a1e81c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,10 +22,12 @@ env: global: - KNAPSACK_PRO_FIXED_QUEUE_SPLIT=true - KNAPSACK_PRO_LOG_LEVEL=info - - KNAPSACK_PRO_CI_NODE_TOTAL=2 + - KNAPSACK_PRO_CI_NODE_TOTAL=4 matrix: - KNAPSACK_PRO_CI_NODE_INDEX=0 - KNAPSACK_PRO_CI_NODE_INDEX=1 + - KNAPSACK_PRO_CI_NODE_INDEX=2 + - KNAPSACK_PRO_CI_NODE_INDEX=3 notifications: slack: secure: 18E9SU0SR/9knRvCMYwVqFCqVTBT6qJtZQ/gadpheqUPPlcLoQfnlIzJkLIYqkE0sn1nkBE5Bt2I90FU53p0NkrTEmSGlQXcN1vEXM8EXMaoVf3NBsIJeleMwt9VTojzo81EgIi6x7q3fDiFORJ4rqOGd9XkeLn5yrAtIkdaenVs0bhS5s24FP76hKqO37IFLG2v3EEqxg5k31oW6yhyP35Mxns+AGbfaZbxEy4XbCoU65KFuYhBsVZ/y1evOl/wcre2fCAoT2uKeqUWGEcDzH7oSCz7vfk7iO9BZnO++v7oj8mr/nrZL1KMFt77eqtdT51XQoJcchgJC/R9km5hRGkQqFCHhqPcBxo5c3p+jauL0kLaqTggeLDv2FQ2huJ8FSJ4ADac+n3g7wT7BX7HJlCvK0nbooY1JtBlk7+6/pw6ksSFIOo0FHg5gXN9IlG1tQQuENzzsXULNc6s4nPeT+n78uOp1b0N/Gn06moEBaKgXqqx1yV1XeJ02X8n3uDZxPuX3n2bJ4DMIrBjeWApxHAgyOraOzQHNQgJoj4tHlWutF33ApV2tcIMefIzvjM4tIYwIkpfGgohGaTf8eU5X9pqiMgwlDpJHVBsSvpk/Z/Nj7evYznjBiDYqOcXoztsqHrS0C91MaT+eExDfd9HDmThsE07RT7zcP9aElFZA/k= diff --git a/app/assets/stylesheets/poll.scss b/app/assets/stylesheets/poll.scss index 64f853d8e..6cf45c586 100644 --- a/app/assets/stylesheets/poll.scss +++ b/app/assets/stylesheets/poll.scss @@ -1,14 +1,12 @@ .poll-card { + .card { background-color: #e7f3fd; } .clipboard-btn { - border-radius: 12pt; - padding: 0; - width: 24pt; - height: 24pt; - padding-top: 5pt; - padding-left: 1pt; + border-radius: rem-calc(12); + padding: rem-calc(5) rem-calc(10) rem-calc(10) rem-calc(10); + height: rem-calc(24); } } diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb index 3de223f8e..ec6c7f778 100644 --- a/app/helpers/admin_helper.rb +++ b/app/helpers/admin_helper.rb @@ -45,7 +45,7 @@ module AdminHelper end def menu_proposals_dashboard? - ["proposal_dashboard_actions", "administrator_tasks"].include?(controller_name) + ["actions", "administrator_tasks"].include?(controller_name) end def official_level_options diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb index f21d63735..473bce948 100644 --- a/app/views/admin/_menu.html.erb +++ b/app/views/admin/_menu.html.erb @@ -57,7 +57,7 @@ <% if feature?(:budgets) %>
  • "> + controller_name == "budget_investment_statuses" %>"> <%= link_to admin_budgets_path do %> <%= t("admin.menu.budgets") %> @@ -240,7 +240,7 @@ <%= t("admin.menu.proposals_dashboard") %>