diff --git a/taccsite_cms/_settings/form_plugin.py b/taccsite_cms/_settings/form_plugin.py index 7e42af918..8ef2c3a90 100644 --- a/taccsite_cms/_settings/form_plugin.py +++ b/taccsite_cms/_settings/form_plugin.py @@ -113,3 +113,14 @@ 'django.forms', # support form template override 'captcha', # support recaptcha for djangocms_forms ] + +######################## +# DJANGO: RECAPTCHA +######################## + +# To properly avoid client error about using test keys +# RECAPTCHA_PUBLIC_KEY = '__this_must_be_on_server_not_here__' +# RECAPTCHA_SECRET_KEY = '__this_must_be_on_server_not_here__' + +# To silence server error about using test keys +# SILENCED_SYSTEM_CHECKS = ['captcha.recaptcha_test_key_error'] diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.forms.css b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.forms.css index ddfebaba4..25a8ffc4e 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.forms.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.forms.css @@ -64,6 +64,16 @@ p.help-text:last-child { margin-bottom: 0; /* overwrite forms.css label */ } +:root { + /* TUP-271: Add to & Import from @core-styles */ + /* https://github.com/TACC/tup-ui/blob/c5454ba/libs/core-styles/src/lib/_imports/settings/color.css */ + --global-color-danger--dark: #ab1717; +} +.asterisk { + margin-left: 0.5em; + color: var(--global-color-danger--dark); +} + /* Errors */ diff --git a/taccsite_cms/static/site_cms/css/src/_imports/elements/form.css b/taccsite_cms/static/site_cms/css/src/_imports/elements/form.css index 7dbfa17b1..c0c057771 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/elements/form.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/elements/form.css @@ -35,11 +35,34 @@ fieldset:not(:last-child) { input, select, textarea { - padding: 15px 10px; border: var(--global-border--normal); } - +input:not( + [type="time"], + [type="date"], + [type="checkbox"], + [type="radio"] +), +select, +textarea { + width: 100%; +} input[type="time"], input[type="date"] { font-family: var(--global-font-family--mono); } + +@media (pointer: coarse) { + input, + select, + textarea { + padding: 15px 10px; + } +} +@media (pointer: fine), (pointer: none) { + input, + select, + textarea { + padding: 5px 10px; + } +} 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 new file mode 100644 index 000000000..a07f79142 --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_imports/settings/color.css @@ -0,0 +1,13 @@ +@import url("@tacc/core-styles/source/_imports/settings/color.css"); + +:root { + /* Accent Hues */ + --global-color-accent--x-light: #F2DFBD; /* originally #e3d7fd */ + --global-color-accent--light: #BDA374; /* originally #a387ed */ + --global-color-accent--normal: #877453; /* originally #784fe8 */ + --global-color-accent--dark: #64563E; /* originally #6039cc */ + --global-color-accent--x-dark: #403014; /* originally #3d189b */ + + --global-color-accent--alt: #E0D8C9; /* originally #d2cce7 */ + --global-color-accent--weak: #9D702140; /* originally #6039cc40 */ +} diff --git a/taccsite_cms/templates/djangocms_forms/form_template/default.html b/taccsite_cms/templates/djangocms_forms/form_template/default.html index 926588e72..0de3ac62d 100644 --- a/taccsite_cms/templates/djangocms_forms/form_template/default.html +++ b/taccsite_cms/templates/djangocms_forms/form_template/default.html @@ -24,7 +24,7 @@