-
Notifications
You must be signed in to change notification settings - Fork 2
feat: update core-styles from v2.11 to v2.22 #742
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
Merged
Merged
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
7975138
feat: update Core-Styles from v2.11 to v2.19
wesleyboar 0e84245
Merge branch 'main' into feat/core-styles-v2-19-0
wesleyboar 82454ef
feat: core-styles v2.19 to v2.20
wesleyboar 77c151f
Merge branch 'main' into feat/core-styles-v2-19-0
wesleyboar 31ae1d4
Merge branch 'main' into feat/core-styles-v2-19-0
wesleyboar 6d5c52e
Merge branch 'main' into feat/core-styles-v2-19-0
wesleyboar 71a23d3
feat: core-styles v2.20 to v2.21
wesleyboar 8a4e447
Merge branch 'main' into feat/core-styles-v2-19-0
wesleyboar c532ee4
feat: core-styles v2.21.0 to v2.21.1
wesleyboar 1425891
feat: core-styles v2.21.1 to v2.21.2
wesleyboar 8ad3ecb
feat: core-styles v2.21.1 to v2.22.0
wesleyboar 71bdb4c
feat: bump core-styles & use its django-cms-forms (#678)
wesleyboar f1a608c
feat: update core-styles from v2.11 to v2.22 - misc bugs (#753)
wesleyboar fee985e
Update taccsite_cms/static/djangocms_forms/css/djangocms_forms.css
wesleyboar File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| /* SEE: ../../site_cms/css/src/_imports/django-cms-forms.css */ | ||
| /* SEE: ../../site_cms/css/src/django-cms-forms.css */ | ||
| /* FAQ: We uses future syntax that must be processed to work in the present; | ||
| and the process does not support outputting files to this directory */ | ||
24 changes: 14 additions & 10 deletions
24
taccsite_cms/static/site_cms/css/src/_imports/components/c-button.css
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,20 @@ | ||
| @import url("@tacc/core-styles/src/lib/_imports/components/c-button.selectors.css"); | ||
| @import url("@tacc/core-styles/src/lib/_imports/tools/selectors.form.css"); | ||
|
|
||
| :--c-button--primary, | ||
| :--c-button--secondary, | ||
| :--c-button--tertiary, | ||
| :--c-button--is-active { | ||
| padding: 10px 20px; | ||
|
|
||
| font-size: var(--global-font-size--small); | ||
| text-transform: uppercase; | ||
| :--main-content { | ||
| & :--c-button, | ||
| & :--form__button { | ||
| padding: 10px 20px; | ||
|
|
||
| font-size: var(--global-font-size--small); | ||
|
|
||
| font-weight: var(--bold); | ||
| letter-spacing: 0.05em; | ||
| } | ||
| } | ||
|
|
||
| :--c-button { | ||
| font-weight: var(--bold); | ||
| letter-spacing: 0.05em; | ||
| :--c-button, | ||
| :--form__button { | ||
| text-transform: uppercase; | ||
| } |
23 changes: 0 additions & 23 deletions
23
...ms/static/site_cms/css/src/_imports/components/django-cms-forms--errors-via-c-message.css
This file was deleted.
Oops, something went wrong.
175 changes: 1 addition & 174 deletions
175
taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms.css
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,174 +1 @@ | ||
| @import url("@tacc/core-styles/src/lib/_imports/components/c-button.css"); | ||
|
|
||
| @import url("./django-cms-forms.hacks.css"); | ||
| @import url("./django-cms-forms--errors-via-c-message.css"); | ||
|
|
||
|
|
||
|
|
||
| /* Title & Description */ | ||
|
|
||
| .description { | ||
| margin-block: 25px; | ||
| } | ||
|
|
||
|
|
||
|
|
||
| /* Help Text */ | ||
|
|
||
| .help-text { | ||
| font-size: var(--global-font-size--small); | ||
| font-style: italic; | ||
| } | ||
| :not( | ||
| ul, /* FAQ: Lists already have margin-bottom */ | ||
| label /* FAQ: Labels already have margin-bottom */ | ||
| ) + .help-text { | ||
| margin-top: 0.3em; /* mimic Bootstrap _reboot.css label margin-bottom */ | ||
| } | ||
| /* To prevent help text font-style from affecting any tags */ | ||
| /* FAQ: Help text can contain inline elements like <samp> */ | ||
| /* FAQ: Help text can be (ab)used to add headings between form fields */ | ||
| .help-text > :not(details, a, samp) { | ||
| font-style: initial; | ||
| } | ||
|
|
||
|
|
||
|
|
||
| /* Fields */ | ||
|
|
||
| .field-wrapper { | ||
| margin-bottom: 2rem; /* mimic <p> `margin-bottom` */ | ||
| } | ||
|
|
||
| .field-wrapper:not(.checkboxinput) { | ||
| display: flex; | ||
| flex-direction: column; | ||
| } | ||
| .field-wrapper:not(.checkboxinput) > .field-errors { | ||
| order: 1; /* i.e. move to end */ | ||
| } | ||
|
|
||
| .field-wrapper.checkboxinput { | ||
| display: inline-grid; | ||
|
|
||
| column-gap: 0.5em; | ||
| align-items: center; | ||
| grid-template-columns: min-content auto; /* shrink input, let label extend */ | ||
| grid-template-areas: | ||
| 'error _____' | ||
| 'input label' | ||
| 'notes notes'; | ||
| } | ||
| .field-wrapper.checkboxinput .field-errors { grid-area: error; } | ||
| .field-wrapper.checkboxinput input { grid-area: input; } | ||
| .field-wrapper.checkboxinput label { grid-area: label; } | ||
| .field-wrapper.checkboxinput .help-text { grid-area: notes; } | ||
| .field-wrapper.checkboxinput label { | ||
| margin-bottom: 0; /* overwrite forms.css label */ | ||
| } | ||
|
|
||
| ul.radioselect label, | ||
| ul.checkboxselectmultiple label { | ||
| display: flex; | ||
| gap: 0.5em; | ||
| align-items: center; | ||
| font-weight: revert; /* undo html-elements.cms.css */ | ||
| } | ||
| ul.radioselect li:last-child label, | ||
| ul.checkboxselectmultiple li:last-child label { | ||
| margin-bottom: 0; /* overwrite forms.css label */ | ||
| } | ||
|
|
||
| /* Field: Required, Asterisk, Important */ | ||
|
|
||
| .field-wrapper .asterisk { | ||
| margin-left: 0.5em; | ||
| } | ||
| .field-wrapper.required .asterisk { | ||
| color: var(--global-color-danger--dark); | ||
| } | ||
| .field-wrapper:not(.required) .asterisk | ||
| /* NOTE: Manual markup ONLY; form plugin can't render non-required asterisk */ { | ||
| color: var(--global-color-warning--dark); | ||
| } | ||
| /* To replace asterisk character with text */ | ||
| .field-wrapper .asterisk { | ||
| width: 0; | ||
| display: inline-block; | ||
| visibility: hidden; | ||
| line-height: 0; | ||
| } | ||
| .field-wrapper .asterisk::after { | ||
| visibility: visible; | ||
| line-height: initial; | ||
| } | ||
| .field-wrapper.required .asterisk::after { | ||
| content: '(required)'; | ||
| } | ||
| .field-wrapper:not(.required) .asterisk::after | ||
| /* NOTE: Manual markup ONLY; form plugin can't render non-required asterisk */ { | ||
| content: '(important)'; | ||
| } | ||
|
|
||
|
|
||
|
|
||
| /* Errors */ | ||
|
|
||
| .field-errors ul { | ||
| margin-top: 1rem; /* mimic ul margin-bottom */ | ||
| } | ||
| .form-errors ul, | ||
| .field-errors ul { | ||
| margin-bottom: 0; /* overwrite ul margin-bottom */ | ||
| } | ||
| .form-errors { | ||
| margin-bottom: 1rem; /* mimic ul margin-bottom */ | ||
| } | ||
|
|
||
| .form-errors ul, | ||
| .field-errors ul { | ||
| list-style: none; | ||
| padding-inline: 0; | ||
| } | ||
|
|
||
|
|
||
|
|
||
| /* Lists */ | ||
|
|
||
| ul.radioselect, | ||
| ul.checkboxselectmultiple { | ||
| list-style: none; | ||
|
|
||
| padding-left: 0; | ||
| } | ||
|
|
||
|
|
||
|
|
||
| /* Layout */ | ||
|
|
||
| .button-wrapper { | ||
| margin-top: 35px; | ||
| } | ||
|
|
||
|
|
||
|
|
||
| /* Button */ | ||
|
|
||
| /* To style obvious buttons that neglect class */ | ||
| .button-wrapper button[type="submit"] { | ||
| @extend :--c-button; | ||
| @extend :--c-button--primary; | ||
| } | ||
|
|
||
| .form-button { | ||
| @extend :--c-button; | ||
| } | ||
| .form-button[type="submit"] { | ||
| @extend :--c-button--primary; | ||
| } | ||
| .form-button:where(:not([type="submit"], [type="reset"])) { | ||
| @extend :--c-button--secondary; | ||
| } | ||
| .form-button[type="reset"] { | ||
| @extend :--c-button--tertiary; | ||
| } | ||
| @import url("@tacc/core-styles/dist/components/django-cms-forms.css"); |
48 changes: 0 additions & 48 deletions
48
taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms.hacks.css
This file was deleted.
Oops, something went wrong.
4 changes: 0 additions & 4 deletions
4
taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/config.yml
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.