Skip to content

Commit a1b3536

Browse files
authored
Merge branch 'master' into fix-bug
2 parents 44e547b + c844bd5 commit a1b3536

File tree

3 files changed

+196
-9
lines changed

3 files changed

+196
-9
lines changed
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
### Description of Changes
2+
- [ ] I have tested my changes on **both desktop and mobile views**.
3+
- [ ] Screenshots are attached below for desktop and mobile layouts.
4+
5+
### Screenshots
6+
**Before Changes** (if applicable):
7+
- Desktop:
8+
![Desktop Before](url-to-desktop-screenshot)
9+
- Mobile:
10+
![Mobile Before](url-to-mobile-screenshot)
11+
12+
**After Changes**:
13+
- Desktop:
14+
![Desktop After](url-to-desktop-screenshot)
15+
- Mobile:
16+
![Mobile After](url-to-mobile-screenshot)
17+
18+
### How to Test Responsiveness
19+
- Use your browser’s **Developer Tools** (e.g., Chrome/Firefox) to toggle mobile views:
20+
1. Right-click → **Inspect** → Click the **Device Toolbar** icon.
21+
2. Select a mobile device (e.g., iPhone 12) or set a custom screen size.

README.md

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,23 @@ yarn build
7878

7979
This command generates static content into the `build` directory and can be served using any static contents hosting service.
8080

81-
## Adding Content
81+
## Contributing
8282

8383
This describes how to add or modify the Website's content.
8484

