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

Commit 5c7cd17

Browse files
atharvagadkari05atharvagadkari05
committed
2 parents 627ff6d + 1591338 commit 5c7cd17

5 files changed

Lines changed: 44 additions & 64 deletions

File tree

‎src/lib/eccentric.css‎

Lines changed: 12 additions & 17 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: 22 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ body {
6262
}
6363

6464
/// button method - primary-button, default button property
65-
.et-button, button, .et-primaryButton {
65+
.et-button, button {
6666
color: white;
6767
background-color: var(--et-blue-primary);
6868
padding: 0.6em;
@@ -74,20 +74,15 @@ body {
7474
line-height: inherit;
7575
}
7676

77-
button:focus {
78-
border: none;
79-
outline: none;
80-
}
81-
8277
button:hover {
8378
cursor: pointer;
8479
}
8580

86-
.et-button-deactivated-secondary:focus {
81+
.et-button-disabled-secondary:focus {
8782
border: inherit;
8883
}
8984

90-
.et-button-danger, .et-button-invalid {
85+
.et-button-invalid {
9186
color: white;
9287
background-color: var(--et-danger);
9388
padding: 0.6em;
@@ -99,7 +94,7 @@ button:hover {
9994
line-height: inherit;
10095
}
10196

102-
.et-button-success, .et-button-valid {
97+
.et-button-valid {
10398
color: white;
10499
background-color: var(--et-green-primary);
105100
padding: 0.6em;
@@ -123,12 +118,12 @@ button:hover {
123118
line-height: inherit;
124119
}
125120

126-
.et-button-deactivated {
121+
.et-button-disabled {
127122
background-color: var(--et-gray-primary);
128123
color: var(--et-black);
129124
}
130125

131-
.et-button-deactivated-secondary {
126+
.et-button-disabled-secondary {
132127
background-color: var(--et-gray-secondary);
133128
color: var(--et-black);
134129
border: var(--et-black) solid;
@@ -137,31 +132,29 @@ button:hover {
137132

138133
// These are Secondary Buttons
139134

140-
141-
142135
// Secondary Info button
143-
.et-button-info-secondary{
136+
.et-button-secondary{
144137
background-color: var(--et-white);
145138
border: 2px solid var(--et-blue-primary);
146139
color: var(--et-blue-primary);
147140
}
148141

149-
// Alert button
150-
.et-button-alert-secondary{
142+
// Invalid button
143+
.et-button-invalid-secondary {
151144
background-color: (var(--et-white));
152145
border: 2px solid var(--et-danger);
153146
color: var(--et-danger);
154147
}
155148

156149
// Warning button
157-
.et-button-warning-secondary{
150+
.et-button-warning-secondary {
158151
background-color: (var(--et-white));
159152
border: 2px solid var(--et-warning);
160153
color: var(--et-warning);
161154
}
162155

163156
// Valid/Success button
164-
.et-button-success-secondary{
157+
.et-button-valid-secondary {
165158
background-color: (var(--et-white));
166159
border: 2px solid var(--et-green-primary);
167160
color: var(--et-green-primary);
@@ -170,48 +163,48 @@ button:hover {
170163

171164
// Heading Method - Combined button Property
172165

173-
h1,.et-h1,h2,.et-h2,h3,.et-h3,h4,.et-h4,h5,.et-h5,h6,.et-h6{
166+
h1,.et-h1, h2, .et-h2, h3, .et-h3, h4, .et-h4, h5, .et-h5, h6, .et-h6 {
174167
font-family: var(--et-sans-serif);
175168
color: var(--et-black);
176169
margin: 0;
177170
}
178171

179172
// heading method - (h1)
180-
h1, .et-h1{
173+
h1, .et-h1 {
181174
font-size: 45.3px;
182175
font-weight: 600;
183176
}
184177

185178
// heading method - (h2)
186-
h2, .et-h2{
179+
h2, .et-h2 {
187180
font-size: 38.3px;
188181
}
189182

190183
// heading method - (h3)
191-
h3, .et-h3{
184+
h3, .et-h3 {
192185
font-size: 29.12px;
193186
font-weight: 600;
194187
}
195188

196189
// heading method - (h4)
197-
h4, .h4{
190+
h4, .et-h4{
198191
font-size: 22.65px;
199192
}
200193

201194
// heading method - (h5)
202-
h5, .et-h5{
195+
h5, .et-h5 {
203196
font-size: 16.18px;
204197
font-weight: 600;
205198
}
206199

207200
// heading method - (h6)
208-
h6, .et-h6{
201+
h6, .et-h6 {
209202
font-size: 12.94px;
210203
}
211204

212205
// Combined Property For all tags
213-
// This Contains various TAgs like Paragraph.italics,bold,quote,Underlined.
214-
.et-paragragh, .et-quote, .et-regular, p, b, i, u, q {
206+
// This Contains various Tags like Paragraph, italics, bold, quote, Underlined.
207+
.et-paragraph, .et-quote, .et-regular, p, b, i, u, q {
215208
font-family: var(--et-sans-serif);
216209
margin: 0;
217210
color: var(--et-black);
@@ -220,8 +213,9 @@ color: var(--et-black);
220213
b {
221214
font-weight: bold;
222215
}
216+
223217
// To remove extra (unwanted) margin.
224-
.et-paragragh, .et-regular, p {
218+
.et-paragraph, .et-regular, p {
225219
margin: 0;
226220
}
227221

‎src/tests/__buttons.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
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>
15-
<button class="et-button-deactivated">Button</button>
16-
<button class="et-button-deactivated-secondary">deactivated</button>
15+
<button class="et-button-disabled">Button</button>
16+
<button class="et-button-disabled-secondary">deactivated</button>
1717

1818

19-
<button class="et-button-info-secondary">Button</button>
19+
<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: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,23 @@ __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
},
2112
{
2213
"classname": "et-button-warning"
2314
},
2415
{
25-
"classname": "et-button-deactivated"
16+
"classname": "et-button-disabled"
2617
},
2718
{
28-
"classname": "et-button-deactivated-secondary"
19+
"classname": "et-button-disabled-secondary"
2920
},
3021
{
31-
"classname": "et-button-info-secondary"
22+
"classname": "et-button-secondary"
3223
},
3324
{
3425
"classname": "et-button-alert-secondary"
@@ -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)