From 85ed73645e69cf5d0be7235567600eed8a66d95e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexa=20Valentov=C3=A1?= <git@imaniti.org>
Date: Mon, 16 Sep 2024 09:10:34 +0200
Subject: [PATCH] unify button styling
---
majak_uistyleguide/templates/patterns/atoms/tags/tag.html | 2 +-
.../patterns/molecules/blocks/icon_title_text_block.html | 4 ++--
.../templates/patterns/organisms/layout/navbar.yaml | 2 +-
.../templates/patterns/templates/main/program/program.html | 2 +-
src/css/molecules/popout.pcss | 2 +-
src/css/molecules/switch.pcss | 6 +++---
tailwind.config.js | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/majak_uistyleguide/templates/patterns/atoms/tags/tag.html b/majak_uistyleguide/templates/patterns/atoms/tags/tag.html
index 1ff24fb..342409f 100644
--- a/majak_uistyleguide/templates/patterns/atoms/tags/tag.html
+++ b/majak_uistyleguide/templates/patterns/atoms/tags/tag.html
@@ -4,7 +4,7 @@
{% if color_classes %}
{{ color_classes }}
{% else %}
- text-black bg-yellow-500 hover:bg-yellow-600
+ text-black bg-white hover:bg-pirati-yellow
{% endif %}
px-4 py-2 duration-200 hover:no-underline
diff --git a/majak_uistyleguide/templates/patterns/molecules/blocks/icon_title_text_block.html b/majak_uistyleguide/templates/patterns/molecules/blocks/icon_title_text_block.html
index 3d754af..ebb46c9 100644
--- a/majak_uistyleguide/templates/patterns/molecules/blocks/icon_title_text_block.html
+++ b/majak_uistyleguide/templates/patterns/molecules/blocks/icon_title_text_block.html
@@ -4,7 +4,7 @@
{% else %}
<div
{% endif %}
- class="hover:no-underline mb-12 flex gap-3 max-w-4xl"
+ class="hover:no-underline mb-12 flex gap-3"
>
{% if icon %}
@@ -15,7 +15,7 @@
<h3 class="font-alt mb-4 text-4xl">
{{ title }}
</h3>
- <div class="prose [&>div.content-block>p:first-child]:mt-0">
+ <div class="prose max-w-none [&>div.content-block>p:first-child]:mt-0">
<div class="content-block">
<p>
{{ text }}
diff --git a/majak_uistyleguide/templates/patterns/organisms/layout/navbar.yaml b/majak_uistyleguide/templates/patterns/organisms/layout/navbar.yaml
index fd401e3..317b43c 100644
--- a/majak_uistyleguide/templates/patterns/organisms/layout/navbar.yaml
+++ b/majak_uistyleguide/templates/patterns/organisms/layout/navbar.yaml
@@ -20,7 +20,7 @@ context:
name: 'Aktuality'
url: '#'
-
- name: 'Progran'
+ name: 'Program'
url: '#'
-
name: 'Kdo jsme'
diff --git a/majak_uistyleguide/templates/patterns/templates/main/program/program.html b/majak_uistyleguide/templates/patterns/templates/main/program/program.html
index f1915b0..accafc2 100644
--- a/majak_uistyleguide/templates/patterns/templates/main/program/program.html
+++ b/majak_uistyleguide/templates/patterns/templates/main/program/program.html
@@ -15,7 +15,7 @@
<div class="container--wide flex flex-col mt-20 mb-4 xl:mb-20">
{% if program.perex %}
<div class="mb-12">
- <div class="prose">
+ <div class="prose max-w-none">
{# BEGIN Cast generovana Majakem #}<div class="content-block">
<p>
{{ program.perex }}
diff --git a/src/css/molecules/popout.pcss b/src/css/molecules/popout.pcss
index 8639c4a..b6f7c55 100644
--- a/src/css/molecules/popout.pcss
+++ b/src/css/molecules/popout.pcss
@@ -2,7 +2,7 @@
@apply px-5 text-lg flex justify-between items-center cursor-pointer duration-150 hover:bg-grey-150;
&.popout__toggle-wrapper--active {
- @apply bg-yellow-500;
+ @apply bg-pirati-yellow;
}
}
diff --git a/src/css/molecules/switch.pcss b/src/css/molecules/switch.pcss
index 667b574..d497632 100644
--- a/src/css/molecules/switch.pcss
+++ b/src/css/molecules/switch.pcss
@@ -11,15 +11,15 @@
}
.switch__item {
- @apply bg-yellow-500 text-black;
+ @apply bg-white text-black;
&:hover {
- @apply no-underline bg-yellow-600;
+ @apply no-underline bg-pirati-yellow;
}
&.switch__item--active,
&.switch__item--active:hover {
- @apply bg-grey-150;
+ @apply bg-pirati-yellow;
}
}
diff --git a/tailwind.config.js b/tailwind.config.js
index 320f5a9..97c2eaa 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -189,7 +189,7 @@ module.exports = {
'700': '#7d347d',
},
'pirati': {
- 'yellow': '#fec900'
+ 'yellow': '#f2c700'
}
},
container: {
--
GitLab