Skip to content

Commit 9e6b18c

Browse files
Sakshi183Sakshi183
authored
Merge branch 'master' into autocompletion
2 parents 8bec250 + 9e2ead5 commit 9e6b18c

17 files changed

+6817
-270
lines changed

‎.github/CONTRIBUTING.md‎

Lines changed: 74 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,81 @@
22

33
> Every work is great only because of its contributors.
44
5-
Welcome to a brand new World. We are revolutionizing the way people interact with code.
6-
75
Thanks goes to these ❤️ wonderful people who made this possible.
86

97
> We made the internet and it made us vulnerable. We fought and we won. - OpenGenus
108
9+
10+
Welcome to a brand new world of algorithms. We are revolutionizing the way people interact with code.
11+
The success of our vision depends on you. Even a small contribution helps. All forms of contributions are highly welcomed and valued.
12+
You can contribute by writing code, documentation, making Quark friendly and many others. There are endless possibilities.
13+
You can suggest your own ideas and start working on them. There is an endless scope of contributions and several minor yet impactful changes are required. Feel free to discuss with us regarding anything and we will love to help you out.
14+
We aim to make the contribution process as easy and enjoyable as possible. Join OpenGenus and explore the new world.
15+
16+
These are some basic guidelines which you can refer before starting on Quark.
17+
18+
## Issue Reporting
19+
20+
The issues are used to track both bugs filed by users and specific work items for developers. Some of the basic facts to remember while reporting an issue :
21+
* Try to file one issue per problem observed.
22+
* Please specify a valid title (e.g. "Bubble Sort algorithm is not accessible" instead of "Quark does not work")
23+
* Provide more details about the issue like any link to the problem, location in the code, screenshot, error messages or any other source that could make the issue more clear.
24+
25+
**Note** : Before you start working on an issue, kindly state what you are doing specifically in the concerned issue or create a new issue. If multiple users end up making the pull request for the same task, the person who informed everyone in the issue first will be given preference.
26+
27+
## Contributing Guidelines
28+
29+
Below is an overview of how to contribute code to Quark. The basic workflow is as follows:
30+
31+
1. Fork
32+
1. Create feature branch
33+
1. Make changes
34+
1. Push changes to your fork/branch
35+
1. Create pull request
36+
1. Code review and automated testing
37+
1. Merge into master
38+
39+
### Prerequisites
40+
* Git client
41+
* GitHub account
42+
43+
### 1. Fork
44+
To fork the repository you need to have a GitHub account. Once you have an account you can click the fork button on top. Now that you have your fork you need to clone it (replace `{username}` with your GitHub username) using
45+
```
46+
git clone https://github.com/{username}/quark.git
47+
cd quark
48+
```
49+
It is useful to have the upstream repository registered as well using
50+
```
51+
git remote add upstream https://github.com/OpenGenus/quark.git
52+
```
53+
54+
### 2. Create feature branch
55+
We always work with feature branches. For example, to create and switch to branch, use:
56+
```
57+
git checkout -b {branch_name}
58+
```
59+
and replace `{branch_name}` with a meaningful name that describes your feature or change.
60+
For instance, if you are working on adding a button, a good branch name would be `add-button`.
61+
62+
### 3. Make changes
63+
Now that you have a new branch you can edit/create/delete files. Follow the standard Git workflow to stage and locally commit your changes -- there are lots of guides that explain Git.
64+
65+
If the branch contains lot of small commits, you can squash the commits also so that you have a clear and concise git history that clearly and easily documents the changes done and the reasons. You can use Git's rebase option for this.
66+
67+
### 5. Push changes to your fork/branch
68+
After all tests pass, push the changes to your fork/branch on GitHub:
69+
```
70+
git push origin {branch_name}
71+
```
72+
73+
### 6. Create pull request
74+
Create a pull request on GitHub for your feature branch. The code will then be reviewed and tested further by our contributors and maintainers.
75+
76+
### 7. Code review
77+
After creating pull request, your code will be reviewed by the maintainers to test for its correctness and compatibility.
78+
79+
### 8. Merge into master
80+
If all goes well, your changes will be merged into the main repository and there you become a contributor to Quark.
81+
82+
Hope you are enjoy journey with OpenGenus.

‎.github/ISSUE_TEMPLATE.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,15 @@ Thanks for filing an issue! Before submitting, please fill in the following info
1414
**Details:**
1515
<!-- Details to be added/updated to aid others to join your discussion -->
1616

17+
<!-- In case of any bug or error -->
18+
**Expected Behavior**:
19+
<!-- Describe what you're currently experiencing from this process, and thereby explain the bug. -->
20+
21+
**Actual Behavior**:
22+
23+
**Screenshots (if any)**:
24+
25+
**Would you like to work on this issue?**
26+
<!-- choose one by changing [ ] to [x] -->
27+
- [ ] Yes
28+
- [ ] No

