
diff --git a/app/static/medwings/images/logo/medwings-logo.png b/app/static/medwings/images/logo/medwings-logo.png
index 5007d8d..0cc185a 100644
Binary files a/app/static/medwings/images/logo/medwings-logo.png and b/app/static/medwings/images/logo/medwings-logo.png differ
diff --git a/app/static/medwings/images/logo/medwings-logo.svg b/app/static/medwings/images/logo/medwings-logo.svg
index 527290d..fbc9c8c 100644
--- a/app/static/medwings/images/logo/medwings-logo.svg
+++ b/app/static/medwings/images/logo/medwings-logo.svg
@@ -1,66 +1,87 @@
-
-
+ inkscape:current-layer="Layer_1" />
diff --git a/app/static/medwings/images/misc/hamburger.svg b/app/static/medwings/images/misc/hamburger.svg
new file mode 100644
index 0000000..26452b8
--- /dev/null
+++ b/app/static/medwings/images/misc/hamburger.svg
@@ -0,0 +1,31 @@
+
diff --git a/assets/css/fonts.css b/assets/css/fonts.css
index 4204595..b145627 100644
--- a/assets/css/fonts.css
+++ b/assets/css/fonts.css
@@ -370,10 +370,40 @@
}
-/* NotoColorEmoji */
+/* PlayfairDisplaySC */
@font-face {
- font-family: 'NotoColorEmoji';
- src: url('/assets/fonts/notocoloremoji/notocoloremoji-regular.ttf') format('truetype');
+ font-family: 'PlayfairDisplaySC';
+ src: url('/assets/fonts/playfairdisplaysc/playfairdisplaysc-regular.ttf') format('truetype');
font-weight: 400;
font-style: normal;
}
+@font-face {
+ font-family: 'PlayfairDisplaySC';
+ src: url('/assets/fonts/playfairdisplaysc/playfairdisplaysc-regular-italic.ttf') format('truetype');
+ font-weight: 400;
+ font-style: italic;
+}
+@font-face {
+ font-family: 'PlayfairDisplaySC';
+ src: url('/assets/fonts/playfairdisplaysc/playfairdisplaysc-bold.ttf') format('truetype');
+ font-weight: 700;
+ font-style: normal;
+}
+@font-face {
+ font-family: 'PlayfairDisplaySC';
+ src: url('/assets/fonts/playfairdisplaysc/playfairdisplaysc-bold-italic.ttf') format('truetype');
+ font-weight: 700;
+ font-style: italic;
+}
+@font-face {
+ font-family: 'PlayfairDisplaySC';
+ src: url('/assets/fonts/playfairdisplaysc/playfairdisplaysc-black.ttf') format('truetype');
+ font-weight: 900;
+ font-style: normal;
+}
+@font-face {
+ font-family: 'PlayfairDisplaySC';
+ src: url('/assets/fonts/playfairdisplaysc/playfairdisplaysc-black-italic.ttf') format('truetype');
+ font-weight: 900;
+ font-style: italic;
+}
diff --git a/assets/css/styles.css b/assets/css/styles.css
index 6f95eda..cf0b01e 100644
--- a/assets/css/styles.css
+++ b/assets/css/styles.css
@@ -8,10 +8,17 @@ h1, h2, h3, h4, h5, h6 {
font-weight: 600;
font-style: normal;
text-align: center;
+ line-height: 1;
}
h1 {
- font-size: 3rem;
+ font-size: 3rem;
+ @apply text-primary-200;
+}
+
+h1.title {
+ @apply font-title font-bold;
+ @apply underline text-secondary-500/90;
}
h2 {
@@ -34,59 +41,68 @@ h6 {
font-size: 1rem;
}
+p {
+ @apply text-center sm:text-start;
+}
+
input {
@apply rounded rounded-md drop-shadow-sm px-2 py-1;
- @apply bg-accent-100;
+ @apply bg-secondary/25;
@apply w-full;
}
input[type="submit"] {
@apply rounded rounded-lg drop-shadow-md px-4 py-2;
- @apply bg-accent-600;
+ @apply bg-secondary hover:bg-secondary-600;
+ @apply cursor-pointer;
@apply font-semibold;
@apply hover:drop-shadow-xl;
}
select {
@apply rounded rounded-md drop-shadow-sm px-2 py-1;
- @apply bg-accent-100;
+ @apply bg-secondary/25;
@apply w-full;
}
select.error {
- @apply border border-failure;
+ @apply border-2 border-failure/50;
}
input.error {
- @apply border border-failure;
+ @apply border-2 border-failure/50;
}
fieldset {
- @apply border border-accent p-4;
+ @apply border border-secondary p-4;
}
legend {
- @apply text-sm text-accent-600 px-2;
+ @apply text-sm text-secondary px-2;
+}
+label {
+ @apply text-sm text-secondary/75 font-semibold;
}
-a {
- @apply underline text-primary-300;
+a:not(.btn, .btn-outline) {
+ @apply underline text-secondary;
}
.btn {
text-align: center;
- @apply rounded rounded-lg drop-shadow-md px-4 py-2;
- @apply bg-accent-600;
- @apply font-semibold;
+ @apply rounded rounded-lg drop-shadow-md px-2 py-1;
+ @apply bg-accent hover:bg-accent-600;
+ @apply font-semibold text-primary-100 hover:text-primary-200;
@apply hover:drop-shadow-xl;
+ @apply border-2 border-accent hover:border-accent-700;
}
.btn-outline {
text-align: center;
- @apply rounded rounded-lg drop-shadow-md px-4 py-2;
- @apply text-accent-600 bg-accent-600/10;
- @apply border-2 border-accent-600;
- @apply font-semibold;
+ @apply rounded rounded-lg drop-shadow-md px-2 py-1;
+ @apply bg-transparent hover:bg-accent-600;
+ @apply font-semibold text-accent hover:text-primary-100;
@apply hover:drop-shadow-xl;
+ @apply border-2 border-accent hover:border-accent-700;
}
body.global {
@@ -94,6 +110,7 @@ body.global {
width: 100%;
display: flex;
flex-direction: column;
+ @apply bg-gradient-to-b from-primary-900/75 via-background to-primary-900/75;
}
header.global, main.global, footer.global {
@@ -118,17 +135,24 @@ div.status-message {
}
div.status-message.error {
- @apply font-semibold bg-failure/50 border border-failure;
+ @apply italic text-failure-300 bg-failure/50 border border-failure;
}
div.call-to-action-box {
@apply bg-gradient-to-r from-secondary-300/75 to-secondary-500/75;
@apply rounded-md py-4 px-6;
+ @apply text-center sm:text-start;
}
.loader {
overflow: hidden;
}
+.loader.loader-bar {
+ @apply h-1 bg-accent rounded rounded-full;
+}
+.loader.loader-value {
+ @apply font-bold text-end;
+}
.loader--loading {
animation: loading 2s infinite linear;
@@ -187,3 +211,104 @@ div.call-to-action-box {
opacity: 1;
}
}
+
+#logo-wings {
+ animation: logowings 2s ease-in-out infinite alternate;
+}
+#logo-wings--subtle {
+ animation: logowings-subtle 2s ease-in-out infinite alternate;
+}
+#logo-heart {
+ animation: logoheart 1s linear infinite;
+ transform-origin: center;
+}
+#logo-heart--subtle {
+ animation: logoheart-subtle 1s linear infinite;
+ transform-origin: center;
+}
+#logo-blips {
+ animation: logoblips 6s linear infinite;
+ transform-origin: bottom;
+ transform-box: fill-box;
+}
+#logo-blips--subtle {
+ animation: logoblips-subtle 6s linear infinite;
+ transform-origin: bottom;
+ transform-box: fill-box;
+}
+
+@keyframes logowings {
+ 0% {
+ transform: translateY(0%);
+ }
+
+ 100% {
+ transform: translateY(5%);
+ }
+}
+@keyframes logowings-subtle {
+ 0% {
+ transform: translateY(5%);
+ }
+
+ 100% {
+ transform: translateY(8%);
+ }
+}
+
+@keyframes logoheart {
+ 0%, 25%, 50%, 100% {
+ transform: scale(100%);
+ }
+
+ 12%, 37% {
+ transform: scale(105%);
+ }
+}
+@keyframes logoheart-subtle {
+ 0%, 25%, 50%, 100% {
+ transform: scale(100%);
+ }
+
+ 12%, 37% {
+ transform: scale(102%);
+ }
+}
+
+@keyframes logoblips {
+ 0% {
+ transform: rotateY(0deg)
+ }
+
+ 5%, 100% {
+ transform: rotateY(360deg);
+ }
+}
+@keyframes logoblips-subtle {
+ 0% {
+ transform: rotateY(0deg)
+ }
+
+ 5%, 100% {
+ transform: rotateY(360deg);
+ }
+}
+
+path.hamburger-path {
+ @apply fill-secondary stroke-secondary;
+}
+
+#hamburger-content.hamburger--closed {
+ @apply hidden sm:flex;
+}
+#hamburger-content.hamburger--open {
+ @apply flex;
+}
+#hamburger-svg.hamburger--open {
+ transform-origin: center;
+ transform: rotate(90deg);
+}
+#hamburger-svg.hamburger--closed {
+ transform-origin: center;
+ transform: rotate(0deg);
+}
diff --git a/assets/fonts/notocoloremoji/notocoloremoji-regular.ttf b/assets/fonts/notocoloremoji/notocoloremoji-regular.ttf
deleted file mode 100644
index 8ebcc8f..0000000
Binary files a/assets/fonts/notocoloremoji/notocoloremoji-regular.ttf and /dev/null differ
diff --git a/assets/fonts/playfairdisplaysc/playfairdisplaysc-black-italic.ttf b/assets/fonts/playfairdisplaysc/playfairdisplaysc-black-italic.ttf
new file mode 100644
index 0000000..e423fa0
Binary files /dev/null and b/assets/fonts/playfairdisplaysc/playfairdisplaysc-black-italic.ttf differ
diff --git a/assets/fonts/playfairdisplaysc/playfairdisplaysc-black.ttf b/assets/fonts/playfairdisplaysc/playfairdisplaysc-black.ttf
new file mode 100644
index 0000000..7d50fe3
Binary files /dev/null and b/assets/fonts/playfairdisplaysc/playfairdisplaysc-black.ttf differ
diff --git a/assets/fonts/playfairdisplaysc/playfairdisplaysc-bold-italic.ttf b/assets/fonts/playfairdisplaysc/playfairdisplaysc-bold-italic.ttf
new file mode 100644
index 0000000..036c404
Binary files /dev/null and b/assets/fonts/playfairdisplaysc/playfairdisplaysc-bold-italic.ttf differ
diff --git a/assets/fonts/playfairdisplaysc/playfairdisplaysc-bold.ttf b/assets/fonts/playfairdisplaysc/playfairdisplaysc-bold.ttf
new file mode 100644
index 0000000..d5a1aff
Binary files /dev/null and b/assets/fonts/playfairdisplaysc/playfairdisplaysc-bold.ttf differ
diff --git a/assets/fonts/playfairdisplaysc/playfairdisplaysc-regular-italic.ttf b/assets/fonts/playfairdisplaysc/playfairdisplaysc-regular-italic.ttf
new file mode 100644
index 0000000..6220854
Binary files /dev/null and b/assets/fonts/playfairdisplaysc/playfairdisplaysc-regular-italic.ttf differ
diff --git a/assets/fonts/playfairdisplaysc/playfairdisplaysc-regular.ttf b/assets/fonts/playfairdisplaysc/playfairdisplaysc-regular.ttf
new file mode 100644
index 0000000..f3caa71
Binary files /dev/null and b/assets/fonts/playfairdisplaysc/playfairdisplaysc-regular.ttf differ
diff --git a/tailwind.config.js b/tailwind.config.js
index faccd43..1e320dd 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -4,70 +4,119 @@ export default {
theme: {
extend: {
fontFamily: {
- sans: ["Montserrat", "NotoColorEmoji"],
- serif: ["Lora", "NotoColorEmoji"],
- mono: ["SourceCodePro", "NotoColorEmoji"],
- accent: ["Kanit", "NotoColorEmoji"],
- emoji: ["NotoColorEmoji"],
+ sans: ["Montserrat"],
+ serif: ["Lora"],
+ mono: ["SourceCodePro"],
+ accent: ["Kanit"],
+ title: ["PlayfairDisplaySC"]
},
colors: {
transparent: "transparent",
current: "currentColor",
primary: {
- 50: "#D5E8EC",
- 100: "#9CCAD3",
- 200: "#4B9AAA",
- 300: "#326671",
- 400: "#1F4047",
- 500: "#0D1B1E",
- DEFAULT: "#0D1B1E",
- 600: "#0C191C",
- 700: "#070F11",
- 800: "#040809",
- 900: "#000000",
+ 50: "#050511",
+ 100: "#0F0E35",
+ 200: "#19165A",
+ 300: "#23207F",
+ 400: "#2D2AA3",
+ 500: "#323a8a",
+ DEFAULT: "#323a8a",
+ 600: "#575DA2",
+ 700: "#7D81BA",
+ 800: "#A2A4D2",
+ 900: "#C8C8EB",
},
secondary: {
- 50: "#F3F7F5",
- 100: "#DBE6E2",
- 200: "#B6CDC5",
- 300: "#9EBDB2",
- 400: "#86AC9F",
- 500: "#6C9A8B",
- DEFAULT: "#6C9A8B",
- 600: "#5B8677",
- 700: "#4A6D61",
- 800: "#3A554B",
- 900: "#192420",
+ 50: "#0A1515",
+ 100: "#123839",
+ 200: "#1A5C5E",
+ 300: "#228083",
+ 400: "#2AA5A8",
+ 500: "#4bb1bd",
+ DEFAULT: "#4bb1bd",
+ 600: "#71C3C6",
+ 700: "#97D4D0",
+ 800: "#BCE6DA",
+ 900: "#E2F7E5",
},
accent: {
- 50: "#FFF9EB",
- 100: "#FFEDC2",
- 200: "#FFE7AD",
- 300: "#FFDA85",
- 400: "#FFCE5C",
- 500: "#FFC233",
- DEFAULT: "#FFC233",
- 600: "#FFB60A",
- 700: "#E09D00",
- 800: "#A37200",
- 900: "#523900",
+ 50: "#33000b",
+ 100: "#660015",
+ 200: "#99001f",
+ 300: "#cc0029",
+ 400: "#e04159",
+ 500: "#e85a6a",
+ DEFAULT: "#e85a6a",
+ 600: "#f0747b",
+ 700: "#f88d8d",
+ 800: "#fda6a6",
+ 900: "#ffbfbe",
},
background: {
- 50: "#FFFFFF",
- 100: "#FFFFFF",
- 200: "#FFFFFF",
- 300: "#FFFFFF",
- 400: "#FFFFFF",
- 500: "#FCFCFC",
- DEFAULT: "#FCFCFC",
- 600: "#CCCCCC",
- 700: "#A3A3A3",
- 800: "#707070",
- 900: "#333333",
+ 50: "#0D0C0B",
+ 100: "#28251F",
+ 200: "#444133",
+ 300: "#605D48",
+ 400: "#7C785D",
+ 500: "#fcfbf8",
+ DEFAULT: "#fcfbf8",
+ 600: "#FDFDF6",
+ 700: "#FDFEFA",
+ 800: "#FEFFFD",
+ 900: "#FFFFFF",
+ },
+ text: {
+ 50: "#0A0A0A",
+ 100: "#141414",
+ 200: "#1F1F1F",
+ 300: "#292929",
+ 400: "#343434",
+ 500: "#202120",
+ DEFAULT: "#202120",
+ 600: "#5B5B5B",
+ 700: "#767676",
+ 800: "#919191",
+ 900: "#ADADAD",
+ },
+ success: {
+ 50: "#001400",
+ 100: "#002800",
+ 200: "#003D00",
+ 300: "#005100",
+ 400: "#006600",
+ 500: "#00CC00",
+ DEFAULT: "#00CC00",
+ 600: "#33D133",
+ 700: "#66D766",
+ 800: "#99DD99",
+ 900: "#CCE3CC",
+ },
+ warning: {
+ 50: "#191200",
+ 100: "#332400",
+ 200: "#4D3600",
+ 300: "#664800",
+ 400: "#805A00",
+ 500: "#EDC000",
+ DEFAULT: "#EDC000",
+ 600: "#EFD133",
+ 700: "#F1E266",
+ 800: "#F4F399",
+ 900: "#F7F4CC",
+ },
+ failure: {
+ 50: "#190000",
+ 100: "#320000",
+ 200: "#4C0000",
+ 300: "#660000",
+ 400: "#800000",
+ 500: "#E40000",
+ DEFAULT: "#E40000",
+ 600: "#E43333",
+ 700: "#E46666",
+ 800: "#E69999",
+ 900: "#E9CCCC",
},
- success: "#00CC00",
- warning: "#EDC000",
- failure: "#E40000",
},
screens: {
'3xl': '1920px',