Skip to content

Commit 959ccf5

Browse files
sorentwosorentwo
committed
Upgrade to tailwind v4 with fixed styles
1 parent e39a55e commit 959ccf5

File tree

10 files changed

+80
-62
lines changed

10 files changed

+80
-62
lines changed

‎assets/css/app.css‎

Lines changed: 17 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/tailwind.config.js‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎config/config.exs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@ if config_env() == :dev do
1313
]
1414

1515
config :tailwind,
16-
version: "3.3.0",
16+
version: "4.1.0",
1717
default: [
1818
args: ~w(
19-
--config=tailwind.config.js
2019
--minify
2120
--input=css/app.css
2221
--output=../priv/static/app.css

‎lib/oban/web/components/icons.ex‎

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,59 @@ defmodule Oban.Web.Components.Icons do
666666

667667
def soren_logo(assigns) do
668668
~H"""
669-
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" {@rest}><g fill="none" fill-rule="evenodd"><path d="m463.6 169.99-26.62-95.01-95-26.62 35.61 86z" fill="#e3f3fb"/><path d="M427.97 256 377.6 134.36l86 35.62z" fill="#99c5d4"/><path d="m437 74.96 26.61 95 28.87-11.95a256.25 256.25 0 0 0-55.47-83z" fill="#4e7eac"/><path d="M492.48 158.01a256.25 256.25 0 0 1 19.5 97.96l-48.37-86z" fill="#16495e"/><path d="m463.61 341.97 48.36-86-48.36-86-35.62 86z" fill="#ace6ea"/><path d="M377.6 377.6 428 255.97l35.62 86z" fill="#b6d6e8"/><path d="m512 255.97-48.36 86 28.86 11.96A256.25 256.25 0 0 0 511.97 256z" fill="#406484"/><path d="M492.5 353.93a256.25 256.25 0 0 1-55.48 83.05l26.62-95z" fill="#5b84a6"/><path d="m342.01 463.6 95.01-26.62 26.62-95-86 35.61z" fill="#9bc4e4"/><path d="m256 427.97 121.63-50.38-35.62 86z" fill="#506882"/><path d="m437.04 437-95 26.61 11.95 28.87a256.25 256.25 0 0 0 83-55.47z" fill="#3c6a91"/><path d="M353.99 492.48a256.25 256.25 0 0 1-97.96 19.5l86-48.37z" fill="#1d4268"/><path d="m170.03 463.61 86 48.36 86-48.36-86-35.62z" fill="#4d87b9"/><path d="M134.4 377.6 256.03 428l-86 35.62z" fill="#6588a8"/><path d="m256.03 512-86-48.36-11.96 28.86A256.24 256.24 0 0 0 256 511.97z" fill="#156a90"/><path d="M158.07 492.5a256.25 256.25 0 0 1-83.05-55.48l95.01 26.62z" fill="#316087"/><path d="m48.4 342.01 26.62 95.01 95.01 26.62-35.62-86z" fill="#417bb1"/><path d="m84.03 256 50.38 121.63-86-35.62z" fill="#87bdd7"/><path d="m75 437.04-26.61-95-28.87 11.95a256.25 256.25 0 0 0 55.47 83z" fill="#284963"/><path d="M19.52 353.99a256.25 256.25 0 0 1-19.5-97.96l48.37 86z" fill="#467baa"/><path d="m48.39 170.03-48.36 86 48.36 86 35.62-86z" fill="#7fadd0"/><path d="M134.4 134.4 84 256.03l-35.62-86z" fill="#abcae7"/><path d="m0 256.03 48.36-86-28.86-11.96A256.24 256.24 0 0 0 .03 256z" fill="#94c0ce"/><path d="M19.5 158.07a256.24 256.24 0 0 1 55.48-83.05l-26.62 95.01z" fill="#b3d6e2"/><path d="M169.99 48.4 74.98 75.02l-26.62 95.01 86-35.62z" fill="#e7fafa"/><path d="M256 84.03 134.36 134.4l35.62-86z" fill="#aed4f0"/><path d="m74.96 75 95-26.61-11.95-28.87a256.24 256.24 0 0 0-83 55.47z" fill="#c6dde5"/><path d="M158.01 19.52A256.25 256.25 0 0 1 255.97.02l-86 48.37z" fill="#a9d5e9"/><path d="m341.97 48.39-86-48.36-86 48.36 86 35.62z" fill="#f8ffff"/><path d="M377.6 134.4 255.97 84l86-35.62z" fill="#c2e8f8"/><path d="m255.97 0 86 48.36 11.96-28.86A256.25 256.25 0 0 0 256 .03z" fill="#bedee6"/><path d="M353.93 19.5a256.25 256.25 0 0 1 83.05 55.48l-95.01-26.62z" fill="#9fcff0"/></g></svg>
669+
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" {@rest}>
670+
<g fill="none" fill-rule="evenodd">
671+
<path d="m463.6 169.99-26.62-95.01-95-26.62 35.61 86z" fill="#e3f3fb" /><path
672+
d="M427.97 256 377.6 134.36l86 35.62z"
673+
fill="#99c5d4"
674+
/><path d="m437 74.96 26.61 95 28.87-11.95a256.25 256.25 0 0 0-55.47-83z" fill="#4e7eac" /><path
675+
d="M492.48 158.01a256.25 256.25 0 0 1 19.5 97.96l-48.37-86z"
676+
fill="#16495e"
677+
/><path d="m463.61 341.97 48.36-86-48.36-86-35.62 86z" fill="#ace6ea" /><path
678+
d="M377.6 377.6 428 255.97l35.62 86z"
679+
fill="#b6d6e8"
680+
/><path d="m512 255.97-48.36 86 28.86 11.96A256.25 256.25 0 0 0 511.97 256z" fill="#406484" /><path
681+
d="M492.5 353.93a256.25 256.25 0 0 1-55.48 83.05l26.62-95z"
682+
fill="#5b84a6"
683+
/><path d="m342.01 463.6 95.01-26.62 26.62-95-86 35.61z" fill="#9bc4e4" /><path
684+
d="m256 427.97 121.63-50.38-35.62 86z"
685+
fill="#506882"
686+
/><path d="m437.04 437-95 26.61 11.95 28.87a256.25 256.25 0 0 0 83-55.47z" fill="#3c6a91" /><path
687+
d="M353.99 492.48a256.25 256.25 0 0 1-97.96 19.5l86-48.37z"
688+
fill="#1d4268"
689+
/><path d="m170.03 463.61 86 48.36 86-48.36-86-35.62z" fill="#4d87b9" /><path
690+
d="M134.4 377.6 256.03 428l-86 35.62z"
691+
fill="#6588a8"
692+
/><path d="m256.03 512-86-48.36-11.96 28.86A256.24 256.24 0 0 0 256 511.97z" fill="#156a90" /><path
693+
d="M158.07 492.5a256.25 256.25 0 0 1-83.05-55.48l95.01 26.62z"
694+
fill="#316087"
695+
/><path d="m48.4 342.01 26.62 95.01 95.01 26.62-35.62-86z" fill="#417bb1" /><path
696+
d="m84.03 256 50.38 121.63-86-35.62z"
697+
fill="#87bdd7"
698+
/><path d="m75 437.04-26.61-95-28.87 11.95a256.25 256.25 0 0 0 55.47 83z" fill="#284963" /><path
699+
d="M19.52 353.99a256.25 256.25 0 0 1-19.5-97.96l48.37 86z"
700+
fill="#467baa"
701+
/><path d="m48.39 170.03-48.36 86 48.36 86 35.62-86z" fill="#7fadd0" /><path
702+
d="M134.4 134.4 84 256.03l-35.62-86z"
703+
fill="#abcae7"
704+
/><path d="m0 256.03 48.36-86-28.86-11.96A256.24 256.24 0 0 0 .03 256z" fill="#94c0ce" /><path
705+
d="M19.5 158.07a256.24 256.24 0 0 1 55.48-83.05l-26.62 95.01z"
706+
fill="#b3d6e2"
707+
/><path d="M169.99 48.4 74.98 75.02l-26.62 95.01 86-35.62z" fill="#e7fafa" /><path
708+
d="M256 84.03 134.36 134.4l35.62-86z"
709+
fill="#aed4f0"
710+
/><path d="m74.96 75 95-26.61-11.95-28.87a256.24 256.24 0 0 0-83 55.47z" fill="#c6dde5" /><path
711+
d="M158.01 19.52A256.25 256.25 0 0 1 255.97.02l-86 48.37z"
712+
fill="#a9d5e9"
713+
/><path d="m341.97 48.39-86-48.36-86 48.36 86 35.62z" fill="#f8ffff" /><path
714+
d="M377.6 134.4 255.97 84l86-35.62z"
715+
fill="#c2e8f8"
716+
/><path d="m255.97 0 86 48.36 11.96-28.86A256.25 256.25 0 0 0 256 .03z" fill="#bedee6" /><path
717+
d="M353.93 19.5a256.25 256.25 0 0 1 83.05 55.48l-95.01-26.62z"
718+
fill="#9fcff0"
719+
/>
720+
</g>
721+
</svg>
670722
"""
671723
end
672724

‎lib/oban/web/components/layouts.ex‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ defmodule Oban.Web.Layouts do
114114
class="fixed z-40 inset-0 flex items-end justify-center pointer-events-none md:py-3 md:px-4 sm:p-6 sm:items-start sm:justify-end"
115115
>
116116
<div class="max-w-sm w-full bg-white dark:bg-black dark:bg-opacity-90 shadow-lg rounded-lg pointer-events-auto">
117-
<div class="rounded-lg ring-1 ring-black ring-opacity-5 overflow-hidden">
117+
<div class="rounded-lg ring-1 ring-black/5 overflow-hidden">
118118
<div class="p-4">
119119
<div class="flex items-start">
120120
<div class="flex-shrink-0 text-green-400">
@@ -176,7 +176,9 @@ defmodule Oban.Web.Layouts do
176176
177177
<a href="https://oban.pro" class="flex items-center space-x-2 group">
178178
<Icons.soren_logo class="w-6 h-6" />
179-
<span class="text-sky-900 dark:text-sky-300 group-hover:underline font-semibold">Made by Oban Pro</span>
179+
<span class="text-sky-900 dark:text-sky-300 group-hover:underline font-semibold">
180+
Made by Oban Pro
181+
</span>
180182
</a>
181183
</footer>
182184
"""

‎lib/oban/web/components/sort.ex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ defmodule Oban.Web.SortComponent do
3333
3434
<nav
3535
class="hidden absolute z-10 mt-1 w-full text-sm font-semibold overflow-auto rounded-md bg-white
36-
dark:bg-gray-800 shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none"
36+
dark:bg-gray-800 shadow-lg ring-1 ring-black/5 focus:outline-none"
3737
id="sort-menu"
3838
role="listbox"
3939
tabindex="-1"

‎lib/oban/web/live/instances_component.ex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ defmodule Oban.Web.InstancesComponent do
5353
</button>
5454
5555
<ul
56-
class="hidden absolute z-10 top-full right-0 mt-2 text-sm font-semibold overflow-auto rounded-md bg-white dark:bg-gray-800 shadow-lg ring-1 ring-black ring-opacity-5"
56+
class="hidden absolute z-10 top-full right-0 mt-2 text-sm font-semibold overflow-auto rounded-md bg-white dark:bg-gray-800 shadow-lg ring-1 ring-black/5"
5757
id="instance-select-menu"
5858
>
5959
<li

‎lib/oban/web/live/search_component.ex‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,7 @@ defmodule Oban.Web.SearchComponent do
8888
</button>
8989
9090
<nav
91-
class={[
92-
"hidden absolute z-10 mt-1 w-full text-sm shadow-lg",
93-
"bg-white dark:bg-gray-800 focus:outline-none",
94-
"overflow-hidden rounded-md ring-1 ring-black ring-opacity-5"
95-
]}
91+
class="hidden absolute z-10 mt-1 w-full text-sm shadow-lg bg-white dark:bg-gray-800 focus:outline-none overflow-hidden rounded-md ring-1 ring-black/5"
9692
id="search-suggest"
9793
phx-click-away={JS.hide()}
9894
>

‎mix.exs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ defmodule Oban.Web.MixProject do
104104
{:esbuild, "~> 0.7", only: :dev, runtime: false},
105105
{:faker, "~> 0.17", only: :dev},
106106
{:phoenix_live_reload, "~> 1.2", only: :dev},
107-
{:tailwind, "~> 0.2", only: :dev, runtime: false},
107+
{:tailwind, "~> 0.4", only: :dev, runtime: false},
108108

109109
# Tooling
110110
{:credo, "~> 1.7", only: [:test, :dev], runtime: false},

‎mix.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"rewrite": {:hex, :rewrite, "1.1.2", "f5a5d10f5fed1491a6ff48e078d4585882695962ccc9e6c779bae025d1f92eda", [:mix], [{:glob_ex, "~> 0.1", [hex: :glob_ex, repo: "hexpm", optional: false]}, {:sourceror, "~> 1.0", [hex: :sourceror, repo: "hexpm", optional: false]}, {:text_diff, "~> 0.1", [hex: :text_diff, repo: "hexpm", optional: false]}], "hexpm", "7f8b94b1e3528d0a47b3e8b7bfeca559d2948a65fa7418a9ad7d7712703d39d4"},
5050
"sourceror": {:hex, :sourceror, "1.10.0", "38397dedbbc286966ec48c7af13e228b171332be1ad731974438c77791945ce9", [:mix], [], "hexpm", "29dbdfc92e04569c9d8e6efdc422fc1d815f4bd0055dc7c51b8800fb75c4b3f1"},
5151
"spitfire": {:hex, :spitfire, "0.2.1", "29e154873f05444669c7453d3d931820822cbca5170e88f0f8faa1de74a79b47", [:mix], [], "hexpm", "6eeed75054a38341b2e1814d41bb0a250564092358de2669fdb57ff88141d91b"},
52-
"tailwind": {:hex, :tailwind, "0.3.1", "a89d2835c580748c7a975ad7dd3f2ea5e63216dc16d44f9df492fbd12c094bed", [:mix], [], "hexpm", "98a45febdf4a87bc26682e1171acdedd6317d0919953c353fcd1b4f9f4b676a2"},
52+
"tailwind": {:hex, :tailwind, "0.4.0", "4b2606713080437e3d94a0fa26527e7425737abc001f172b484b42f43e3274c0", [:mix], [], "hexpm", "530bd35699333f8ea0e9038d7146c2f0932dfec2e3636bd4a8016380c4bc382e"},
5353
"telemetry": {:hex, :telemetry, "1.3.0", "fedebbae410d715cf8e7062c96a1ef32ec22e764197f70cda73d82778d61e7a2", [:rebar3], [], "hexpm", "7015fc8919dbe63764f4b4b87a95b7c0996bd539e0d499be6ec9d7f3875b79e6"},
5454
"text_diff": {:hex, :text_diff, "0.1.0", "1caf3175e11a53a9a139bc9339bd607c47b9e376b073d4571c031913317fecaa", [:mix], [], "hexpm", "d1ffaaecab338e49357b6daa82e435f877e0649041ace7755583a0ea3362dbd7"},
5555
"thousand_island": {:hex, :thousand_island, "1.4.1", "8df065e627407e281f7935da5ad0f3842d10eb721afa92e760b720d71e2e37aa", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "204a8640e5d2818589b87286ae66160978628d7edf6095181cbe0440765fb6c1"},

0 commit comments

Comments
 (0)