diff --git a/app/assets/stylesheets/application.tailwind.css b/app/assets/stylesheets/application.tailwind.css index 7cdbcd5..7a9da2e 100644 --- a/app/assets/stylesheets/application.tailwind.css +++ b/app/assets/stylesheets/application.tailwind.css @@ -7,3 +7,4 @@ @import "components/forms"; @import "components/links"; @import "components/notifications"; +@import "components/tables"; diff --git a/app/assets/stylesheets/components/tables.css b/app/assets/stylesheets/components/tables.css new file mode 100644 index 0000000..9b5e1fc --- /dev/null +++ b/app/assets/stylesheets/components/tables.css @@ -0,0 +1,22 @@ +@layer components { + table { + @apply w-full; + } + + table thead tr { + @apply text-left; + } + + table th { + @apply pb-3.5 text-sm font-normal uppercase text-gray-500; + } + + table th:not(:last-of-type), + table td:not(:last-of-type) { + @apply pr-2; + } + + table td { + @apply py-2; + } +} diff --git a/app/assets/stylesheets/legacy/_layout.scss b/app/assets/stylesheets/legacy/_layout.scss index 222b34e..c7284ba 100644 --- a/app/assets/stylesheets/legacy/_layout.scss +++ b/app/assets/stylesheets/legacy/_layout.scss @@ -24,49 +24,6 @@ body#admin { } } -#wrapper { - width: 100%; - text-align: center; - - > header { - margin: 0 auto; - padding: 4rem 0; - text-align: center; - background: linear-gradient(35deg, rgba(255,0,255,0.2) 0, rgba(13,79,153,0.8) 100%), - url('/img/bg-1.jpg'); - background-size: cover; - - @include media-max(small) { - padding: 3rem 0; - } - - h1 { - color: #fff; - - span.project-name { - display: none; - } - } - - p.current-user { - color: rgba(255,255,255,0.6); - - @include media-max(small) { - font-size: 0.85rem; - } - } - - a { - color: rgba(255,255,255,0.6); - transition: color 0.1s linear; - - &:hover, &:active { - color: #fff; - } - } - } -} - main { p { line-height: 1.5rem; @@ -84,23 +41,6 @@ main { line-height: 1.5rem; } } - - table { - width: 100%; - - th { - color: $text-color-discreet; - font-weight: normal; - text-transform: uppercase; - font-size: 0.85rem; - padding-bottom: 0.825rem; - } - - td { - padding-top: 0.5rem; - padding-bottom: 0.5rem; - } - } } .grid { diff --git a/app/views/admin/donations/index.html.erb b/app/views/admin/donations/index.html.erb index 2285a6a..baf51cb 100644 --- a/app/views/admin/donations/index.html.erb +++ b/app/views/admin/donations/index.html.erb @@ -2,14 +2,14 @@ <%= render MainSimpleComponent.new do %> <% if @donations.any? %> -
User | -Amount BTC | -in EUR | -in USD | -Public name | +Amount BTC | +in EUR | +in USD | +Public name | Date | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
<%= donation.user.address %> | -<%= sats_to_btc donation.amount_sats %> BTC | -<% if donation.amount_eur.present? %><%= number_to_currency donation.amount_eur / 100, unit: "" %><% end %> | -<% if donation.amount_usd.present? %><%= number_to_currency donation.amount_usd / 100, unit: "" %><% end %> | -<%= donation.public_name %> | +<%= sats_to_btc donation.amount_sats %> | +<% if donation.amount_eur.present? %><%= number_to_currency donation.amount_eur / 100, unit: "" %><% end %> | +<% if donation.amount_usd.present? %><%= number_to_currency donation.amount_usd / 100, unit: "" %><% end %> | +<%= donation.public_name %> | <%= donation.paid_at ? donation.paid_at.strftime("%Y-%m-%d") : "" %> | <%= link_to 'Show', admin_donation_path(donation), class: 'btn btn-sm btn-gray' %> | <%= link_to 'Edit', edit_admin_donation_path(donation), class: 'btn btn-sm btn-gray' %> | diff --git a/app/views/admin/invitations/index.html.erb b/app/views/admin/invitations/index.html.erb index e0cea28..584188e 100644 --- a/app/views/admin/invitations/index.html.erb +++ b/app/views/admin/invitations/index.html.erb @@ -14,7 +14,7 @@
Token | Accepted | Invited user | diff --git a/app/views/admin/ldap_users/index.html.erb b/app/views/admin/ldap_users/index.html.erb index fa69197..85637b0 100644 --- a/app/views/admin/ldap_users/index.html.erb +++ b/app/views/admin/ldap_users/index.html.erb @@ -13,7 +13,7 @@
---|
UID | Admin | diff --git a/app/views/invitations/index.html.erb b/app/views/invitations/index.html.erb index e91d9ca..a65f3ff 100644 --- a/app/views/invitations/index.html.erb +++ b/app/views/invitations/index.html.erb @@ -8,7 +8,7 @@
---|
URL |
---|
ID | Accepted | Invited user |
---|