Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FP-1318: Create Section Pattern via Bootstrap Container Plugin #431

Draft
wants to merge 16 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a4e636f
FP-1318: Create Section Pattern via BS4 Container
wesleyboar Jan 15, 2022
997e3c5
Merge branch 'main' into task/FP-1318-section-pattern-as-container-pl…
wesleyboar Jan 19, 2022
9309912
Merge branch 'main' into task/FP-1318-section-pattern-as-container-pl…
wesleyboar Feb 2, 2022
36392ca
Merge branch 'main' into task/FP-1318-section-pattern-as-container-pl…
wesleyboar Feb 18, 2022
4f453d0
Merge branch 'task/FP-1318-section-pattern-as-container-plugin-shortc…
wesleyboar Feb 18, 2022
39cd7a7
Merge branch 'main' into task/FP-1318-section-pattern-as-container-pl…
wesleyboar Mar 10, 2022
7fd5a67
Merge branch 'main' into task/FP-1318-section-pattern-as-container-pl…
wesleyboar Mar 22, 2022
34fa312
chore(FP-1318): lockfile update for bootstrap4
wesleyboar Mar 22, 2022
92c7f00
Merge branch 'main' into task/FP-1318-section-pattern-as-container-pl…
wesleyboar Apr 19, 2022
a98b4ed
Merge branch 'main' into task/FP-1318-section-pattern-as-container-pl…
wesleyboar Apr 24, 2022
398f426
Merge branch 'main' into task/FP-1318-section-pattern-as-container-pl…
wesleyboar May 26, 2022
62e1608
FP-1318: Use Commit from Upstream Repo, Not a Fork
wesleyboar Sep 1, 2022
1151b3d
Merge branch 'main' into task/FP-1318-section-pattern-as-container-pl…
wesleyboar Sep 1, 2022
df381d6
Merge branch 'main' into task/FP-1318-section-pattern-as-container-pl…
wesleyboar Nov 13, 2023
994970f
chore: revert indepndent change
wesleyboar Nov 13, 2023
ed6aaf4
chore: revert poetry.lock also
wesleyboar Nov 13, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion requirements.txt
Expand Up @@ -37,7 +37,11 @@ djangocms-admin-style==2.0.0
djangocms-apphook-setup==0.4.1
djangocms-attributes-field==2.0.0
djangocms-blog==1.1.1
djangocms-bootstrap4==2.0.0
# Fix description of Bootstrap Container type choice from complex setting
# TODO: After django-cms/djangocms-bootstrap4#145 merge, use official repo
# SEE: https://github.com/django-cms/djangocms-bootstrap4/pull/145
# djangocms-bootstrap4==2.0.0
git+http://git@github.com/tacc-wbomar/djangocms-bootstrap4.git@quick/grid-container-support-nested-tuple-choices#egg=djangocms-bootstrap4
djangocms-column==1.11.0
djangocms-file==3.0.0
djangocms-forms==0.2.5
Expand Down
38 changes: 38 additions & 0 deletions taccsite_cms/settings.py
Expand Up @@ -14,6 +14,8 @@
import ldap
from django_auth_ldap.config import LDAPSearch, GroupOfNamesType

from django.utils.translation import gettext_lazy as _

SECRET_KEY = 'CHANGE_ME'
def gettext(s): return s

Expand Down Expand Up @@ -432,6 +434,42 @@ def get_subdirs_as_module_names(path):
# PLUGIN SETTINGS
########################

# SEE: https://github.com/django-cms/djangocms-bootstrap4
DJANGOCMS_BOOTSTRAP4_GRID_CONTAINERS = [
(_('Container'), (
('container', _('Container')), # default
(
'container o-section o-section--style-light',
_('Fluid, Light section')
),
(
'container o-section o-section--style-dark',
_('Fluid, Dark section')
),
)),
(_('Fluid container'), (
('container-fluid', _('Fluid')), # default
(
'container-fluid o-section o-section--style-light',
_('Fluid, Light section')
),
(
'container-fluid o-section o-section--style-dark',
_('Fluid, Dark section')
),
)),
(_('No container'), (
(
'o-section o-section--style-light',
_('Fluid, Light section')
),
(
'o-section o-section--style-dark',
_('Fluid, Dark section')
),
)),
]

# https://github.com/django-cms/djangocms-style
DJANGOCMS_STYLE_CHOICES = [
# https://cep.tacc.utexas.edu/design-system/ui-patterns/o-section/
Expand Down