Skip to content

Commit

Permalink
cards and processes
Browse files Browse the repository at this point in the history
  • Loading branch information
jorgeatgu committed Jun 27, 2023
1 parent 7a1d03e commit 79a9914
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,5 @@ body{
}

.container{
@apply p-8 ml-0;
@apply p-8 m-0;
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
}

.menu-trigger{
@apply inline-block p-2 w-10 text-center;
@apply inline-block md:hidden p-2 w-10 text-center;
}

.logo{
Expand All @@ -15,7 +15,7 @@
}

.tool-bar{
@apply ml-auto;
@apply ml-auto gap-x-6 flex;

.user-login,
.language-choose{
Expand All @@ -27,6 +27,6 @@
}

.dropdown__trigger{
@apply flex;
@apply flex underline p-0;
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
$card-padding-small: 1rem;
/*
.card-title{
@include smallemphasis;
Expand Down Expand Up @@ -124,3 +125,4 @@ $card-padding-small: 1rem;
.card.with-overflow{
overflow: visible;
}
*/
10 changes: 4 additions & 6 deletions decidim-admin/app/views/decidim/admin/dashboard/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,21 @@
</h2>

<div class="content">
<p><%= t ".welcome" %></p>

<% unless current_user.admin_terms_accepted? %>
<%= cell("decidim/announcement", announcement_body, callout_class: current_user.admin_terms_accepted? ? "success" : "warning" ) %>
<% end %>
<% if count_pending_moderations.positive? && allowed_to?(:read, :global_moderation) %>
<div class="grid-x grid-margin-x">
<div class="cell small-12 medium-6 large-4">
<div class="cell small-12 medium-12 large-12">
<%= render "pending_moderations" %>
</div>
</div>
<% end %>

<div class="grid-x grid-margin-x">
<% if allowed_to? :read, :users_statistics %>
<div class="cell small-12 medium-6 large-4">
<div class="cell small-12 medium-12 large-12">
<%= render(
partial: "decidim/admin/users_statistics/users_count",
locals: {
Expand All @@ -34,7 +32,7 @@

<div class="grid-x grid-margin-x">
<% if allowed_to? :read, :metrics %>
<div class="cell small-6">
<div class="cell small-12">
<%= render(
partial: "decidim/admin/metrics/metrics",
locals: {
Expand All @@ -46,7 +44,7 @@
<% end %>
<% if allowed_to? :read, :admin_log %>
<div class="cell small-6">
<div class="cell small-12">
<%= render partial: "decidim/admin/logs/logs_list", locals: { logs: latest_action_logs, display_filters: false } %>
<% if latest_action_logs.any? %>
<div class="text-center"><%= link_to t(".view_more_logs"), logs_path %></div>
Expand Down

0 comments on commit 79a9914

Please sign in to comment.