From 981c82992d620a4c699cb097ffe2c50bd91d7cb9 Mon Sep 17 00:00:00 2001 From: Gregory Trullemans Date: Sun, 3 Dec 2023 17:46:48 +0100 Subject: [PATCH] [WIP] refactoring for tailwindcss --- jarvis/core/templates/base.html | 45 ++------ jarvis/core/templates/login.html | 18 +--- jarvis/location/templates/clubs/list.html | 1 - jarvis/location/templates/places/list.html | 1 - jarvis/people/templates/gymnasts/list.html | 24 ++--- jarvis/planning/templates/events/list.html | 1 - static/css/app.css | 117 +++++++++++---------- tailwind.config.js | 14 ++- 8 files changed, 92 insertions(+), 129 deletions(-) diff --git a/jarvis/core/templates/base.html b/jarvis/core/templates/base.html index 93a4d90..2b932d2 100644 --- a/jarvis/core/templates/base.html +++ b/jarvis/core/templates/base.html @@ -70,10 +70,10 @@ - +
-
+
@@ -174,7 +174,7 @@
-
+
@@ -274,9 +244,6 @@
- - {% block footerscript %}{% endblock %} diff --git a/jarvis/core/templates/login.html b/jarvis/core/templates/login.html index 9db2526..9508eb9 100644 --- a/jarvis/core/templates/login.html +++ b/jarvis/core/templates/login.html @@ -34,23 +34,9 @@ - -
-
-
- - - - - -
-
-
+ -
+

Connection

{% csrf_token %} diff --git a/jarvis/location/templates/clubs/list.html b/jarvis/location/templates/clubs/list.html index 1bf21f3..8e60e5e 100644 --- a/jarvis/location/templates/clubs/list.html +++ b/jarvis/location/templates/clubs/list.html @@ -6,7 +6,6 @@ {% block content %}
-

Club Listing

diff --git a/jarvis/location/templates/places/list.html b/jarvis/location/templates/places/list.html index 04e7308..a000e9f 100644 --- a/jarvis/location/templates/places/list.html +++ b/jarvis/location/templates/places/list.html @@ -9,7 +9,6 @@
-

Places Listing

diff --git a/jarvis/people/templates/gymnasts/list.html b/jarvis/people/templates/gymnasts/list.html index 4c93e93..98fedbe 100644 --- a/jarvis/people/templates/gymnasts/list.html +++ b/jarvis/people/templates/gymnasts/list.html @@ -12,35 +12,35 @@ - - - - - - {% for season_information in season_information_list %} - - - + + + - - - + + + {% endfor %} diff --git a/jarvis/planning/templates/events/list.html b/jarvis/planning/templates/events/list.html index ca55535..2aec92d 100644 --- a/jarvis/planning/templates/events/list.html +++ b/jarvis/planning/templates/events/list.html @@ -9,7 +9,6 @@
-

Event Listing

