Skip to content

Commit 2a8ee75

Browse files
rayestradarayestrada
authored
Merge pull request #22 from Bixal/dev
Major version changes 1.0.0
2 parents 038671a + 62945bc commit 2a8ee75

File tree

102 files changed

+2244
-279
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+2244
-279
lines changed

‎.editorconfig

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Drupal editor configuration normalization
2+
# @see http://editorconfig.org/
3+
4+
# This is the top-most .editorconfig file; do not search in parent directories.
5+
root = true
6+
7+
# All files.
8+
[*]
9+
end_of_line = LF
10+
indent_style = space
11+
indent_size = 2
12+
charset = utf-8
13+
trim_trailing_whitespace = true
14+
insert_final_newline = true
15+
16+
[composer.{json,lock}]
17+
indent_size = 4

‎.github/dependabot.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "npm" # See documentation for possible values
9+
directory: "/starter_theme/" # Location of package manifests
10+
schedule:
11+
interval: "weekly"
12+
labels:
13+
- "npm"
14+
- "dependencies"
15+

‎.github/pull_request_template.md

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
<!---
2+
Thank you for contributing to the Bixal Drupal USWDS theme.
3+
4+
Please keep in mind:
5+
- You can erase any part of this template
6+
that doesn't apply to your pull request (including these instructions!).
7+
8+
- You can find more information about contributing in
9+
[contributing.md](https://github.com/Bixal/bixaluswds/blob/dev/CONTRIBUTING.md)
10+
or you can reach out to us directly at [email protected].
11+
-->
12+
13+
<!---
14+
Step 1 - Title this PR with the following format:
15+
[#issue_no]: [Brief statement, in present tense, describing what this pull request solves, which will be used in the changelog]
16+
eg: "#15: Add custom template for body field"
17+
-->
18+
19+
## Related issue
20+
21+
Closes #_[issue_no]_
22+
<!--
23+
Every pull request should resolve an open issue.
24+
If no open issue exists, you can open one here:
25+
https://github.com/Bixal/bixaluswds/issues/new/choose.
26+
-->
27+
28+
## Summary
29+
30+
Insert a brief summary of the changes included in this PR and any additional information or context which may help the reviewer.
31+
32+
## Breaking change
33+
34+
Indicate if this update includes a breaking change by selecting an option below:
35+
- [ ] This IS NOT a breaking change.
36+
- [ ] :warning: This IS a breaking change.
37+
<!--
38+
Breaking changes include:
39+
- Changes or removal to existing templates
40+
- Changes or removal to existing preprocess functions
41+
- Changes or removal to existing install configuration
42+
- Changes or removal to existing theme yml files
43+
If applicable, explain what actions are required for the user to remediate the break.
44+
-->
45+
46+
## Testing and review
47+
48+
### Setup
49+
50+
1. Insert any required steps to take before beginning test.
51+
52+
### QA/Test
53+
54+
1. Insert steps to test and confirm the result resolves the issue.
55+
56+
## Checklist for the Developer
57+
58+
- [ ] A link to the issue has been included above.
59+
- [ ] No merge conflicts exist with the target branch.
60+
- [ ] Automated tests have passed on this PR.
61+
- [ ] Deployment and testing steps have been documented above, if applicable.
62+
63+
## Checklist for the Reviewers
64+
65+
- [ ] The file changes are relevant to the task objective and resolve the issue.
66+
- [ ] Code standards and best practices are followed.
67+
- [ ] QA/Test steps were successfully completed.
68+
- [ ] Applicable logs are free of errors.

‎.gitignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Ignore files generated by common IDEs.
2+
.idea
3+
.vscode
4+
5+
# Ignore OS generated files.
6+
.DS_Store*
7+
ehthumbs.db
8+
Thumbs.db
9+
._*

‎CONTRIBUTING.md

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# Contribution Guide for Bixal USWDS Drupal Theme
2+
3+
## 1. Set up your local development environment
4+
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.
5+
2. Complete the Drupal standard installation following the instructions outlined here: https://github.com/rayestrada/drupalstandard.
6+
7+
## 2. Generate child theme, install and set as default
8+
9+
### Initialize child theme using drupal theme generate function
10+
Determine what theme machine name you want to use in this example we are using `my_new_theme`.
11+
First create a `custom` directory in `themes` directory if there isn't one: `mkdir web/themes/custom`.
12+
```
13+
lando php web/core/scripts/drupal generate-theme --starterkit starter_theme my_new_theme --path themes/custom
14+
lando drush cr
15+
```
16+
17+
### Remove these lines from your custom theme .info.yml file
18+
```
19+
hidden: true
20+
starterkit: true
21+
```
22+
23+
### Install and set your custom theme as the default
24+
In this example the theme machine name is `my_new_theme`.
25+
The theme dependencies are already met in the Drupal standard installation.
26+
```
27+
lando drush theme:install my_new_theme
28+
```
29+
30+
31+
## 3. Work on an issue
32+
### Create a feature branch off `dev` for development
33+
Navigate into the base theme directory
34+
```
35+
cd web/themes/custom/bixaluswds`
36+
```
37+
Checkout the `dev` branch and pull changes
38+
```
39+
git checkout dev
40+
git pull origin
41+
```
42+
Create a new feature branch
43+
```
44+
git checkout -b issue/#-short-descriptive-label
45+
```
46+
47+
### Create a pull request
48+
Commit your file modifications and push into your fork
49+
```
50+
git push fork branch-name
51+
```
52+
Visit https://github.com/Bixal/bixaluswds/compare and create a pull request from your fork branch (source) to `Bixal:dev` (target).
53+
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.

‎README.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,4 @@ lando php web/core/scripts/drupal generate-theme --starterkit starter_theme my_n
3232
lando drush cr
3333
```
3434

35-
## Remove these lines from your custom theme info file
36-
```
37-
hidden: true
38-
starterkit: true
39-
```
40-
4135
## Install the theme dependencies and set your custom theme as the default

‎bixaluswds.breakpoints.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
bixaluswds.mobile:
2+
label: USWDS Mobile
3+
mediaQuery: ''
4+
weight: 0
5+
multipliers:
6+
- 1x
7+
group: 'Bixal USWDS'
8+
bixaluswds.tablet:
9+
label: USWDS Tablet
10+
mediaQuery: '(min-width: 640px)'
11+
weight: 1
12+
multipliers:
13+
- 1x
14+
group: 'Bixal USWDS'
15+
bixaluswds.desktop:
16+
label: USWDS Desktop
17+
mediaQuery: '(min-width: 1024px)'
18+
weight: 2
19+
multipliers:
20+
- 1x
21+
group: 'Bixal USWDS'

‎bixaluswds.info.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@ type: theme
33
description: "Drupal base theme for use with USWDS. Check the README for further instructions."
44
core_version_requirement: "^10"
55
base theme: false
6-
version: '0.0.0'
6+
version: '1.0.0'
77
hidden: true
88
dependencies:
99
- drupal:twig_tweak
1010
- drupal:twig_field_value
1111
- drupal:uswds_templates
1212
- drupal:block_content_template
13+
- drupal:breakpoint
14+
- drupal:responsive_image
15+
- drupal:focal_point
1316

1417
regions:
1518
admin: "Admin"

‎bixaluswds.theme

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77

88
require_once dirname(__FILE__) . '/preprocess/global.inc';
9+
require_once dirname(__FILE__) . '/preprocess/block.inc';
910
require_once dirname(__FILE__) . '/preprocess/form.inc';
1011
require_once dirname(__FILE__) . '/preprocess/navigation.inc';
1112
require_once dirname(__FILE__) . '/preprocess/taxonomy.inc';

‎config/install/image.style.bixal_banner_lg.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
langcode: en
2+
status: true
3+
dependencies:
4+
module:
5+
- focal_point
6+
name: bixal_banner_lg
7+
label: 'Bixal: Banner large (1280x640)'
8+
effects:
9+
4d7960b9-77d5-4377-a8da-34c652f632c2:
10+
uuid: 4d7960b9-77d5-4377-a8da-34c652f632c2
11+
id: focal_point_scale_and_crop
12+
weight: 1
13+
data:
14+
width: 1280
15+
height: 640
16+
crop_type: focal_point

0 commit comments

Comments
 (0)