conflicts resoved

Author: yashsehgal

src/lib/eccentric.css

@@ -62,7 +62,7 @@ body {
 }
 
 /// button method - primary-button, default button property
-.et-button, button, .et-primaryButton {
+.et-button, button, .et-primaryButton{
   color: white;
   background-color: var(--et-blue-primary);
   padding: 0.6em;
@@ -115,6 +115,18 @@ button:focus {
   line-height: inherit;
 }
 
+
+.et-button-deactivated{
+  background-color: var(--et-gray-primary);
+  color: var(--et-black);
+}
+
+.et-button-deactivated-secondary{
+  background-color: var(--et-gray-secondary);
+  color: var(--et-black);
+  border: var(--et-black) solid;
+  border-width: 2px;
+}
 // Heading Method - Combined button Property
 
 h1, .et-h1, h2, .et-h2, h3, .et-h3, h4, .et-h4, h5, .et-h5, h6, .et-h6 {
@@ -124,34 +136,34 @@ h1, .et-h1, h2, .et-h2, h3, .et-h3, h4, .et-h4, h5, .et-h5, h6, .et-h6 {
 }
 
 // heading method - (h1)
-h1, .et-h1{
+h1, .et-h1 {
   font-size: 45.3px;
   font-weight: 600;
 }
 
 // heading method - (h2)
-h2, .et-h2{
+h2, .et-h2 {
   font-size: 38.3px;
 }
 
 // heading method - (h3)
-h3, .et-h3{
+h3, .et-h3 {
   font-size: 29.12px;
   font-weight: 600;
 }
 
 // heading method - (h4)
-h4, .h4{
+h4, .h4 {
   font-size: 22.65px;
 }
 
 // heading method - (h5)
-h5, .et-h5{
+h5, .et-h5 {
   font-size: 16.18px;
   font-weight: 600;
 }
 
 // heading method - (h6)
-h6, .et-h6{
+h6, .et-h6 {
   font-size: 12.94px;
 }

src/lib/eccentric.css.map

@@ -12,5 +12,7 @@
   <button class="et-button-danger et-hover">Close this Task</button>
   <button class="et-button-valid">Save Changes</button>
   <button class="et-button-warning">Check Notifications</button>
+  <button class="et-button-deactivated">Button</button>
+  <button class="et-button-deactivated-secondary">deactivated</button>
 </body>
 </html>