Skip to content
This repository was archived by the owner on May 5, 2023. It is now read-only.

Commit b1957df

Browse files
yashsehgalyashsehgal
authored
Merge pull request #101 from DesignSystemsOSS/v2.0
Merging v2.0 to master
2 parents b857ef5 + 1591338 commit b1957df

5 files changed

Lines changed: 13 additions & 22 deletions

File tree

‎src/lib/eccentric.css‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/lib/eccentric.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/lib/eccentric.scss‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ button:hover {
8282
border: inherit;
8383
}
8484

85-
.et-button-danger, .et-button-invalid {
85+
.et-button-invalid {
8686
color: white;
8787
background-color: var(--et-danger);
8888
padding: 0.6em;
@@ -94,7 +94,7 @@ button:hover {
9494
line-height: inherit;
9595
}
9696

97-
.et-button-success, .et-button-valid {
97+
.et-button-valid {
9898
color: white;
9999
background-color: var(--et-green-primary);
100100
padding: 0.6em;
@@ -139,8 +139,8 @@ button:hover {
139139
color: var(--et-blue-primary);
140140
}
141141

142-
// Danger button
143-
.et-button-danger-secondary, .et-button-invalid-secondary {
142+
// Invalid button
143+
.et-button-invalid-secondary {
144144
background-color: (var(--et-white));
145145
border: 2px solid var(--et-danger);
146146
color: var(--et-danger);
@@ -154,7 +154,7 @@ button:hover {
154154
}
155155

156156
// Valid/Success button
157-
.et-button-success-secondary {
157+
.et-button-valid-secondary {
158158
background-color: (var(--et-white));
159159
border: 2px solid var(--et-green-primary);
160160
color: var(--et-green-primary);

‎src/tests/__buttons.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</head>
1010
<body>
1111
<button>Download</button>
12-
<button class="et-button-danger et-hover">Close this Task</button>
12+
<button class="et-button-invalid">Close this Task</button>
1313
<button class="et-button-valid">Save Changes</button>
1414
<button class="et-button-warning">Check Notifications</button>
1515
<button class="et-button-disabled">Button</button>
@@ -19,6 +19,6 @@
1919
<button class="et-button-secondary">Button</button>
2020
<button class="et-button-alert-secondary">Button</button>
2121
<button class="et-button-warning-secondary">Button</button>
22-
<button class="et-button-success-secondary">Button</button>
22+
<button class="et-button-valid-secondary">Button</button>
2323
</body>
2424
</html>

‎src/tests/auto/__BUTTON_TESTS.js‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,9 @@ __BUTTON__TESTS = [
33
{
44
"classname": "et-button"
55
},
6-
{
7-
"classname": "et-primaryButton"
8-
},
9-
{
10-
"classname": "et-button-danger"
11-
},
126
{
137
"classname": "et-button-invalid"
148
},
15-
{
16-
"classname": "et-button-success"
17-
},
189
{
1910
"classname": "et-button-valid"
2011
},
@@ -37,7 +28,7 @@ __BUTTON__TESTS = [
3728
"classname": "et-button-warning-secondary"
3829
},
3930
{
40-
"classname": "et-button-success-secondary"
31+
"classname": "et-button-valid-secondary"
4132
}
4233
]
4334

0 commit comments

Comments
 (0)