Merge pull request #98 from DesignSystemsOSS/v2.0

Merging Updates of v2.0 to Master Branch

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 {
   color: white;
   background-color: var(--et-blue-primary);
   padding: 0.6em;
@@ -78,7 +78,7 @@ button:hover {
   cursor: pointer;
 }
 
-.et-button-deactivated-secondary:focus {
+.et-button-disabled-secondary:focus {
   border: inherit;
 }
 
@@ -118,12 +118,12 @@ button:hover {
   line-height: inherit;
 }
 
-.et-button-deactivated {
+.et-button-disabled {
   background-color: var(--et-gray-primary);
   color: var(--et-black);
 }
 
-.et-button-deactivated-secondary {
+.et-button-disabled-secondary {
   background-color: var(--et-gray-secondary);
   color: var(--et-black);
   border: var(--et-black) solid;
@@ -132,31 +132,29 @@ button:hover {
 
 // These are Secondary Buttons
 
-
-
 // Secondary Info button 
-.et-button-info-secondary{
+.et-button-secondary{
   background-color: var(--et-white);
   border: 2px solid var(--et-blue-primary);
   color: var(--et-blue-primary);
 }
 
-// Alert button
-.et-button-alert-secondary{
+// Danger button
+.et-button-danger-secondary, .et-button-invalid-secondary {
   background-color: (var(--et-white));
   border: 2px solid var(--et-danger);
   color: var(--et-danger);
 }
 
 // Warning button
-.et-button-warning-secondary{
+.et-button-warning-secondary {
   background-color: (var(--et-white));
   border: 2px solid var(--et-warning);
   color: var(--et-warning);
 }
 
 // Valid/Success button
-.et-button-success-secondary{
+.et-button-success-secondary {
   background-color: (var(--et-white));
   border: 2px solid var(--et-green-primary);
   color: var(--et-green-primary);
@@ -165,48 +163,48 @@ button:hover {
 
 // Heading Method - Combined button Property
 
-h1,.et-h1,h2,.et-h2,h3,.et-h3,h4,.et-h4,h5,.et-h5,h6,.et-h6{
+h1,.et-h1, h2, .et-h2, h3, .et-h3, h4, .et-h4, h5, .et-h5, h6, .et-h6 {
   font-family: var(--et-sans-serif);
   color: var(--et-black);
   margin: 0;
 }
 
 // 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, .et-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;
 }
 
 // Combined Property For all tags
-// This Contains various TAgs like Paragraph.italics,bold,quote,Underlined.
-.et-paragragh, .et-quote, .et-regular, p, b, i, u, q {
+// This Contains various Tags like Paragraph, italics, bold, quote, Underlined.
+.et-paragraph, .et-quote, .et-regular, p, b, i, u, q {
 font-family: var(--et-sans-serif);
 margin: 0;
 color: var(--et-black);
@@ -215,8 +213,9 @@ color: var(--et-black);
 b {
   font-weight: bold;
 }
+
 // To remove extra (unwanted) margin.
-.et-paragragh, .et-regular, p {
+.et-paragraph, .et-regular, p {
   margin: 0;
 }
 

src/lib/eccentric.css.map

@@ -12,11 +12,11 @@
   <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>
+  <button class="et-button-disabled">Button</button>
+  <button class="et-button-disabled-secondary">deactivated</button>
 
 
-<button class="et-button-info-secondary">Button</button>
+<button class="et-button-secondary">Button</button>
 <button class="et-button-alert-secondary">Button</button>
 <button class="et-button-warning-secondary">Button</button>
 <button class="et-button-success-secondary">Button</button>

src/lib/eccentric.scss

@@ -22,13 +22,13 @@ __BUTTON__TESTS = [
     "classname": "et-button-warning"
   },
   {
-    "classname": "et-button-deactivated"
+    "classname": "et-button-disabled"
   },
   {
-    "classname": "et-button-deactivated-secondary"
+    "classname": "et-button-disabled-secondary"
   },
   {
-    "classname":  "et-button-info-secondary"
+    "classname":  "et-button-secondary"
   },
   {
     "classname":  "et-button-alert-secondary"