Skip to content

Commit

Permalink
Merge pull request #22 from Bixal/dev
Browse files Browse the repository at this point in the history
Major version changes 1.0.0
  • Loading branch information
rayestrada authored Aug 28, 2024
2 parents 038671a + 62945bc commit 2a8ee75
Show file tree
Hide file tree
Showing 102 changed files with 2,244 additions and 279 deletions.
17 changes: 17 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Drupal editor configuration normalization
# @see http://editorconfig.org/

# This is the top-most .editorconfig file; do not search in parent directories.
root = true

# All files.
[*]
end_of_line = LF
indent_style = space
indent_size = 2
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[composer.{json,lock}]
indent_size = 4
15 changes: 15 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "npm" # See documentation for possible values
directory: "/starter_theme/" # Location of package manifests
schedule:
interval: "weekly"
labels:
- "npm"
- "dependencies"

68 changes: 68 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
<!---
Thank you for contributing to the Bixal Drupal USWDS theme.
Please keep in mind:
- You can erase any part of this template
that doesn't apply to your pull request (including these instructions!).
- You can find more information about contributing in
[contributing.md](https://github.com/Bixal/bixaluswds/blob/dev/CONTRIBUTING.md)
or you can reach out to us directly at [email protected].
-->

<!---
Step 1 - Title this PR with the following format:
[#issue_no]: [Brief statement, in present tense, describing what this pull request solves, which will be used in the changelog]
eg: "#15: Add custom template for body field"
-->

## Related issue

Closes #_[issue_no]_
<!--
Every pull request should resolve an open issue.
If no open issue exists, you can open one here:
https://github.com/Bixal/bixaluswds/issues/new/choose.
-->

## Summary

Insert a brief summary of the changes included in this PR and any additional information or context which may help the reviewer.

## Breaking change

Indicate if this update includes a breaking change by selecting an option below:
- [ ] This IS NOT a breaking change.
- [ ] :warning: This IS a breaking change.
<!--
Breaking changes include:
- Changes or removal to existing templates
- Changes or removal to existing preprocess functions
- Changes or removal to existing install configuration
- Changes or removal to existing theme yml files
If applicable, explain what actions are required for the user to remediate the break.
-->

## Testing and review

### Setup

1. Insert any required steps to take before beginning test.

### QA/Test

1. Insert steps to test and confirm the result resolves the issue.

## Checklist for the Developer

- [ ] A link to the issue has been included above.
- [ ] No merge conflicts exist with the target branch.
- [ ] Automated tests have passed on this PR.
- [ ] Deployment and testing steps have been documented above, if applicable.

## Checklist for the Reviewers

- [ ] The file changes are relevant to the task objective and resolve the issue.
- [ ] Code standards and best practices are followed.
- [ ] QA/Test steps were successfully completed.
- [ ] Applicable logs are free of errors.
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Ignore files generated by common IDEs.
.idea
.vscode

# Ignore OS generated files.
.DS_Store*
ehthumbs.db
Thumbs.db
._*
53 changes: 53 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# Contribution Guide for Bixal USWDS Drupal Theme

## 1. Set up your local development environment
1. Create a forked repository from the bixaluswds repo. See https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/fork-a-repo for instructions on how to fork the repository.
2. Complete the Drupal standard installation following the instructions outlined here: https://github.com/rayestrada/drupalstandard.

## 2. Generate child theme, install and set as default

### Initialize child theme using drupal theme generate function
Determine what theme machine name you want to use in this example we are using `my_new_theme`.
First create a `custom` directory in `themes` directory if there isn't one: `mkdir web/themes/custom`.
```
lando php web/core/scripts/drupal generate-theme --starterkit starter_theme my_new_theme --path themes/custom
lando drush cr
```

### Remove these lines from your custom theme .info.yml file
```
hidden: true
starterkit: true
```

### Install and set your custom theme as the default
In this example the theme machine name is `my_new_theme`.
The theme dependencies are already met in the Drupal standard installation.
```
lando drush theme:install my_new_theme
```


## 3. Work on an issue
### Create a feature branch off `dev` for development
Navigate into the base theme directory
```
cd web/themes/custom/bixaluswds`
```
Checkout the `dev` branch and pull changes
```
git checkout dev
git pull origin
```
Create a new feature branch
```
git checkout -b issue/#-short-descriptive-label
```

### Create a pull request
Commit your file modifications and push into your fork
```
git push fork branch-name
```
Visit https://github.com/Bixal/bixaluswds/compare and create a pull request from your fork branch (source) to `Bixal:dev` (target).
Follow the PR template instructions to complete the PR. Then update the GitHub issue with a note that you have a PR ready for review.
6 changes: 0 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,4 @@ lando php web/core/scripts/drupal generate-theme --starterkit starter_theme my_n
lando drush cr
```

## Remove these lines from your custom theme info file
```
hidden: true
starterkit: true
```

## Install the theme dependencies and set your custom theme as the default
21 changes: 21 additions & 0 deletions bixaluswds.breakpoints.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
bixaluswds.mobile:
label: USWDS Mobile
mediaQuery: ''
weight: 0
multipliers:
- 1x
group: 'Bixal USWDS'
bixaluswds.tablet:
label: USWDS Tablet
mediaQuery: '(min-width: 640px)'
weight: 1
multipliers:
- 1x
group: 'Bixal USWDS'
bixaluswds.desktop:
label: USWDS Desktop
mediaQuery: '(min-width: 1024px)'
weight: 2
multipliers:
- 1x
group: 'Bixal USWDS'
5 changes: 4 additions & 1 deletion bixaluswds.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@ type: theme
description: "Drupal base theme for use with USWDS. Check the README for further instructions."
core_version_requirement: "^10"
base theme: false
version: '0.0.0'
version: '1.0.0'
hidden: true
dependencies:
- drupal:twig_tweak
- drupal:twig_field_value
- drupal:uswds_templates
- drupal:block_content_template
- drupal:breakpoint
- drupal:responsive_image
- drupal:focal_point

regions:
admin: "Admin"
Expand Down
1 change: 1 addition & 0 deletions bixaluswds.theme
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*/

require_once dirname(__FILE__) . '/preprocess/global.inc';
require_once dirname(__FILE__) . '/preprocess/block.inc';
require_once dirname(__FILE__) . '/preprocess/form.inc';
require_once dirname(__FILE__) . '/preprocess/navigation.inc';
require_once dirname(__FILE__) . '/preprocess/taxonomy.inc';
Expand Down
16 changes: 16 additions & 0 deletions config/install/image.style.bixal_banner_lg.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
langcode: en
status: true
dependencies:
module:
- focal_point
name: bixal_banner_lg
label: 'Bixal: Banner large (1280x640)'
effects:
4d7960b9-77d5-4377-a8da-34c652f632c2:
uuid: 4d7960b9-77d5-4377-a8da-34c652f632c2
id: focal_point_scale_and_crop
weight: 1
data:
width: 1280
height: 640
crop_type: focal_point
16 changes: 16 additions & 0 deletions config/install/image.style.bixal_banner_md.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
langcode: en
status: true
dependencies:
module:
- focal_point
name: bixal_banner_md
label: 'Bixal: Banner medium (960x480)'
effects:
8169038f-d05b-4690-9982-2181ee2cd32e:
uuid: 8169038f-d05b-4690-9982-2181ee2cd32e
id: focal_point_scale_and_crop
weight: 1
data:
width: 960
height: 480
crop_type: focal_point
16 changes: 16 additions & 0 deletions config/install/image.style.bixal_banner_xl.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
langcode: en
status: true
dependencies:
module:
- focal_point
name: bixal_banner_xl
label: 'Bixal: Banner x-large (1600x800)'
effects:
b80768f3-ae67-4c0e-afb9-79f120ee49a1:
uuid: b80768f3-ae67-4c0e-afb9-79f120ee49a1
id: focal_point_scale_and_crop
weight: 1
data:
width: 1600
height: 800
crop_type: focal_point
14 changes: 14 additions & 0 deletions config/install/image.style.bixal_scaled_lg.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
langcode: en
status: true
dependencies: { }
name: bixal_scaled_lg
label: 'Bixal: Scaled large (1280)'
effects:
a0962518-9cc3-414e-9225-1c691f797150:
uuid: a0962518-9cc3-414e-9225-1c691f797150
id: image_scale
weight: 1
data:
width: 1280
height: null
upscale: false
14 changes: 14 additions & 0 deletions config/install/image.style.bixal_scaled_md.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
langcode: en
status: true
dependencies: { }
name: bixal_scaled_md
label: 'Bixal: Scaled medium (960)'
effects:
89836321-33a7-46d3-9328-ef2a0061c544:
uuid: 89836321-33a7-46d3-9328-ef2a0061c544
id: image_scale
weight: 1
data:
width: 960
height: null
upscale: false
14 changes: 14 additions & 0 deletions config/install/image.style.bixal_scaled_sm.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
langcode: en
status: true
dependencies: { }
name: bixal_scaled_sm
label: 'Bixal: Scaled small (640)'
effects:
d4607d8c-1bb7-44a6-bea8-3e4953d2def5:
uuid: d4607d8c-1bb7-44a6-bea8-3e4953d2def5
id: image_scale
weight: 1
data:
width: 640
height: null
upscale: false
16 changes: 16 additions & 0 deletions config/install/image.style.bixal_social_standard.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
langcode: en
status: true
dependencies:
module:
- focal_point
name: bixal_social_standard
label: 'Bixal: Social Standard (1200x600)'
effects:
e20979d8-82fd-433a-b785-cab50d36713f:
uuid: e20979d8-82fd-433a-b785-cab50d36713f
id: focal_point_scale_and_crop
weight: 1
data:
width: 1200
height: 600
crop_type: focal_point
16 changes: 16 additions & 0 deletions config/install/image.style.bixal_square_lg.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
langcode: en
status: true
dependencies:
module:
- focal_point
name: bixal_square_lg
label: 'Bixal: Square large (1280x1280)'
effects:
eb889b46-565b-4ae2-ba44-886e461bf29a:
uuid: eb889b46-565b-4ae2-ba44-886e461bf29a
id: focal_point_scale_and_crop
weight: 1
data:
width: 1280
height: 1280
crop_type: focal_point
16 changes: 16 additions & 0 deletions config/install/image.style.bixal_square_md.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
langcode: en
status: true
dependencies:
module:
- focal_point
name: bixal_square_md
label: 'Bixal: Square medium (960x960)'
effects:
38ba02eb-a159-4879-9b87-b6008ac27618:
uuid: 38ba02eb-a159-4879-9b87-b6008ac27618
id: focal_point_scale_and_crop
weight: 1
data:
width: 960
height: 960
crop_type: focal_point
16 changes: 16 additions & 0 deletions config/install/image.style.bixal_square_sm.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
langcode: en
status: true
dependencies:
module:
- focal_point
name: bixal_square_sm
label: 'Bixal: Square small (640x640)'
effects:
b03ff1df-cb8f-43ee-83cf-8c5b1ea17e2b:
uuid: b03ff1df-cb8f-43ee-83cf-8c5b1ea17e2b
id: focal_point_scale_and_crop
weight: 1
data:
width: 640
height: 640
crop_type: focal_point
Loading

0 comments on commit 2a8ee75

Please sign in to comment.