diff --git a/taccsite_cms/remote_cms_auth.py b/taccsite_cms/remote_cms_auth.py index 4e767d795..8c35b2574 100644 --- a/taccsite_cms/remote_cms_auth.py +++ b/taccsite_cms/remote_cms_auth.py @@ -3,6 +3,8 @@ from django.contrib.auth.backends import ModelBackend from django.contrib.auth import get_user_model from django.contrib import auth as auth +from django.utils.module_loading import import_string +from django.contrib.auth.backends import RemoteUserBackend import requests import logging from django.conf import settings @@ -11,6 +13,8 @@ logger = logging.getLogger(__name__) +def load_backend(path): + return import_string(path)() def verify_and_auth(request): user = auth.authenticate(request) diff --git a/taccsite_cms/static/site_cms/css/src/_imports/elements/html-elements.css b/taccsite_cms/static/site_cms/css/src/_imports/elements/html-elements.css index 0cbe61e34..27b1ee999 100755 --- a/taccsite_cms/static/site_cms/css/src/_imports/elements/html-elements.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/elements/html-elements.css @@ -32,7 +32,7 @@ body { min-width: env(--body-min-width); /* To overwrite Bootstrap */ - color: var(--global-color-primary--dark); + color: var(--global-color-primary--x-dark); font-family: var(--global-font-family); font-size: var(--global-font-size--medium); line-height: 1.4; diff --git a/taccsite_cms/static/site_cms/css/src/_imports/objects/o-section.css b/taccsite_cms/static/site_cms/css/src/_imports/objects/o-section.css index 0edb6057e..11ba3c1bd 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/objects/o-section.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/objects/o-section.css @@ -66,12 +66,6 @@ Styleguide Objects.Section gap: 0 !important; /* overwrite `o-section--layout-*` */ } -/* To take control of padding away from Bootstrap on ALL screen sizes */ -.o-section--banner.container, -.o-section--banner.container-fluid { - padding-left: 0; - padding-right: 0; -} @@ -161,7 +155,10 @@ Styleguide Objects.Section .o-section--layout-b, .o-section--layout-c, .o-section--layout-d { - gap: 3.0rem; /* GH-99: Use standard spacing value */ + /* GH-99: Use standard spacing value */ + --gap: 3.0rem; /* to allow instances to re-use the gap value */ + + gap: var(--gap); } .o-section--layout-a { @extend .x-layout--a; } .o-section--layout-b { @extend .x-layout--b; } @@ -205,28 +202,6 @@ Styleguide Objects.Section .o-section--banner .o-section__banner-overlay { position: relative; z-index: 2; - - /* Avoids the need to add placeholder markup for empty column */ - /* FAQ: The image "leaves" the column via `position: absolute` */ - grid-column-start: 2; - - @supports (backdrop-filter: none) { - & { - background-color: rgba(var(--color-bkgd-rgb), 0.65); - backdrop-filter: blur(6px); - } - } - @supports not (backdrop-filter: none) { - & { - background-color: rgba(var(--color-bkgd-rgb), 0.95); - } - } -} -.o-section--banner.o-section--style-dark .o-section__banner-overlay { - --color-bkgd-rgb: var(--global-color-primary--x-dark-rgb); -} -.o-section--banner.o-section--style-light .o-section__banner-overlay { - --color-bkgd-rgb: var(--global-color-primary--x-light-rgb); } diff --git a/taccsite_cms/static/site_cms/css/src/_imports/settings/color.css b/taccsite_cms/static/site_cms/css/src/_imports/settings/color.css index c7a7c3bd5..730d53272 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/settings/color.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/settings/color.css @@ -20,6 +20,7 @@ /* Primary (Text, Layout) */ --global-color-primary--xx-light: #FFFFFF; + --global-color-primary--xx-light-rgb: 255, 255, 255; --global-color-primary--x-light: #F4F4F4; --global-color-primary--x-light-rgb: 244, 244, 244; --global-color-primary--light: #C6C6C6; @@ -28,6 +29,7 @@ --global-color-primary--x-dark: #484848; --global-color-primary--x-dark-rgb: 72, 72, 72; --global-color-primary--xx-dark: #222222; + --global-color-primary--xx-dark-rgb: 34, 34, 34; /* Distinct Hues */ diff --git a/taccsite_cms/static/site_cms/css/src/_imports/tools/x-layout.css b/taccsite_cms/static/site_cms/css/src/_imports/tools/x-layout.css index f88b02201..4ec5c0f8e 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/tools/x-layout.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/tools/x-layout.css @@ -11,6 +11,7 @@ Styles that allow re-usable layouts. Styleguide Tools.ExtendsAndMixins.Layout */ +@import url("_imports/tools/media-queries.css"); @@ -42,7 +43,7 @@ Styleguide Tools.ExtendsAndMixins.Layout @media (--medium-and-below) { .x-layout--b, /* DEPRECATED */ - %x-layout--b { grid-template-columns: 1fr; } + %x-layout--b { grid-template-columns: minmax(0,1fr); } } @media (--medium-and-above) { .x-layout--b, /* DEPRECATED */ @@ -53,7 +54,7 @@ Styleguide Tools.ExtendsAndMixins.Layout @media (--medium-and-below) { .x-layout--c, /* DEPRECATED */ - %x-layout--c { grid-template-columns: 1fr; } + %x-layout--c { grid-template-columns: minmax(0,1fr); } } @media (--medium-and-above) { .x-layout--c, /* DEPRECATED */ diff --git a/taccsite_cms/static/site_cms/css/src/_imports/tools/x-overlay.css b/taccsite_cms/static/site_cms/css/src/_imports/tools/x-overlay.css new file mode 100644 index 000000000..0a7cba434 --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_imports/tools/x-overlay.css @@ -0,0 +1,43 @@ +/* +Overlay + +Colored boxes that appear atop a large image (like a banner). + +%x-overlay--curtain - A full size transluscent curtain over the background +%x-overlay--callout - A transluscent box surrounding the content + +Styleguide Tools.ExtendsAndMixins.Overlay +*/ + +.x-overlay--curtain { + --color-text: inherit; + --color-bkgd-rgb: var(--global-color-primary--normal); + + color: var(--color-text); + + @supports (-webkit-backdrop-filter: none) { + & { + background-color: rgba(var(--color-bkgd-rgb), 0.65); + -webkit-backdrop-filter: blur(6px); + } + } + @supports (backdrop-filter: none) { + & { + background-color: rgba(var(--color-bkgd-rgb), 0.65); + backdrop-filter: blur(6px); + } + } + @supports not (backdrop-filter: none) and not (backdrop-filter: none) { + & { + background-color: rgba(var(--color-bkgd-rgb), 0.95); + } + } +} + +.x-overlay--callout { + --color-text: inherit; + --color-bkgd-rgb: var(--global-color-primary--normal); + + color: var(--color-text); + background-color: rgba(var(--color-bkgd-rgb), 0.90); +} diff --git a/taccsite_cms/static/site_cms/css/src/_imports/trumps/s-inline-dl.css b/taccsite_cms/static/site_cms/css/src/_imports/trumps/s-inline-dl.css index dd3b102e1..8b42822fb 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/trumps/s-inline-dl.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/trumps/s-inline-dl.css @@ -19,6 +19,8 @@ dl.s-inline-dl dt { /* Remove space between
and
(from our styles) */ /* SEE: ../elments/html-elements.html */ margin-bottom: 0; + + font-weight: var(--bold); } dl.s-inline-dl dd { clear: right; diff --git a/taccsite_custom b/taccsite_custom index 88b4999a3..51947d45a 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit 88b4999a3679ef7ad7d15667d993dc253bd14ec6 +Subproject commit 51947d45a14450e359b99680d891d08a0d69057b