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

Commit

Permalink
Merge pull request #105 from DesignSystemsOSS/v2.0
Browse files Browse the repository at this point in the history
Merging v2.0 to master branch for v2.0/stable updates
  • Loading branch information
yashsehgal authored Apr 6, 2021
2 parents 38039da + c6beb85 commit d96ff30
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 13 deletions.
10 changes: 5 additions & 5 deletions src/lib/eccentric.scss
Original file line number Diff line number Diff line change
Expand Up @@ -204,18 +204,18 @@ h6, .et-h6 {

// Combined Property For all tags
// 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);
.et-paragraph, p, b, i, u, q {
font-family: var(--et-sans-serif);
margin: 0;
color: var(--et-black);
}

b {
font-weight: bold;
}

// To remove extra (unwanted) margin.
.et-paragraph, .et-regular, p {
.et-paragraph, p {
margin: 0;
}

2 changes: 1 addition & 1 deletion src/tests/__buttons.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


<button class="et-button-secondary">Button</button>
<button class="et-button-alert-secondary">Button</button>
<button class="et-button-invalid-secondary">Button</button>
<button class="et-button-warning-secondary">Button</button>
<button class="et-button-valid-secondary">Button</button>
</body>
Expand Down
3 changes: 1 addition & 2 deletions src/tests/__tags.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@
</head>
<body>
<p class="et-paragragh">Paragraph Text</p>
<p class="et-regular"> Regular Text</p>
<b>Bold Text</b>
<i>Italic Text</i>
<u>Underlined Text</u>
<q class="et-quote">Quote</q>
<q>Quote</q>
</body>
</html>
5 changes: 0 additions & 5 deletions src/tests/auto/__TAG_TESTS.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@

__TAGS_TESTS = [

{
"classname": "et-paragraph"
},
{
"classname": "et-quote"
}

]

let TAGS_TEST_DATA = document.createElement("div");
Expand Down

0 comments on commit d96ff30

Please sign in to comment.