‎code/css/calculator.css‎

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
2+
3+
/*Calculator CSS*/
4+
5+
6+
.modal-content
7+
{
8+
width: fit-content;
9+
max-height: 300px;
10+
11+
}
12+
#calculator {
13+
width: 325px;
14+
height: auto;
15+
padding: 20px 20px 9px;
16+
background: #9dd2ea;
17+
background: linear-gradient(#9dd2ea, #8bceec);
18+
border-radius: 3px;
19+
box-shadow: 0px 4px #009de4, 0px 10px 15px rgba(0, 0, 0, 0.2);
20+
}
21+
22+
.top span.clear {
23+
float: left;
24+
}
25+
26+
.top .screen {
27+
height: 40px;
28+
width: 212px;
29+
30+
float: right;
31+
32+
padding: 0 10px;
33+
34+
background: rgba(0, 0, 0, 0.2);
35+
border-radius: 3px;
36+
box-shadow: inset 0px 4px rgba(0, 0, 0, 0.2);
37+
38+
font-size: 17px;
39+
line-height: 40px;
40+
color: white;
41+
text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.2);
42+
text-align: right;
43+
letter-spacing: 1px;
44+
}
45+
46+
.keys, .top {overflow: hidden;}
47+
48+
.keys span, .top span.clear {
49+
float: left;
50+
position: relative;
51+
top: 0;
52+
53+
cursor: pointer;
54+
55+
width: 66px;
56+
height: 36px;
57+
58+
background: white;
59+
border-radius: 3px;
60+
box-shadow: 0px 4px rgba(0, 0, 0, 0.2);
61+
62+
margin: 0 5px 11px 0;
63+
64+
color: #888;
65+
line-height: 36px;
66+
text-align: center;
67+
68+
user-select: none;
69+
70+
transition: all 0.2s ease;
71+
72+
}
73+
.keys span.eval{
74+
width : 280px;
75+
}
76+
.keys span.operator {
77+
background: rgba(255, 216, 221, 1);
78+
}
79+
80+
.keys span.eval {
81+
background: #f1ff92;
82+
box-shadow: 0px 4px #9da853;
83+
color: #888e5f;
84+
}
85+
86+
.top span.clear {
87+
background: #ff9fa8;
88+
box-shadow: 0px 4px #ff7c87;
89+
color: white;
90+
}
91+
92+
/* Some hover effects */
93+
.keys span:hover {
94+
background: #9c89f6;
95+
box-shadow: 0px 4px #6b54d3;
96+
color: white;
97+
}
98+
99+
.keys span.eval:hover {
100+
background: #abb850;
101+
box-shadow: 0px 4px #717a33;
102+
color: #ffffff;
103+
}
104+
105+
.top span.clear:hover {
106+
background: #f68991;
107+
box-shadow: 0px 4px #d3545d;
108+
color: white;
109+
}
110+
111+
.keys span:active {
112+
box-shadow: 0px 0px #6b54d3;
113+
top: 4px;
114+
}
115+
116+
.keys span.eval:active {
117+
box-shadow: 0px 0px #717a33;
118+
top: 4px;
119+
}
120+
121+
.top span.clear:active {
122+
top: 4px;
123+
box-shadow: 0px 0px #d3545d;
124+
}
125+

‎code/css/popup.css‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ html {
66
body {
77
position: relative;
88
font-family: 'Roboto Mono', monospace;
9-
margin-bottom: 60px;
10-
9+
padding-bottom: 60px;
1110
}
1211

1312
article {
@@ -21,12 +20,14 @@ html {
2120

2221

2322
.footer {
24-
position: relative;
23+
position: absolute;
2524
bottom: 0;
25+
right: 0;
26+
left: 0;
2627
width: 100%;
2728
height: 60px;
2829
line-height: 60px;
29-
background-color: #f5f5f5;
30+
background-color: #E5E8E8;
3031
margin-top: 2%;
3132
}
3233

@@ -52,8 +53,9 @@ html {
5253
height: 24px;
5354
font-size: 12px;
5455
}
55-
56-
.fa {
56+
57+
.fa {
58+
5759
font-size: 15px;
5860
cursor: pointer;
5961
user-select: none;
@@ -65,7 +67,6 @@ html {
6567
.checked {
6668
color: orange;
6769
}
68-
6970

7071
.card-title{
7172
font-size: 20px;
@@ -144,4 +145,15 @@ hr {
144145
margin:10px -50px;
145146
border:0;
146147
border-top:1px solid #ccc
148+
}
149+
150+
.dropdown_button
151+
{
152+
background-color: Transparent;
153+
background-repeat:no-repeat;
154+
border: none;
155+
cursor:pointer;
156+
overflow: hidden;
157+
outline:none;
158+
color: #077bff;
147159
}

‎code/css/stopwatch.css‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
/*Stopwatch Css*/
2+
3+
@mixin transition {
4+
-webkit-transition: all 0.5s ease-in-out;
5+
-moz-transition: all 0.5s ease-in-out;
6+
transition: all 0.5s ease-in-out;
7+
}
8+
@mixin corners ($radius) {
9+
-moz-border-radius: $radius;
10+
-webkit-border-radius: $radius;
11+
border-radius: $radius;
12+
-khtml-border-radius: $radius;
13+
}
14+
#seconds, #tens{
15+
font-size:2em;
16+
}
17+
18+
.stopW_btn
19+
{
20+
21+
width: 66px;
22+
height: 36px;
23+
border-radius: 3px;
24+
background: #ff9fa8;
25+
color: white;
26+
margin: 0 5px 11px 0;
27+
box-shadow: 0px 0px #d3545d;
28+
line-height: 36px;
29+
text-align: center;
30+
user-select: none;
31+
transition: all 0.2s ease;
32+
}
33+
34+
.stopW_btn:hover {
35+
background: #ff707d;
36+
box-shadow: 0px 4px #e4d6d8;
37+
color: #ffffff;
38+
}

0 commit comments

Comments
 (0)