Merge branch 'master' into master

sButtons · Oct 31, 2020 · c75a851 · c75a851
2 parents 155e18f + e53cddf
commit c75a851
Show file tree

Hide file tree

Showing 12 changed files with 84 additions and 37 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -1257,7 +1257,9 @@
       "avatar_url": "https://avatars0.githubusercontent.com/u/31221181?v=4",
       "profile": "https://github.com/drewren25",
       "contributions": [
-        "code"
+        "code",
+        "ideas",
+        "content"
       ]
     },
     {
@@ -1572,6 +1574,44 @@
         "code",
         "bug"
       ]
+    },
+    {
+      "login": "sleekyom",
+      "name": "Emmanuel Kolawole",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/43440929?v=4",
+      "profile": "https://github.com/sleekyom",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "shresthalucky",
+      "name": "Lucky Shrestha",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/4192121?v=4",
+      "profile": "http://shresthalucky.github.io/",
+      "contributions": [
+        "code",
+        "bug"
+      ]
+    },
+    {
+      "login": "karleypetracca",
+      "name": "Karley Petracca",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/39736230?v=4",
+      "profile": "http://www.karleypetracca.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Mani-07",
+      "name": "Mani-07",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/51812399?v=4",
+      "profile": "https://github.com/Mani-07",
+      "contributions": [
+        "code",
+        "bug"
+      ]
     }
   ],
   "contributorsPerLine": 7,

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -172,7 +172,7 @@ Our amazing contributors helped shape our project and make it much better. Here
     <td align="center"><a href="https://www.linkedin.com/in/joel-lau/"><img src="https://avatars3.githubusercontent.com/u/29514264?v=4" width="100px;" alt=""/><br /><sub><b>Joel Lau</b></sub></a><br /><a href="https://github.com/sButtons/sbuttons/commits?author=JoelLau" title="Code">💻</a></td>
     <td align="center"><a href="https://zdp.su"><img src="https://avatars1.githubusercontent.com/u/20298318?v=4" width="100px;" alt=""/><br /><sub><b>Den</b></sub></a><br /><a href="https://github.com/sButtons/sbuttons/commits?author=dkochetkov" title="Code">💻</a></td>
     <td align="center"><a href="http://www.tanyamott.com"><img src="https://avatars3.githubusercontent.com/u/10003710?v=4" width="100px;" alt=""/><br /><sub><b>Tanya Mott</b></sub></a><br /><a href="https://github.com/sButtons/sbuttons/commits?author=tmott13" title="Code">💻</a> <a href="#ideas-tmott13" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="https://github.com/drewren25"><img src="https://avatars0.githubusercontent.com/u/31221181?v=4" width="100px;" alt=""/><br /><sub><b>drewren25</b></sub></a><br /><a href="https://github.com/sButtons/sbuttons/commits?author=drewren25" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/drewren25"><img src="https://avatars0.githubusercontent.com/u/31221181?v=4" width="100px;" alt=""/><br /><sub><b>drewren25</b></sub></a><br /><a href="https://github.com/sButtons/sbuttons/commits?author=drewren25" title="Code">💻</a> <a href="#ideas-drewren25" title="Ideas, Planning, & Feedback">🤔</a> <a href="#content-drewren25" title="Content">🖋</a></td>
     <td align="center"><a href="https://github.com/pontakornth"><img src="https://avatars2.githubusercontent.com/u/37771900?v=4" width="100px;" alt=""/><br /><sub><b>pontakornth</b></sub></a><br /><a href="https://github.com/sButtons/sbuttons/commits?author=pontakornth" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/justDOindev"><img src="https://avatars3.githubusercontent.com/u/44042682?v=4" width="100px;" alt=""/><br /><sub><b>Justin Payne</b></sub></a><br /><a href="https://github.com/sButtons/sbuttons/commits?author=justDOindev" title="Code">💻</a></td>
     <td align="center"><a href="https://brijesh.wtf"><img src="https://avatars2.githubusercontent.com/u/28498071?v=4" width="100px;" alt=""/><br /><sub><b>Brijesh Wawdhane</b></sub></a><br /><a href="https://github.com/sButtons/sbuttons/commits?author=wbrijesh" title="Code">💻</a></td>
