diff --git a/fet2020/static/css/styles.css b/fet2020/static/css/styles.css index 4534ec91..509afca3 100644 --- a/fet2020/static/css/styles.css +++ b/fet2020/static/css/styles.css @@ -715,7 +715,7 @@ p a:hover { /***** NAVBAR *****/ -.navbar { +[class^=navBar] { width: 100%; --tw-bg-opacity: 1; background-color: rgb(255 255 255 / var(--tw-bg-opacity)); @@ -725,47 +725,47 @@ p a:hover { } @media (prefers-color-scheme: dark) { - .navbar { + [class^=navBar] { --tw-bg-opacity: 1; background-color: rgb(31 41 55 / var(--tw-bg-opacity)); } } -.navbar > div { +[class^=navBar] > div { width: 100%; } @media (min-width: 640px) { - .navbar > div { + [class^=navBar] > div { max-width: 640px; } } @media (min-width: 768px) { - .navbar > div { + [class^=navBar] > div { max-width: 768px; } } @media (min-width: 1024px) { - .navbar > div { + [class^=navBar] > div { max-width: 1024px; } } @media (min-width: 1280px) { - .navbar > div { + [class^=navBar] > div { max-width: 1280px; } } @media (min-width: 1536px) { - .navbar > div { + [class^=navBar] > div { max-width: 1536px; } } -.navbar > div { +[class^=navBar] > div { margin-left: auto; margin-right: auto; display: flex; @@ -777,13 +777,6 @@ p a:hover { padding-right: 1rem; } -@media (min-width: 640px) { - .navbar > div { - flex-direction: row; - justify-content: space-between; - } -} - .navbar-logo { height: 4rem; flex: none; @@ -791,8 +784,8 @@ p a:hover { .navbar-toggle { position: absolute; - right: 1rem; top: 1.25rem; + right: 1rem; font-size: 1.5rem; line-height: 2rem; --tw-text-opacity: 1; @@ -806,13 +799,6 @@ p a:hover { } } -@media (min-width: 640px) { - .navbar-toggle { - right: 0px; - display: none; - } -} - .navbar-content { margin-bottom: 0.5rem; width: 100%; @@ -828,42 +814,15 @@ p a:hover { } } -@media (min-width: 640px) { - .navbar-content { - margin-bottom: 0px; - width: auto; - align-self: center; - } -} - -@media (min-width: 768px) { - .navbar-content { - font-size: 1.125rem; - line-height: 1.75rem; - } -} - .navbar-content > li { border-radius: 0.25rem; } -@media (min-width: 640px) { - .navbar-content > li { - display: inline-block; - } -} - .navbar-content hr { margin-top: 0.5rem; margin-bottom: 0.5rem; } -@media (min-width: 640px) { - .navbar-content hr { - display: none; - } -} - .navbar-content li > a { margin-left: 0.25rem; margin-right: 0.25rem; @@ -897,6 +856,341 @@ p a:hover { cursor: default; } +.navbar-subcontent { + position: relative; + display: inline-block; + width: 100%; + border-radius: 0.25rem; +} + +.navbar-subcontentButton { + align-items: center; +} + +.navbar-subcontentButton > :not([hidden]) ~ :not([hidden]) { + --tw-divide-x-reverse: 0; + border-right-width: calc(1px * var(--tw-divide-x-reverse)); + border-left-width: calc(1px * calc(1 - var(--tw-divide-x-reverse))); + --tw-divide-opacity: 1; + border-color: rgb(191 219 254 / var(--tw-divide-opacity)); +} + +.navbar-subcontentButton { + border-radius: 0.25rem; + --tw-bg-opacity: 1; + background-color: rgb(0 85 128 / var(--tw-bg-opacity)); + --tw-text-opacity: 1; + color: rgb(239 246 255 / var(--tw-text-opacity)); +} + +@media (prefers-color-scheme: dark) { + .navbar-subcontentButton > :not([hidden]) ~ :not([hidden]) { + --tw-divide-opacity: 1; + border-color: rgb(0 139 209 / var(--tw-divide-opacity)); + } +} + +.navbar-subcontentButton a { + display: none; +} + +.navbar-subcontentList { + top: 2.25rem; + right: 0px; + z-index: 20; + width: 100%; + --tw-bg-opacity: 1; + background-color: rgb(255 255 255 / var(--tw-bg-opacity)); +} + +@media (prefers-color-scheme: dark) { + .navbar-subcontentList { + background-color: transparent; + } +} + +@media (min-width: 640px) { + .navBar-sm > div { + flex-direction: row; + justify-content: space-between; + } + + .navBar-sm .navbar-toggle { + right: 0px; + display: none; + } + + .navBar-sm .navbar-content { + margin-bottom: 0px; + display: block; + width: auto; + align-self: center; + font-size: 1.125rem; + line-height: 1.75rem; + } + + .navBar-sm .navbar-content > hr { + display: none; + } + + .navBar-sm .navbar-content > li { + display: inline-block; + } +} + +.navBar-sm .navbar-subcontent { + width: auto; +} + +@media (min-width: 640px) { + .navBar-sm .navbar-subcontentButton { + display: inline-flex; + } +} + +.navBar-sm .navbar-subcontentButton a { + padding-left: 0.5rem; + padding-right: 0.5rem; + padding-top: 0.25rem; + padding-bottom: 0.25rem; +} + +.navBar-sm .navbar-subcontentButton a:hover { + --tw-bg-opacity: 1; + background-color: rgb(0 85 128 / var(--tw-bg-opacity)); +} + +.navBar-sm .navbar-subcontentButton a:active { + --tw-bg-opacity: 1; + background-color: rgb(0 85 128 / var(--tw-bg-opacity)); +} + +@media (prefers-color-scheme: dark) { + .navBar-sm .navbar-subcontentButton a:hover { + --tw-bg-opacity: 1; + background-color: rgb(0 68 102 / var(--tw-bg-opacity)); + } + + .navBar-sm .navbar-subcontentButton a:active { + --tw-bg-opacity: 1; + background-color: rgb(0 68 102 / var(--tw-bg-opacity)); + } +} + +@media (min-width: 640px) { + .navBar-sm .navbar-subcontentButton a { + display: block; + } + + .navBar-sm .navbar-subcontentList { + position: absolute; + display: block; + border-radius: 0.25rem; + --tw-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1); + --tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color), 0 2px 4px -2px var(--tw-shadow-color); + box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); + } +} + +@media (prefers-color-scheme: dark) { + @media (min-width: 640px) { + .navBar-sm .navbar-subcontentList { + --tw-bg-opacity: 1; + background-color: rgb(55 65 81 / var(--tw-bg-opacity)); + --tw-text-opacity: 1; + color: rgb(102 204 255 / var(--tw-text-opacity)); + } + } +} + +@media (min-width: 768px) { + .navBar-md > div { + flex-direction: row; + justify-content: space-between; + } + + .navBar-md .navbar-toggle { + right: 0px; + display: none; + } + + .navBar-md .navbar-content { + margin-bottom: 0px; + display: block; + width: auto; + align-self: center; + font-size: 1.125rem; + line-height: 1.75rem; + } + + .navBar-md .navbar-content > hr { + display: none; + } + + .navBar-md .navbar-content > li { + display: inline-block; + } +} + +.navBar-md .navbar-subcontent { + width: auto; +} + +@media (min-width: 768px) { + .navBar-md .navbar-subcontentButton { + display: inline-flex; + } +} + +.navBar-md .navbar-subcontentButton a { + padding-left: 0.5rem; + padding-right: 0.5rem; + padding-top: 0.25rem; + padding-bottom: 0.25rem; +} + +.navBar-md .navbar-subcontentButton a:hover { + --tw-bg-opacity: 1; + background-color: rgb(0 85 128 / var(--tw-bg-opacity)); +} + +.navBar-md .navbar-subcontentButton a:active { + --tw-bg-opacity: 1; + background-color: rgb(0 85 128 / var(--tw-bg-opacity)); +} + +@media (prefers-color-scheme: dark) { + .navBar-md .navbar-subcontentButton a:hover { + --tw-bg-opacity: 1; + background-color: rgb(0 68 102 / var(--tw-bg-opacity)); + } + + .navBar-md .navbar-subcontentButton a:active { + --tw-bg-opacity: 1; + background-color: rgb(0 68 102 / var(--tw-bg-opacity)); + } +} + +@media (min-width: 768px) { + .navBar-md .navbar-subcontentButton a { + display: block; + } + + .navBar-md .navbar-subcontentList { + position: absolute; + display: block; + border-radius: 0.25rem; + --tw-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1); + --tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color), 0 2px 4px -2px var(--tw-shadow-color); + box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); + } +} + +@media (prefers-color-scheme: dark) { + @media (min-width: 768px) { + .navBar-md .navbar-subcontentList { + --tw-bg-opacity: 1; + background-color: rgb(55 65 81 / var(--tw-bg-opacity)); + --tw-text-opacity: 1; + color: rgb(102 204 255 / var(--tw-text-opacity)); + } + } +} + +@media (min-width: 1024px) { + .navBar-lg > div { + flex-direction: row; + justify-content: space-between; + } + + .navBar-lg .navbar-toggle { + right: 0px; + display: none; + } + + .navBar-lg .navbar-content { + margin-bottom: 0px; + display: block; + width: auto; + align-self: center; + font-size: 1.125rem; + line-height: 1.75rem; + } + + .navBar-lg .navbar-content > hr { + display: none; + } + + .navBar-lg .navbar-content > li { + display: inline-block; + } +} + +.navBar-lg .navbar-subcontent { + width: auto; +} + +@media (min-width: 1024px) { + .navBar-lg .navbar-subcontentButton { + display: inline-flex; + } +} + +.navBar-lg .navbar-subcontentButton a { + padding-left: 0.5rem; + padding-right: 0.5rem; + padding-top: 0.25rem; + padding-bottom: 0.25rem; +} + +.navBar-lg .navbar-subcontentButton a:hover { + --tw-bg-opacity: 1; + background-color: rgb(0 85 128 / var(--tw-bg-opacity)); +} + +.navBar-lg .navbar-subcontentButton a:active { + --tw-bg-opacity: 1; + background-color: rgb(0 85 128 / var(--tw-bg-opacity)); +} + +@media (prefers-color-scheme: dark) { + .navBar-lg .navbar-subcontentButton a:hover { + --tw-bg-opacity: 1; + background-color: rgb(0 68 102 / var(--tw-bg-opacity)); + } + + .navBar-lg .navbar-subcontentButton a:active { + --tw-bg-opacity: 1; + background-color: rgb(0 68 102 / var(--tw-bg-opacity)); + } +} + +@media (min-width: 1024px) { + .navBar-lg .navbar-subcontentButton a { + display: block; + } + + .navBar-lg .navbar-subcontentList { + position: absolute; + display: block; + border-radius: 0.25rem; + --tw-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1); + --tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color), 0 2px 4px -2px var(--tw-shadow-color); + box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); + } +} + +@media (prefers-color-scheme: dark) { + @media (min-width: 1024px) { + .navBar-lg .navbar-subcontentList { + --tw-bg-opacity: 1; + background-color: rgb(55 65 81 / var(--tw-bg-opacity)); + --tw-text-opacity: 1; + color: rgb(102 204 255 / var(--tw-text-opacity)); + } + } +} + /***** PAGE-TITLE *****/ .page-title { @@ -2341,14 +2635,6 @@ footer .copyright { position: sticky; } -.top-9 { - top: 2.25rem; -} - -.right-0 { - right: 0px; -} - .top-0 { top: 0px; } @@ -2365,6 +2651,10 @@ footer .copyright { right: 1rem; } +.right-0 { + right: 0px; +} + .top-1\/2 { top: 50%; } @@ -2373,10 +2663,6 @@ footer .copyright { top: 1rem; } -.z-20 { - z-index: 20; -} - .z-10 { z-index: 10; } @@ -2385,6 +2671,10 @@ footer .copyright { z-index: 0; } +.z-20 { + z-index: 20; +} + .z-30 { z-index: 30; } @@ -2405,12 +2695,12 @@ footer .copyright { margin: -1rem; } -.m-2 { - margin: 0.5rem; +.-m-3 { + margin: -0.75rem; } -.m-1 { - margin: 0.25rem; +.-m-1 { + margin: -0.25rem; } .mx-auto { @@ -2458,11 +2748,6 @@ footer .copyright { margin-bottom: 1rem; } -.mx-2 { - margin-left: 0.5rem; - margin-right: 0.5rem; -} - .mr-2 { margin-right: 0.5rem; } @@ -2603,10 +2888,6 @@ footer .copyright { height: 0.75rem; } -.h-8 { - height: 2rem; -} - .h-7 { height: 1.75rem; } @@ -2619,6 +2900,22 @@ footer .copyright { height: 11rem; } +.h-6 { + height: 1.5rem; +} + +.h-12 { + height: 3rem; +} + +.h-16 { + height: 4rem; +} + +.h-8 { + height: 2rem; +} + .min-h-screen { min-height: 100vh; } @@ -2677,6 +2974,18 @@ footer .copyright { width: 12rem; } +.w-6 { + width: 1.5rem; +} + +.w-8 { + width: 2rem; +} + +.w-10 { + width: 2.5rem; +} + .max-w-prose { max-width: 65ch; } @@ -2974,10 +3283,6 @@ footer .copyright { gap: 1.5rem; } -.gap-8 { - gap: 2rem; -} - .gap-y-8 { row-gap: 2rem; } @@ -3009,17 +3314,6 @@ footer .copyright { column-gap: 1rem; } -.gap-x-1 { - -moz-column-gap: 0.25rem; - column-gap: 0.25rem; -} - -.divide-x > :not([hidden]) ~ :not([hidden]) { - --tw-divide-x-reverse: 0; - border-right-width: calc(1px * var(--tw-divide-x-reverse)); - border-left-width: calc(1px * calc(1 - var(--tw-divide-x-reverse))); -} - .divide-y > :not([hidden]) ~ :not([hidden]) { --tw-divide-y-reverse: 0; border-top-width: calc(1px * calc(1 - var(--tw-divide-y-reverse))); @@ -3032,9 +3326,10 @@ footer .copyright { border-bottom-width: calc(2px * var(--tw-divide-y-reverse)); } -.divide-blue-200 > :not([hidden]) ~ :not([hidden]) { - --tw-divide-opacity: 1; - border-color: rgb(191 219 254 / var(--tw-divide-opacity)); +.divide-x > :not([hidden]) ~ :not([hidden]) { + --tw-divide-x-reverse: 0; + border-right-width: calc(1px * var(--tw-divide-x-reverse)); + border-left-width: calc(1px * calc(1 - var(--tw-divide-x-reverse))); } .divide-gray-300 > :not([hidden]) ~ :not([hidden]) { @@ -3152,16 +3447,6 @@ footer .copyright { border-color: rgb(229 231 235 / var(--tw-border-opacity)); } -.bg-proprietary-dark { - --tw-bg-opacity: 1; - background-color: rgb(0 85 128 / var(--tw-bg-opacity)); -} - -.bg-white { - --tw-bg-opacity: 1; - background-color: rgb(255 255 255 / var(--tw-bg-opacity)); -} - .bg-blue-200 { --tw-bg-opacity: 1; background-color: rgb(191 219 254 / var(--tw-bg-opacity)); @@ -3172,6 +3457,11 @@ footer .copyright { background-color: rgb(0 0 0 / var(--tw-bg-opacity)); } +.bg-white { + --tw-bg-opacity: 1; + background-color: rgb(255 255 255 / var(--tw-bg-opacity)); +} + .bg-proprietary-darker { --tw-bg-opacity: 1; background-color: rgb(0 68 102 / var(--tw-bg-opacity)); @@ -3192,11 +3482,6 @@ footer .copyright { background-color: rgb(2 132 199 / var(--tw-bg-opacity)); } -.bg-red-300 { - --tw-bg-opacity: 1; - background-color: rgb(252 165 165 / var(--tw-bg-opacity)); -} - .bg-gray-800 { --tw-bg-opacity: 1; background-color: rgb(31 41 55 / var(--tw-bg-opacity)); @@ -3298,11 +3583,6 @@ footer .copyright { padding-right: 1rem; } -.px-2 { - padding-left: 0.5rem; - padding-right: 0.5rem; -} - .py-1 { padding-top: 0.25rem; padding-bottom: 0.25rem; @@ -3328,6 +3608,11 @@ footer .copyright { padding-bottom: 0px; } +.px-2 { + padding-left: 0.5rem; + padding-right: 0.5rem; +} + .py-4 { padding-top: 1rem; padding-bottom: 1rem; @@ -3475,11 +3760,6 @@ footer .copyright { color: rgb(234 179 8 / var(--tw-text-opacity)); } -.text-blue-50 { - --tw-text-opacity: 1; - color: rgb(239 246 255 / var(--tw-text-opacity)); -} - .text-gray-700 { --tw-text-opacity: 1; color: rgb(55 65 81 / var(--tw-text-opacity)); @@ -3505,6 +3785,11 @@ footer .copyright { color: rgb(156 163 175 / var(--tw-text-opacity)); } +.text-blue-50 { + --tw-text-opacity: 1; + color: rgb(239 246 255 / var(--tw-text-opacity)); +} + .text-proprietary-darker { --tw-text-opacity: 1; color: rgb(0 68 102 / var(--tw-text-opacity)); @@ -3698,11 +3983,6 @@ footer .copyright { transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y)); } -.hover\:bg-proprietary-dark:hover { - --tw-bg-opacity: 1; - background-color: rgb(0 85 128 / var(--tw-bg-opacity)); -} - .hover\:bg-gray-100:hover { --tw-bg-opacity: 1; background-color: rgb(243 244 246 / var(--tw-bg-opacity)); @@ -3786,11 +4066,6 @@ footer .copyright { --tw-ring-offset-width: 0px; } -.active\:bg-proprietary-dark:active { - --tw-bg-opacity: 1; - background-color: rgb(0 85 128 / var(--tw-bg-opacity)); -} - .group:hover .group-hover\:border-gray-500 { --tw-border-opacity: 1; border-color: rgb(107 114 128 / var(--tw-border-opacity)); @@ -3830,11 +4105,6 @@ footer .copyright { border-left-width: calc(2px * calc(1 - var(--tw-divide-x-reverse))); } - .dark\:divide-proprietary-light > :not([hidden]) ~ :not([hidden]) { - --tw-divide-opacity: 1; - border-color: rgb(0 139 209 / var(--tw-divide-opacity)); - } - .dark\:divide-gray-600 > :not([hidden]) ~ :not([hidden]) { --tw-divide-opacity: 1; border-color: rgb(75 85 99 / var(--tw-divide-opacity)); @@ -3887,10 +4157,6 @@ footer .copyright { border-color: rgb(31 41 55 / var(--tw-border-opacity)); } - .dark\:bg-transparent { - background-color: transparent; - } - .dark\:bg-proprietary-dark { --tw-bg-opacity: 1; background-color: rgb(0 85 128 / var(--tw-bg-opacity)); @@ -4015,11 +4281,6 @@ footer .copyright { color: rgb(239 68 68 / var(--tw-text-opacity)); } - .dark\:hover\:bg-proprietary-darker:hover { - --tw-bg-opacity: 1; - background-color: rgb(0 68 102 / var(--tw-bg-opacity)); - } - .dark\:hover\:bg-gray-800:hover { --tw-bg-opacity: 1; background-color: rgb(31 41 55 / var(--tw-bg-opacity)); @@ -4040,11 +4301,6 @@ footer .copyright { --tw-ring-color: rgb(3 105 161 / var(--tw-ring-opacity)); } - .dark\:active\:bg-proprietary-darker:active { - --tw-bg-opacity: 1; - background-color: rgb(0 68 102 / var(--tw-bg-opacity)); - } - .group:hover .dark\:group-hover\:border-gray-500 { --tw-border-opacity: 1; border-color: rgb(107 114 128 / var(--tw-border-opacity)); @@ -4100,10 +4356,6 @@ footer .copyright { position: static; } - .sm\:absolute { - position: absolute; - } - .sm\:sticky { position: -webkit-sticky; position: sticky; @@ -4177,10 +4429,6 @@ footer .copyright { display: flex; } - .sm\:inline-flex { - display: inline-flex; - } - .sm\:grid { display: grid; } @@ -4201,10 +4449,6 @@ footer .copyright { height: 14rem; } - .sm\:w-auto { - width: auto; - } - .sm\:w-3\/5 { width: 60%; } @@ -4217,6 +4461,10 @@ footer .copyright { width: 100%; } + .sm\:w-auto { + width: auto; + } + .sm\:w-max { width: -webkit-max-content; width: -moz-max-content; @@ -4283,11 +4531,6 @@ footer .copyright { row-gap: 1rem; } - .sm\:gap-x-2 { - -moz-column-gap: 0.5rem; - column-gap: 0.5rem; - } - .sm\:divide-y-0 > :not([hidden]) ~ :not([hidden]) { --tw-divide-y-reverse: 0; border-top-width: calc(0px * calc(1 - var(--tw-divide-y-reverse))); @@ -4308,10 +4551,6 @@ footer .copyright { overflow-y: auto; } - .sm\:rounded { - border-radius: 0.25rem; - } - .sm\:rounded-none { border-radius: 0px; } @@ -4383,12 +4622,6 @@ footer .copyright { font-weight: 500; } - .sm\:shadow-md { - --tw-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1); - --tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color), 0 2px 4px -2px var(--tw-shadow-color); - box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); - } - .sm\:shadow-lg { --tw-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1); --tw-shadow-colored: 0 10px 15px -3px var(--tw-shadow-color), 0 4px 6px -4px var(--tw-shadow-color); @@ -4413,20 +4646,6 @@ footer .copyright { } } -@media (prefers-color-scheme: dark) { - @media (min-width: 640px) { - .dark\:sm\:bg-gray-700 { - --tw-bg-opacity: 1; - background-color: rgb(55 65 81 / var(--tw-bg-opacity)); - } - - .dark\:sm\:text-proprietary-lightest { - --tw-text-opacity: 1; - color: rgb(102 204 255 / var(--tw-text-opacity)); - } - } -} - @media (min-width: 768px) { .md\:float-left { float: left; @@ -4492,6 +4711,10 @@ footer .copyright { line-height: 1.5rem; } + .md\:font-medium { + font-weight: 500; + } + .md\:text-inherit { color: inherit; } diff --git a/fet2020/templates/base.html b/fet2020/templates/base.html index 7db4270a..a6f855a9 100644 --- a/fet2020/templates/base.html +++ b/fet2020/templates/base.html @@ -4,9 +4,13 @@ {% load static %} {% block body %} -
+ -