85+
This is an open source project and contributions are what make an open source community.
86+
Everyone is welcome to contribute to this project.
87+
88+
All involved are expected to follow the [PEcAn code of conduct](https://pecanproject.github.io/pecan-documentation/master/contributor-covenant-code-of-conduct.html) and contribute to a positive and inclusive environment.
89+
90+
First time contributors are welcome. Contributions can be very simple, make sure to check out issues labeled ['good first issue'](https://github.com/PecanProject/PecanProject.github.io/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22good%20first%20issue%22). If you have an idea, the best place to start a discussion is on the PEcAn project Slack channel, or by opening an issue in this repository.
91+
92+
Changes to `package-lock.json` and `yarn.lock` files should only be committed when:
93+
94+
- Adding a new dependency: Installing a new package will modify these lock files to ensure the exact version is documented.
95+
- Updating an existing dependency: Running an update for a package will adjust these files to reflect the new versions.
96+
- Removing a dependency: Uninstalling a package will update these files to remove the reference to the dependency.
97+
8598
### Add or Edit Feature Cards
8699

87100
Feature Cards on the website homepage highlight the key features of the PEcAn Project.
@@ -172,14 +185,6 @@ This section contains screenshots of website's homepage in light and dark theme.
172185

173186
![DarkTheme](screenshots/dark.png)
174187

175-
## Contributing
176-
177-
This is an open source project and contributions are what make an open source community.
178-
Everyone is welcome to contribute to this project.
179-
All involved are expected to follow the [PEcAn code of conduct](https://pecanproject.github.io/pecan-documentation/master/contributor-covenant-code-of-conduct.html) and contribute to a positive and inclusive environment.
180-
181-
First time contributors are welcome. Contributions can be very simple, make sure to check out beginner friendly issues, if present.
182-
183188
## Next Steps
184189

185190
This section contains future plans for the website. New contributors can use this section as a reference for planning their contributions.

src/pages/documentation.js

Lines changed: 161 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,167 @@ function Documentation() {
199199
</a>
200200
</p>
201201
</div>
202+
=======
203+
function gsoc() {
204+
return (
205+
<Layout title="documentation">
206+
<div className={styles.aboutContainer}>
207+
<div className={clsx(styles.cardContainer)}>
208+
{" "}
209+
<div class={clsx("card-demo", styles.aboutCard)}>
210+
<div class="card">
211+
<div class="card__header" style={{ textAlign: "center" }}>
212+
213+
<h3 class="text-dark margin-bottom-30 margin-top-60 margin-m-top-30 text-size-20 text-m-size-16 text-line-height-1">Latest Release Documentation</h3>
214+
</div>
215+
<div class="card__body">
216+
<p>
217+
<a href="documentation/master" class="text-size-20 text-m-size-16" ><u>Documentation consistent with latest release (MASTER BRANCH).</u></a>
218+
</p>
219+
</div>
220+
</div>
221+
</div>
222+
</div>
223+
<div className={clsx(styles.cardContainer)}>
224+
{" "}
225+
<div class={clsx("card-demo", styles.aboutCard)}>
226+
<div class="card">
227+
<div class="card__header" style={{ textAlign: "center" }}>
228+
229+
<h3 class="text-dark margin-bottom-30 margin-top-30 margin-m-top-30 text-size-20 text-m-size-16 text-line-height-1">Latest Code Documentation</h3>
230+
231+
</div>
232+
<div class="card__body">
233+
<p>
234+
<a href="documentation/develop" class="text-size-20 text-m-size-16" ><u>Documentation consistent with latest stable code (DEVELOP BRANCH).</u></a>
235+
</p>
236+
</div>
237+
</div>
238+
</div>
239+
</div>
240+
<div className={clsx(styles.cardContainer)}>
241+
{" "}
242+
<div class={clsx("card-demo", styles.aboutCard)}>
243+
<div class="card">
244+
<div class="card__header" style={{ textAlign: "center" }}>
245+
246+
<h3 class="text-dark margin-bottom-30 margin-top-60 margin-m-top-30 text-size-20 text-m-size-16 text-line-height-1">Release V1.7.1</h3>
247+
248+
</div>
249+
<div class="card__body">
250+
<p>
251+
<a href="https://pecanproject.github.io/pecan-documentation/v1.7.1" class="text-size-20 text-m-size-16" ><u>Documentation consistent with release 1.7.1</u></a>
252+
</p>
253+
</div>
254+
</div>
255+
</div>
256+
</div>
257+
<div className={clsx(styles.cardContainer)}>
258+
{" "}
259+
<div class={clsx("card-demo", styles.aboutCard)}>
260+
<div class="card">
261+
<div class="card__header" style={{ textAlign: "center" }}>
262+
263+
<h3 class="text-dark margin-bottom-30 margin-top-60 margin-m-top-30 text-size-20 text-m-size-16 text-line-height-1">Release V1.7.0</h3>
264+
265+
</div>
266+
<div class="card__body">
267+
<p>
268+
<a href="https://pecanproject.github.io/pecan-documentation/1.7.0" class="text-size-20 text-m-size-16" ><u>Documentation consistent with release 1.7.0</u></a>
269+
</p>
270+
</div>
271+
</div>
272+
</div>
273+
</div>
274+
<div className={clsx(styles.cardContainer)}>
275+
{" "}
276+
<div class={clsx("card-demo", styles.aboutCard)}>
277+
<div class="card">
278+
<div class="card__header" style={{ textAlign: "center" }}>
279+
280+
<h3 class="text-dark margin-bottom-30 margin-top-60 margin-m-top-30 text-size-20 text-m-size-16 text-line-height-1">Release V1.6.0</h3>
281+
282+
</div>
283+
<div class="card__body">
284+
<p>
285+
<a href="https://pecanproject.github.io/pecan-documentation/v1.6.0" class="text-size-20 text-m-size-16" ><u>Documentation consistent with release 1.6.0</u></a>
286+
</p>
287+
</div>
288+
</div>
289+
</div>
290+
</div>
291+
<div className={clsx(styles.cardContainer)}>
292+
{" "}
293+
<div class={clsx("card-demo", styles.aboutCard)}>
294+
<div class="card">
295+
<div class="card__header" style={{ textAlign: "center" }}>
296+
297+
<h3 class="text-dark margin-bottom-30 margin-top-60 margin-m-top-30 text-size-20 text-m-size-16 text-line-height-1">Release V1.5.3</h3>
298+
299+
</div>
300+
<div class="card__body">
301+
<p>
302+
<a href="https://pecanproject.github.io/pecan-documentation/v1.5.3" class="text-size-20 text-m-size-16" ><u>Documentation consistent with release 1.5.3</u></a>
303+
</p>
304+
</div>
305+
</div>
306+
</div>
307+
</div>
308+
<div className={clsx(styles.cardContainer)}>
309+
{" "}
310+
<div class={clsx("card-demo", styles.aboutCard)}>
311+
<div class="card">
312+
<div class="card__header" style={{ textAlign: "center" }}>
313+
314+
315+
<h3 class="text-dark margin-bottom-30 margin-top-60 margin-m-top-30 text-size-20 text-m-size-16 text-line-height-1">Release V1.5.1</h3>
316+
317+
</div>
318+
<div class="card__body">
319+
<p>
320+
<a href="https://pecanproject.github.io/pecan-documentation/v1.5.1" class="text-size-20 text-m-size-16" ><u>Documentation consistent with release 1.5.1</u></a>
321+
</p>
322+
</div>
323+
</div>
324+
</div>
325+
</div>
326+
<div className={clsx(styles.cardContainer)}>
327+
{" "}
328+
<div class={clsx("card-demo", styles.aboutCard)}>
329+
<div class="card">
330+
<div class="card__header" style={{ textAlign: "center" }}>
331+
332+
333+
<h3 class="text-dark margin-bottom-30 margin-top-60 margin-m-top-30 text-size-20 text-m-size-16 text-line-height-1">Release V1.5.0</h3>
334+
335+
</div>
336+
<div class="card__body">
337+
<p>
338+
<a href="https://pecanproject.github.io/pecan-documentation/1.5.0" class="text-size-20 text-m-size-16" ><u>Documentation consistent with release 1.5.0</u></a>
339+
340+
</p>
341+
</div>
342+
</div>
343+
</div>
344+
</div>
345+
346+
<div className={clsx(styles.cardContainer)}>
347+
{" "}
348+
<div class={clsx("card-demo", styles.aboutCard)}>
349+
<div class="card">
350+
<div class="card__header" style={{ textAlign: "center" }}>
351+
352+
<h3 class="text-dark margin-bottom-30 margin-top-60 margin-m-top-30 text-size-20 text-m-size-16 text-line-height-1">Release V1.4.10.1</h3>
353+
354+
</div>
355+
<div class="card__body">
356+
<p>
357+
<a href="https://pecanproject.github.io/pecan-documentation/1.4.10.1/" class="text-size-20 text-m-size-16" ><u>Documentation consistent with release 1.4.10.1</u></a>
358+
</p>
359+
</div>
360+
</div>
361+
</div>
362+
</div>
202363
</div>
203364
</div>
204365
</div>

0 commit comments

Comments
 (0)