Merge branch 'master' into autocompletion

OpenGenus · Mar 6, 2018 · 9e6b18c · 9e6b18c
2 parents 8bec250 + 9e2ead5
commit 9e6b18c
Show file tree

Hide file tree

Showing 17 changed files with 6,817 additions and 270 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -2,9 +2,81 @@
 
 > Every work is great only because of its contributors. 
 
-Welcome to a brand new World. We are revolutionizing the way people interact with code.
-
 Thanks goes to these ❤️ wonderful people who made this possible.
 
 > We made the internet and it made us vulnerable. We fought and we won. - OpenGenus
 
+
+Welcome to a brand new world of algorithms. We are revolutionizing the way people interact with code.
+The success of our vision depends on you. Even a small contribution helps. All forms of contributions are highly welcomed and valued.
+You can contribute by writing code, documentation, making Quark friendly and many others. There are endless possibilities.
+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.
+We aim to make the contribution process as easy and enjoyable as possible. Join OpenGenus and explore the new world.
+
+These are some basic guidelines which you can refer before starting on Quark.
+
+## Issue Reporting
+
+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 :
+* Try to file one issue per problem observed. 
+* Please specify a valid title (e.g. "Bubble Sort algorithm is not accessible" instead of "Quark does not work") 
+* 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.
+
+**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.
+
+## Contributing Guidelines
+
+Below is an overview of how to contribute code to Quark. The basic workflow is as follows:
+
+1. Fork
+1. Create feature branch
+1. Make changes
+1. Push changes to your fork/branch
+1. Create pull request
+1. Code review and automated testing
+1. Merge into master
+
+### Prerequisites
+* Git client
+* GitHub account
+
+### 1. Fork
+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
+```
+git clone https://github.com/{username}/quark.git
+cd quark
+```
+It is useful to have the upstream repository registered as well using
+```
+git remote add upstream https://github.com/OpenGenus/quark.git
+```
+
+### 2. Create feature branch
+We always work with feature branches. For example, to create and switch to branch, use:
+```
+git checkout -b {branch_name}
+```
+and replace `{branch_name}` with a meaningful name that describes your feature or change.
+For instance, if you are working on adding a button, a good branch name would be `add-button`.
+
+### 3. Make changes
+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.
+
+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.
+
+### 5. Push changes to your fork/branch
+After all tests pass, push the changes to your fork/branch on GitHub:
+```
+git push origin {branch_name}
+```
+
+### 6. Create pull request
+Create a pull request on GitHub for your feature branch. The code will then be reviewed and tested further by our contributors and maintainers.
+
+### 7. Code review 
+After creating pull request, your code will be reviewed by the maintainers to test for its correctness and compatibility.
+
+### 8. Merge into master
+If all goes well, your changes will be merged into the main repository and there you become a contributor to Quark.
+
+Hope you are enjoy journey with OpenGenus.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -14,3 +14,15 @@ Thanks for filing an issue! Before submitting, please fill in the following info
 **Details:**
 <!-- Details to be added/updated to aid others to join your discussion -->
 
