Skip to content

Commit 1162e76

Browse files
committed
merge conlfict resolved and merged dev into main
2 parents 56e6ac6 + 7cba2f1 commit 1162e76

File tree

5 files changed

+1940
-1912
lines changed

5 files changed

+1940
-1912
lines changed

README.md

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
# Simple CSS-LOADERS
22

3-
Hacktober Fest 2022, This is the website from which you can copy the code for the css-loaders and use as a template in your website.
3+
Hacktober Fest 2022, This is the website from which you can copy the code for the css-loaders and use as a template in your website.
44

55
## [Project Website Link](https://rohitgangwar.me/css-loaders/)
66

77
![Alt text](./website.png)
88

99
## How to contribute
10-
- Always add a new CSS Loader, do not repeat the Loader.
10+
11+
- Always add a new CSS Loader, do not repeat the Loader.
1112
- Make a CSS-LOADER in HTML file(index.html). [here](index.html)
1213
- Add the CSS for the your loader in the CSS file(index.css). [here](index.css)
13-
- Add the HTML Code and CSS code inside the JavaScript file(index.js) inside the codes array by making the object, as shown in the index.js file. [here](index.js)
14+
- Add the HTML Code and CSS code inside the JavaScript file(codes.js) inside the codes array by making the object, as shown in the codes.js file. [here](codes.js)
15+
1416
### Fork this repository
1517

1618
Fork this repository by clicking on the fork button on the top of this page. This will create a copy of this repository in your account.
@@ -19,8 +21,9 @@ Fork this repository by clicking on the fork button on the top of this page. Thi
1921

2022
Now clone the forked repository to your system. Go to your GitHub account, open the forked repository, click on the code button and then clone the repository.
2123

22-
*if you want to use the terminal, use the following commands*
24+
_if you want to use the terminal, use the following commands_
2325
after you fork the repository , open the terminal type the given command
26+
2427
```
2528
git clone https://github.com/{your-github-username}/css-loaders.git
2629
@@ -30,7 +33,8 @@ git clone https://github.com/{your-github-username}/css-loaders.git
3033

3134
Then create a branch on your local repository to solve a problem.
3235

33-
*terminal commands*
36+
_terminal commands_
37+
3438
```
3539
git checkout -b your_new_branch_name
3640
@@ -40,9 +44,10 @@ git checkout -b your_new_branch_name
4044

4145
Add your changes(folder) to that branch. <br/>
4246
Make necessary changes and commit those changes. <br/>
43-
*Add your name in contributors list in `readme.md`*
47+
_Add your name in contributors list in `readme.md`_
48+
49+
_terminal commands_
4450

45-
*terminal commands*
4651
```
4752
git add .
4853
git commit -m "your-commit-message"
@@ -54,7 +59,8 @@ git commit -m "your-commit-message"
5459
Finally push your local repository to remote repository
5560
Compare & Submit a Pull Request
5661

57-
*terminal commands*
62+
_terminal commands_
63+
5864
```
5965
git push origin <branch-name>
6066
@@ -69,10 +75,10 @@ Now submit the pull request.
6975
If you had fun while contributing to this project, then don't forget to give this project a star ⭐.
7076

7177
## Contributors:
78+
7279
- [Rohit Gangwar](https://github.com/rohit8020)
7380
- [NahushSingh](https://github.com/NahushSingh)
7481
- [Sachin Gupta](https://github.com/sachingupta63)
7582
- [Abhay Gupta](https://github.com/abhaygupta08)
7683

7784
### Thanks for your contribution
78-

0 commit comments

Comments
 (0)