Skip to content

Commit

Permalink
Challenge 1 completted, and naming convention
Browse files Browse the repository at this point in the history
  • Loading branch information
Rumen Petrov committed Mar 12, 2024
1 parent 0e00632 commit 16cb202
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 14 deletions.
8 changes: 7 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,10 @@ You could fork the project and then open PR to the upstream project. Here are co
* [How to make a pull request on an open source project](https://www.youtube.com/watch?v=8A4TsoXJOs8)

### Git, branches, naming, strategy...
TBD
The branches created for contributing to a challenge should follow this naming convention

```
challenge-$CHALLENGE_NUMBRE/$CONTRIBUTOR_NAME
# Example
challenge-1/asavov
```
1 change: 1 addition & 0 deletions PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Pull Request checklist

* [ ] My branch follows the naming convention e.g. "challenge-1/asavov"
* [ ] I am contributing single HTML file, no folders, no any other external files even icons or images. - [Image CDN](https://placehold.co/)
* [ ] My HTML is 100% valid - [HTML Validator](https://validator.w3.org/#validate_by_input)
* [ ] My code is semantic (HTML/CSS/JS)
Expand Down
13 changes: 7 additions & 6 deletions src/content/challenges/1.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,16 @@ Not available
<DocumentPreview content={rpetrovDocument} index="1" fileName="rpetrov.html" />

### Discussion topics
TBA

### Conclusions
TBA
- Type scales in typography and UI design common rules
- Collapsing margins
- Different CSS resets approaches
- Utility classes vs no classes
- Semantic meaning of figure, picture, q, blockqute, time

<Winner>
<em>TBA</em>
<em>gdespolov</em>
</Winner>

<MVP>
<em>TBA</em>
<em>gdespolov</em>
</MVP>
3 changes: 0 additions & 3 deletions src/content/challenges/2.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@ import rpetrovDocument from '/challenge-contributions/2/rpetrov.html?url&raw';
### Discussion topics
TBA

### Conclusions
TBA

<Winner>
<em>TBA</em>
</Winner>
Expand Down
8 changes: 8 additions & 0 deletions src/pages/contribution-guide.astro
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,14 @@ import { SITE_TITLE, SITE_DESCRIPTION } from '@src/consts';
<li><a href="https://www.youtube.com/watch?v=8lGpZkjnkt4">GitHub Pull Request in 100 Seconds - Git a FREE sticker</a></li>
<li><a href="https://www.youtube.com/watch?v=8A4TsoXJOs8">How to make a pull request on an open source project</a></li>
</p>

<h3>Git, branches, naming, strategy...</h3>

<p>The branches created for contributing to a challenge should follow this naming convention</p>

<p><code>challenge-$CHALLENGE_NUMBRE/$CONTRIBUTOR_NAME</code></p>

<p>For example: <code>challenge-1/asavov</code></p>
</main>
</body>
</html>
8 changes: 4 additions & 4 deletions src/pages/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ import { SITE_TITLE, SITE_DESCRIPTION } from '@src/consts';
<th>Wins</th>
<th>MVP</th>
<th>Suggested challenges</th>
<th>Total</th>
<th>Total (pts.)</th>
</tr>
</thead>
<tbody>
Expand All @@ -67,10 +67,10 @@ import { SITE_TITLE, SITE_DESCRIPTION } from '@src/consts';
</tr>
<tr>
<td>Georgi Despolov</td>
<td>1</td>
<td>1</td>
<td>0</td>
<td>0</td>
<td>0</td>
<td>0</td>
<td>4</td>
</tr>
<tr>
<td>Svetlin Markov</td>
Expand Down

0 comments on commit 16cb202

Please sign in to comment.