+<!-- In case of any bug or error  -->
+**Expected Behavior**:
+<!-- Describe what you're currently experiencing from this process, and thereby explain the bug. -->
+
+**Actual Behavior**:
+
+**Screenshots (if any)**:
+
+**Would you like to work on this issue?**
+<!-- choose one by changing [ ] to [x] -->
+- [ ] Yes
+- [ ] No
diff --git a/code/css/calculator.css b/code/css/calculator.css
@@ -0,0 +1,125 @@
+
+
+/*Calculator CSS*/
+
+
+    .modal-content
+    {
+            width: fit-content;
+            max-height: 300px;
+
+    }
+    #calculator {
+        width: 325px;
+        height: auto;
+        padding: 20px 20px 9px;
+        background: #9dd2ea;
+        background: linear-gradient(#9dd2ea, #8bceec);
+        border-radius: 3px;
+        box-shadow: 0px 4px #009de4, 0px 10px 15px rgba(0, 0, 0, 0.2);
+    }
+
+    .top span.clear {
+        float: left;
+    }
+
+    .top .screen {
+        height: 40px;
+        width: 212px;
+
+        float: right;
+
+        padding: 0 10px;
+
+        background: rgba(0, 0, 0, 0.2);
+        border-radius: 3px;
+        box-shadow: inset 0px 4px rgba(0, 0, 0, 0.2);
+
+        font-size: 17px;
+        line-height: 40px;
+        color: white;
+        text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.2);
+        text-align: right;
+        letter-spacing: 1px;
+    }
+
+    .keys, .top {overflow: hidden;}
+
+    .keys span, .top span.clear {
+        float: left;
+        position: relative;
+        top: 0;
+
+        cursor: pointer;
+
+        width: 66px;
+        height: 36px;
+
+        background: white;
+        border-radius: 3px;
+        box-shadow: 0px 4px rgba(0, 0, 0, 0.2);
+
+        margin: 0 5px 11px 0;
+
+        color: #888;
+        line-height: 36px;
+        text-align: center;
+
+        user-select: none;
+
+        transition: all 0.2s ease;
+
+    }
+    .keys span.eval{
+        width : 280px;
+    }
+     .keys span.operator {
+        background: rgba(255, 216, 221, 1);
+    }
+
+    .keys span.eval {
+        background: #f1ff92;
+        box-shadow: 0px 4px #9da853;
+        color: #888e5f;
+    }
+
+    .top span.clear {
+        background: #ff9fa8;
+        box-shadow: 0px 4px #ff7c87;
+        color: white;
+    }
+
+    /* Some hover effects */
+    .keys span:hover {
+        background: #9c89f6;
+        box-shadow: 0px 4px #6b54d3;
+        color: white;
+    }
+
+    .keys span.eval:hover {
+        background: #abb850;
+        box-shadow: 0px 4px #717a33;
+        color: #ffffff;
+    }
+
+    .top span.clear:hover {
+        background: #f68991;
+        box-shadow: 0px 4px #d3545d;
+        color: white;
+    }
+
+    .keys span:active {
+        box-shadow: 0px 0px #6b54d3;
+        top: 4px;
+    }
+
+    .keys span.eval:active {
+        box-shadow: 0px 0px #717a33;
+        top: 4px;
+    }
+
+    .top span.clear:active {
+        top: 4px;
+        box-shadow: 0px 0px #d3545d;
+    }
+
diff --git a/code/css/popup.css b/code/css/popup.css
@@ -6,8 +6,7 @@ html {
     body {
         position: relative;
         font-family: 'Roboto Mono', monospace;
-        margin-bottom: 60px;
-
+        padding-bottom: 60px;
     }
 
     article {
@@ -21,12 +20,14 @@ html {
 
 
     .footer {
-        position: relative;
+        position: absolute;
         bottom: 0;
+        right: 0;
+        left: 0;
         width: 100%;
         height: 60px;
         line-height: 60px;
-        background-color: #f5f5f5;
+        background-color: #E5E8E8;
         margin-top: 2%;
     }
 
@@ -52,8 +53,9 @@ html {
         height: 24px;
         font-size: 12px;
     }
-
-    .fa {
+
+.fa {
+
         font-size: 15px;
         cursor: pointer;
         user-select: none;
@@ -65,7 +67,6 @@ html {
     .checked {
             color: orange;
         }
-
 
     .card-title{
         font-size: 20px;
@@ -144,4 +145,15 @@ hr {
     margin:10px -50px;
     border:0;
     border-top:1px solid #ccc
+}
+
+.dropdown_button
+{
+    background-color: Transparent;
+    background-repeat:no-repeat;
+    border: none;
+    cursor:pointer;
+    overflow: hidden;
+    outline:none;
+    color: #077bff;
 }
diff --git a/code/css/stopwatch.css b/code/css/stopwatch.css
@@ -0,0 +1,38 @@
+ /*Stopwatch Css*/
+
+    @mixin transition {
+    -webkit-transition: all 0.5s ease-in-out;
+    -moz-transition: all 0.5s ease-in-out;
+    transition: all 0.5s ease-in-out;
+    }
+    @mixin corners ($radius) {
+    -moz-border-radius: $radius;
+    -webkit-border-radius: $radius;
+    border-radius: $radius; 
+    -khtml-border-radius: $radius; 
+    }
+    #seconds, #tens{
+      font-size:2em;
+    }
+
+    .stopW_btn
+    {
+
+            width: 66px;
+            height: 36px;
+            border-radius: 3px;
+            background: #ff9fa8;
+            color: white;
+            margin: 0 5px 11px 0;
+            box-shadow: 0px 0px #d3545d;
+            line-height: 36px;
+            text-align: center;
+            user-select: none;
+            transition: all 0.2s ease;
+    }
+
+    .stopW_btn:hover {
+        background: #ff707d;
+        box-shadow: 0px 4px #e4d6d8;
+        color: #ffffff;
+    }