diff --git a/app/components/flowbite/card/card.html.erb b/app/components/flowbite/card/card.html.erb index 82c1702..255ee5b 100644 --- a/app/components/flowbite/card/card.html.erb +++ b/app/components/flowbite/card/card.html.erb @@ -1,6 +1,7 @@ <%= content_tag(:div, card_options) do %> <%= title %> + <% if content.present? %> -
<%= content %>
+
<%= content %>
<% end %> <% end %> diff --git a/demo/app/assets/tailwind/application.css b/demo/app/assets/tailwind/application.css index 6bc8a9d..b292789 100644 --- a/demo/app/assets/tailwind/application.css +++ b/demo/app/assets/tailwind/application.css @@ -1,16 +1,17 @@ @import "tailwindcss"; -/* Load Flowbite */ -@plugin "flowbite/plugin"; - /* Load the default theme - or pick another, see https://flowbite.com/docs/customize/theming/ */ +@import url('https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700;800&display=swap'); @import "flowbite/src/themes/default"; +/* Load Flowbite */ +@plugin "flowbite/plugin"; + /* Include CSS classes used by the components in the final CSS */ @import "../builds/tailwind/flowbite_components"; -@custom-variant dark (&:where([data-theme=dark], [data-theme=dark] *)); +@custom-variant dark (&:where(.dark, .dark *)); footer a { - @apply font-medium text-blue-600 dark:text-blue-500 hover:underline; + @apply font-medium text-brand hover:underline; } diff --git a/demo/app/views/layouts/application.html.erb b/demo/app/views/layouts/application.html.erb index eb284a8..d90b7fe 100644 --- a/demo/app/views/layouts/application.html.erb +++ b/demo/app/views/layouts/application.html.erb @@ -1,17 +1,20 @@ + <%= content_for(:title) || "Flowbite Components for Rails" %> + + <%= csrf_meta_tags %> <%= csp_meta_tag %> <%= yield :head %> <%# Enable PWA manifest for installable apps (make sure to enable in config/routes.rb too!) %> - <%#= tag.link rel: "manifest", href: pwa_manifest_path(format: :json) %> + <%# = tag.link rel: "manifest", href: pwa_manifest_path(format: :json) %> @@ -21,38 +24,105 @@ <%= stylesheet_link_tag :app %> - +
-
-
- <%= yield %> -
+
<%= yield %>
-