diff --git a/app/assets/images/merged/home.jpg b/app/assets/images/merged/home.jpg new file mode 100644 index 0000000..89e8153 Binary files /dev/null and b/app/assets/images/merged/home.jpg differ diff --git a/app/assets/stylesheets/merged/merged.css b/app/assets/stylesheets/merged/merged.css index 9438e09..c406cdd 100644 --- a/app/assets/stylesheets/merged/merged.css +++ b/app/assets/stylesheets/merged/merged.css @@ -1469,6 +1469,11 @@ select { margin-right: 1.5rem; } +.my-2 { + margin-top: 0.5rem; + margin-bottom: 0.5rem; +} + .mr-3 { margin-right: 0.75rem; } @@ -1561,6 +1566,10 @@ select { margin-top: 5rem; } +.mb-1 { + margin-bottom: 0.25rem; +} + .block { display: block; } @@ -1745,6 +1754,10 @@ select { flex-basis: 24rem; } +.basis-60 { + flex-basis: 15rem; +} + .origin-\[0\] { transform-origin: 0; } @@ -1901,6 +1914,12 @@ select { border-bottom-width: calc(1px * var(--tw-divide-y-reverse)); } +.divide-y-2 > :not([hidden]) ~ :not([hidden]) { + --tw-divide-y-reverse: 0; + border-top-width: calc(2px * calc(1 - var(--tw-divide-y-reverse))); + border-bottom-width: calc(2px * var(--tw-divide-y-reverse)); +} + .divide-gray-200 > :not([hidden]) ~ :not([hidden]) { --tw-divide-opacity: 1; border-color: rgb(229 231 235 / var(--tw-divide-opacity)); @@ -1958,6 +1977,10 @@ select { border-width: 0px; } +.border-2 { + border-width: 2px; +} + .border-l-4 { border-left-width: 4px; } @@ -1970,6 +1993,10 @@ select { border-bottom-width: 8px; } +.border-b-2 { + border-bottom-width: 2px; +} + .border-solid { border-style: solid; } @@ -2014,6 +2041,26 @@ select { border-color: rgb(75 85 99 / var(--tw-border-opacity)); } +.border-slate-200 { + --tw-border-opacity: 1; + border-color: rgb(226 232 240 / var(--tw-border-opacity)); +} + +.border-slate-500 { + --tw-border-opacity: 1; + border-color: rgb(100 116 139 / var(--tw-border-opacity)); +} + +.border-slate-300 { + --tw-border-opacity: 1; + border-color: rgb(203 213 225 / var(--tw-border-opacity)); +} + +.border-slate-400 { + --tw-border-opacity: 1; + border-color: rgb(148 163 184 / var(--tw-border-opacity)); +} + .bg-cyan-200 { --tw-bg-opacity: 1; background-color: rgb(165 243 252 / var(--tw-bg-opacity)); @@ -2172,6 +2219,51 @@ select { background-color: rgb(254 243 199 / var(--tw-bg-opacity)); } +.bg-gray-50 { + --tw-bg-opacity: 1; + background-color: rgb(249 250 251 / var(--tw-bg-opacity)); +} + +.bg-yellow-100 { + --tw-bg-opacity: 1; + background-color: rgb(254 249 195 / var(--tw-bg-opacity)); +} + +.bg-yellow-50 { + --tw-bg-opacity: 1; + background-color: rgb(254 252 232 / var(--tw-bg-opacity)); +} + +.bg-teal-50 { + --tw-bg-opacity: 1; + background-color: rgb(240 253 250 / var(--tw-bg-opacity)); +} + +.bg-emerald-50 { + --tw-bg-opacity: 1; + background-color: rgb(236 253 245 / var(--tw-bg-opacity)); +} + +.bg-slate-50 { + --tw-bg-opacity: 1; + background-color: rgb(248 250 252 / var(--tw-bg-opacity)); +} + +.bg-neutral-50 { + --tw-bg-opacity: 1; + background-color: rgb(250 250 250 / var(--tw-bg-opacity)); +} + +.bg-gray-200 { + --tw-bg-opacity: 1; + background-color: rgb(229 231 235 / var(--tw-bg-opacity)); +} + +.bg-slate-200 { + --tw-bg-opacity: 1; + background-color: rgb(226 232 240 / var(--tw-bg-opacity)); +} + .bg-cover { background-size: cover; } @@ -2355,6 +2447,10 @@ select { padding-bottom: 1.5rem; } +.pt-4 { + padding-top: 1rem; +} + .text-left { text-align: left; } @@ -2543,6 +2639,10 @@ select { box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); } +.outline-4 { + outline-width: 4px; +} + .filter { filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow); } diff --git a/app/views/layouts/merged/_header.haml b/app/views/layouts/merged/_header.haml index 754e33a..503f65c 100644 --- a/app/views/layouts/merged/_header.haml +++ b/app/views/layouts/merged/_header.haml @@ -1,7 +1,10 @@ .flex.mx-20.my-6.h-16.justify-between .flex.items-center.gap-16 - %a{:href => "/merged/pages"} + %a{:href => "/"} %span.sr-only Home + =image_tag("merged/home" , class: "h-10") + %a{:href => "/merged/pages"} + %span.sr-only Merged Home =image_tag("merged/merged_logo" , class: "h-10") %ul.flex.items-center.gap-6.text-lg