@@ -216,6 +216,10 @@ Our amazing contributors helped shape our project and make it much better. Here
   <tr>
     <td align="center"><a href="https://github.com/pratyushakatti13"><img src="https://avatars2.githubusercontent.com/u/64535305?v=4" width="100px;" alt=""/><br /><sub><b>Pratyusha Katti</b></sub></a><br /><a href="https://github.com/sButtons/sbuttons/commits?author=pratyushakatti13" title="Code">💻</a></td>
     <td align="center"><a href="https://aikakitsune.pl"><img src="https://avatars0.githubusercontent.com/u/17385340?v=4" width="100px;" alt=""/><br /><sub><b>aika</b></sub></a><br /><a href="https://github.com/sButtons/sbuttons/commits?author=redpfire" title="Code">💻</a> <a href="https://github.com/sButtons/sbuttons/issues?q=author%3Aredpfire" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/sleekyom"><img src="https://avatars1.githubusercontent.com/u/43440929?v=4" width="100px;" alt=""/><br /><sub><b>Emmanuel Kolawole</b></sub></a><br /><a href="#content-sleekyom" title="Content">🖋</a></td>
+    <td align="center"><a href="http://shresthalucky.github.io/"><img src="https://avatars2.githubusercontent.com/u/4192121?v=4" width="100px;" alt=""/><br /><sub><b>Lucky Shrestha</b></sub></a><br /><a href="https://github.com/sButtons/sbuttons/commits?author=shresthalucky" title="Code">💻</a> <a href="https://github.com/sButtons/sbuttons/issues?q=author%3Ashresthalucky" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="http://www.karleypetracca.com"><img src="https://avatars1.githubusercontent.com/u/39736230?v=4" width="100px;" alt=""/><br /><sub><b>Karley Petracca</b></sub></a><br /><a href="https://github.com/sButtons/sbuttons/commits?author=karleypetracca" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/Mani-07"><img src="https://avatars2.githubusercontent.com/u/51812399?v=4" width="100px;" alt=""/><br /><sub><b>Mani-07</b></sub></a><br /><a href="https://github.com/sButtons/sbuttons/commits?author=Mani-07" title="Code">💻</a> <a href="https://github.com/sButtons/sbuttons/issues?q=author%3AMani-07" title="Bug reports">🐛</a></td>
   </tr>
 </table>
 

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ Logo made by [Harshit Sharma](https://www.github.com/icoderharshit)
 
 [![GitHub license](https://img.shields.io/github/license/Naereen/StrapDown.js.svg)](./LICENSE.md)
  [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](./CONTRIBUTING.md) [![Open Source Love svg1](https://badges.frapsoft.com/os/v1/open-source.svg?v=103)](./CONTRIBUTING.md) <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-163-orange.svg?style=flat-square)](./CONTRIBUTORS.md)
+[![All Contributors](https://img.shields.io/badge/all_contributors-167-orange.svg?style=flat-square)](./CONTRIBUTORS.md)
 <!-- ALL-CONTRIBUTORS-BADGE:END --> 
 
 :bulb: Simple buttons you can use easily for your next project.

diff --git a/assets/css/index.css b/assets/css/index.css
@@ -5,7 +5,6 @@
 
 .installation,
 .cdn .head {
-  color: #413f3f;
   font-weight: 700;
 }
 

diff --git a/assets/css/main.css b/assets/css/main.css
@@ -243,7 +243,6 @@ body {
 
 button.clipboard {
   color: var(--main-color);
-  border-radius: 4px;
   height: 100%;
   width: 100%;
   border: transparent;

diff --git a/assets/js/buttons-examples.js b/assets/js/buttons-examples.js
@@ -101,7 +101,7 @@ $(document).ready(function () {
           label: "Neon Border",
           text: "button",
           classes: "neon-border-btn",
-          shouldHaveRoundedType: false,
+          shouldHaveRoundedType: true,
         },
         {
           type: "outline",

diff --git a/dist/sbuttons.css b/dist/sbuttons.css
@@ -2976,7 +2976,7 @@ a.yellow-btn:active:not(.fill-color-btn) {
   margin-top: 10px;
   margin-right: 15px;
   background: #fff;
-  animation: 1.5s bounce linear infinite;
+  animation: 0.7s bounce linear infinite alternate;
   border-radius: 50%;
 }
 .loading-btn.bounce.right:after {
@@ -2987,18 +2987,18 @@ a.yellow-btn:active:not(.fill-color-btn) {
   margin-top: 10px;
   margin-left: 15px;
   background: #fff;
-  animation: bounce 1.5s linear infinite;
+  animation: bounce 0.7s linear infinite alternate;
   border-radius: 50%;
 }
 @keyframes bounce {
   0% {
-    transform: translateY(8px);
+    transform: translateY(5px);
   }
   50% {
-    transform: translateY(5px);
+    transform: translateY(-2px);
   }
   100% {
-    transform: translateY(3px);
+    transform: translateY(-5px);
   }
 }
 .loading-btn.heart-beat.left:before {
@@ -3027,15 +3027,18 @@ a.yellow-btn:active:not(.fill-color-btn) {
   0% {
     transform: scale(0.5);
   }
-  50% {
+  25% {
     transform: scale(0.88);
   }
-  75% {
+  50% {
     transform: scale(0.6);
   }
-  100% {
+  75% {
     transform: scale(0.99);
   }
+  100% {
+    transform: scale(0.5);
+  }
 }
 .loading-btn.slide.left:before {
   content: "";
@@ -3045,7 +3048,7 @@ a.yellow-btn:active:not(.fill-color-btn) {
   margin-top: 10px;
   margin-right: 15px;
   background: #fff;
-  animation: 1.5s slide linear infinite;
+  animation: 1.5s slide linear infinite reverse;
   border-radius: 50%;
 }
 .loading-btn.slide.right:after {
@@ -3056,7 +3059,7 @@ a.yellow-btn:active:not(.fill-color-btn) {
   margin-top: 10px;
   margin-left: 15px;
   background: #fff;
-  animation: slide 1.5s ease-in infinite;
+  animation: slide 1.5s linear infinite;
   border-radius: 50%;
 }
 @keyframes slide {

diff --git a/dist/sbuttons.min.css b/dist/sbuttons.min.css
diff --git a/documentation.html b/documentation.html
@@ -84,7 +84,7 @@
     </div>
     <div class="content row">
       <div class="banner-head col-lg-6 col-md-12 col-sm-12">
-        <h1>Simple and Creative buttons with SButtons.</h1>
+        <h1>Simple and Creative buttons with sButtons.</h1>
         <div class="subtitle">
           Quickly design and customize beautiful and animated buttons with sButtons.
         </div>
@@ -102,7 +102,7 @@ <h1>Simple and Creative buttons with SButtons.</h1>
 
   <div class="main-content">
     <div class="main-head">
-      <h1>Get Started with SButtons</h1>
+      <h1>Get Started with sButtons</h1>
     </div>
     <div class="row">
       <div class="col-md-3 d-md-block sidebar-div">

diff --git a/examples.html b/examples.html
@@ -85,7 +85,7 @@
     </div>
     <div class="content row">
       <div class="banner-head col-lg-6 col-md-12 col-sm-12">
-        <h1>Simple and Creative buttons with SButtons.</h1>
+        <h1>Simple and Creative buttons with sButtons.</h1>
         <div class="subtitle">
           Quickly design and customize beautiful and animated buttons with sButtons.
         </div>
@@ -103,7 +103,7 @@ <h1>Simple and Creative buttons with SButtons.</h1>
 
   <div class="main-content">
     <div class="main-head">
-      <h1>Some Examples Of SButtons</h1>
+      <h1>Some Examples Of sButtons</h1>
     </div>
     <div class="container mt-5" id="loading_wheel">
       <div class="loader"></div>

diff --git a/index.html b/index.html
@@ -119,10 +119,9 @@
       </div>
       <div class="content row">
         <div class="banner-head col-lg-6 col-md-12 col-sm-12">
-          <h1>Simple and Creative buttons with SButtons.</h1>
+          <h1>Simple and Creative buttons with sButtons.</h1>
           <div class="subtitle">
-            Quickly design and customize beautiful and animated buttons with
-            sButtons.
+            Design and customize buttons easily for your next project.
           </div>
           <div class="banner-links ">
             <a href="#" id="downloadGithubRawButton" class="sbtn hover-btn white-btn banner-link">Download</a>
@@ -159,7 +158,7 @@ <h1 class="heading"><i class="fas fa-cloud"></i> sButton CDN</h1>
         </div>
         <div class="instruction row">
           <div class="desc col col-md-6 col-sm-12">
-            When you only need to include SButtons’s compiled CSS , you can use
+            When you only need to include sButtons’s compiled CSS , you can use
             SButtonCDN.
             <br /><br />
             <a href="documentation.html" class="sbtn transparent-btn banner-link"
@@ -195,11 +194,11 @@ <h1 class="heading"><i class="fas fa-cloud"></i> sButton CDN</h1>
                 class="fas fa-book"></i> Examples</a>
             <a href="https://github.com/sButtons/sbuttons/issues/new/choose" target="_blank" title="View on Github"> <i
                 class="fas fa-bug"></i> Report A Bug</a>
-    
+
           </div>
         </div>
       </div>
-    
+
     </footer>
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.21.0/components/prism-core.min.js"></script>

diff --git a/src/components/animated/_loading-btn.less b/src/components/animated/_loading-btn.less
@@ -49,7 +49,7 @@
         margin-top: 10px;
         margin-right: 15px;
         background: @white;
-        animation: 1.5s bounce linear infinite;
+        animation: 0.7s bounce linear infinite alternate;
         border-radius: 50%;
       }
     }
@@ -63,20 +63,20 @@
         margin-top: 10px;
         margin-left: 15px;
         background: @white;
-        animation: bounce 1.5s linear infinite;
+        animation: bounce 0.7s linear infinite alternate;
         border-radius: 50%;
       }
     }
 
     @keyframes bounce {
       0% {
-        transform: translateY(8px);
+        transform: translateY(5px);
       }
       50% {
-        transform: translateY(5px);
+        transform: translateY(-2px);
       }
       100% {
-        transform: translateY(3px);
+        transform: translateY(-5px);
       }
     }
   }
@@ -116,15 +116,18 @@
       0% {
         transform: scale(0.5);
       }
-      50% {
+      25% {
         transform: scale(0.88);
       }
-      75% {
+      50% {
         transform: scale(0.6);
       }
-      100% {
+      75% {
         transform: scale(0.99);
       }
+      100% {
+        transform: scale(0.5);
+      }
     }
   }
   // heart beat loader ends here
@@ -140,7 +143,7 @@
         margin-top: 10px;
         margin-right: 15px;
         background: @white;
-        animation: 1.5s slide linear infinite;
+        animation: 1.5s slide linear infinite reverse;
         border-radius: 50%;
       }
     }
@@ -154,7 +157,7 @@
         margin-top: 10px;
         margin-left: 15px;
         background: @white;
-        animation: slide 1.5s ease-in infinite;
+        animation: slide 1.5s linear infinite;
         border-radius: 50%;
       }
     }