{% if event_list %}Calendar{% endif %}
diff --git a/static/css/app.css b/static/css/app.css index 1d9fccf..a499999 100644 --- a/static/css/app.css +++ b/static/css/app.css @@ -918,6 +918,10 @@ video { width: 108rem; } +.w-\[14rem\] { + width: 14rem; +} + .w-\[19\.5rem\] { width: 19.5rem; } @@ -950,22 +954,6 @@ video { width: 100%; } -.w-\[16rem\] { - width: 16rem; -} - -.w-\[17rem\] { - width: 17rem; -} - -.w-\[18rem\] { - width: 18rem; -} - -.w-\[14rem\] { - width: 14rem; -} - .min-w-0 { min-width: 0px; } @@ -1173,6 +1161,11 @@ video { background-color: rgb(165 180 252 / var(--tw-bg-opacity)); } +.bg-jarvis-blue-700 { + --tw-bg-opacity: 1; + background-color: rgb(39 41 59 / var(--tw-bg-opacity)); +} + .bg-purple-300 { --tw-bg-opacity: 1; background-color: rgb(216 180 254 / var(--tw-bg-opacity)); @@ -1201,11 +1194,6 @@ video { background-color: rgb(248 250 252 / var(--tw-bg-opacity)); } -.bg-slate-800 { - --tw-bg-opacity: 1; - background-color: rgb(30 41 59 / var(--tw-bg-opacity)); -} - .bg-white { --tw-bg-opacity: 1; background-color: rgb(255 255 255 / var(--tw-bg-opacity)); @@ -1355,6 +1343,11 @@ video { padding: 2rem; } +.px-2 { + padding-left: 0.5rem; + padding-right: 0.5rem; +} + .px-3 { padding-left: 0.75rem; padding-right: 0.75rem; @@ -1536,16 +1529,6 @@ video { line-height: 1rem; } -.text-3xl { - font-size: 1.875rem; - line-height: 2.25rem; -} - -.text-5xl { - font-size: 3rem; - line-height: 1; -} - .font-bold { font-weight: 700; } @@ -1562,6 +1545,10 @@ video { font-weight: 600; } +.uppercase { + text-transform: uppercase; +} + .leading-5 { line-height: 1.25rem; } @@ -1587,6 +1574,11 @@ video { color: rgb(79 70 229 / var(--tw-text-opacity)); } +.text-jarvis-link-900 { + --tw-text-opacity: 1; + color: rgb(173 90 237 / var(--tw-text-opacity)); +} + .text-sky-300 { --tw-text-opacity: 1; color: rgb(125 211 252 / var(--tw-text-opacity)); @@ -1696,6 +1688,16 @@ video { mask-image: linear-gradient(0deg,#fff,rgba(255,255,255,0.6)); } +.odd\:bg-jarvis-blue-700:nth-child(odd) { + --tw-bg-opacity: 1; + background-color: rgb(39 41 59 / var(--tw-bg-opacity)); +} + +.even\:bg-jarvis-blue-800:nth-child(even) { + --tw-bg-opacity: 1; + background-color: rgb(37 39 56 / var(--tw-bg-opacity)); +} + .hover\:border-slate-400:hover { --tw-border-opacity: 1; border-color: rgb(148 163 184 / var(--tw-border-opacity)); @@ -1714,6 +1716,11 @@ video { object-fit: scale-down; } +.hover\:text-jarvis-link-800:hover { + --tw-text-opacity: 1; + color: rgb(208 88 197 / var(--tw-text-opacity)); +} + .hover\:text-sky-500:hover { --tw-text-opacity: 1; color: rgb(14 165 233 / var(--tw-text-opacity)); @@ -1917,9 +1924,14 @@ video { border-color: rgb(255 255 255 / 0.05); } - .dark\:bg-gray-900 { + .dark\:bg-jarvis-blue-800 { --tw-bg-opacity: 1; - background-color: rgb(17 24 39 / var(--tw-bg-opacity)); + background-color: rgb(37 39 56 / var(--tw-bg-opacity)); + } + + .dark\:bg-jarvis-blue-900 { + --tw-bg-opacity: 1; + background-color: rgb(30 29 37 / var(--tw-bg-opacity)); } .dark\:bg-sky-500 { @@ -2045,6 +2057,16 @@ video { mask-image: linear-gradient(0deg,rgba(255,255,255,0.1),rgba(255,255,255,0.5)); } + .odd\:dark\:bg-jarvis-blue-700:nth-child(odd) { + --tw-bg-opacity: 1; + background-color: rgb(39 41 59 / var(--tw-bg-opacity)); + } + + .even\:dark\:bg-jarvis-blue-800:nth-child(even) { + --tw-bg-opacity: 1; + background-color: rgb(37 39 56 / var(--tw-bg-opacity)); + } + .dark\:hover\:border-slate-500:hover { --tw-border-opacity: 1; border-color: rgb(100 116 139 / var(--tw-border-opacity)); @@ -2219,11 +2241,6 @@ video { font-size: 1.875rem; line-height: 2.25rem; } - - .sm\:text-4xl { - font-size: 2.25rem; - line-height: 2.5rem; - } } @media (prefers-color-scheme: dark) { @@ -2325,30 +2342,14 @@ video { padding-left: 0.5rem; } - .lg\:pl-\[19\.5rem\] { - padding-left: 19.5rem; - } - - .lg\:pl-\[17\.5rem\] { - padding-left: 17.5rem; - } - - .lg\:pl-\[16rem\] { - padding-left: 16rem; - } - - .lg\:pl-\[14rem\] { - padding-left: 14rem; - } - - .lg\:pl-\[12rem\] { - padding-left: 12rem; - } - .lg\:pl-\[13rem\] { padding-left: 13rem; } + .lg\:pl-\[19\.5rem\] { + padding-left: 19.5rem; + } + .lg\:text-sm { font-size: 0.875rem; line-height: 1.25rem; diff --git a/tailwind.config.js b/tailwind.config.js index d4ff7db..a9d37f2 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -2,7 +2,19 @@ module.exports = { content: ["./jarvis/**/templates/*.html", "./jarvis/**/templates/**/*.html"], theme: { - extend: {}, + extend: { + colors: { + 'jarvis-blue': { + 900: '#1e1d25', + 800: '#252738', + 700: '#27293b', + }, + 'jarvis-link': { + 900: '#ad5aed', + 800: '#d058c5', + } + }, + }, }, plugins: [], }
+
Lastname
 +
Firstname
 +
Gender
 +
Age
 +
Category
 +
Club
{{ season_information.gymnast.last_name }}{{ season_information.gymnast.first_name }}
{{ season_information.gymnast.last_name }}{{ season_information.gymnast.first_name }} {{ season_information.gymnast.get_gender_display }}{{ season_information.gymnast.age }}{{ season_information.get_category_display }}{{ season_information.club.name }}{{ season_information.gymnast.age }}{{ season_information.get_category_display }}{{ season_information.club.name }}