Skip to content

Commit

Permalink
Add icon margin that works on both LTR & RTL, re-add removed styles (#…
Browse files Browse the repository at this point in the history
…104)

* add margin right

So all icons will have margin left and margin right, so we dont need browser prefix fixes plus works for IE

* add margin left and right for item icon

* Combine into one PR so we dont have multiple PR's
  • Loading branch information
sheela-svmx authored and Josh Sylvester committed Mar 5, 2019
1 parent ee1cce7 commit 556d24b
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 11 deletions.
5 changes: 5 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# v4.9.3

- Use margin right and left to avoid browser specific prefix fix for rtl space issue.
- Re-add the padding styles that was removed that caused regression.

# v4.9.2

- Resolved regression in iconic menu trigger size.
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "px-dropdown",
"version": "4.9.2",
"version": "4.9.3",
"main": [
"px-dropdown.html"
],
Expand Down
2 changes: 1 addition & 1 deletion css/px-dropdown-styles.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "px-dropdown",
"author": "General Electric",
"description": "A Predix UI Dropdown component",
"version": "4.9.2",
"version": "4.9.3",
"extName": null,
"scripts": {
"clean": "gulp clean",
Expand Down
16 changes: 9 additions & 7 deletions sass/px-dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,7 @@ $inuit-enable-btn--primary: true;
--iron-icon-width: 1.06667rem;
--iron-icon-height: 1.06667rem;
margin-left: $inuit-base-spacing-unit--tiny;
/*
These margins are for pages that are rendered from "Right-To-Left" or "Left-To-Right"
If the writing direction is left-to-right, this value overrides margin-left.
If the writing direction is right-to-left, this value overrides margin-right.
*/
-webkit-margin-start: $inuit-base-spacing-unit--tiny;
-moz-margin-start: $inuit-base-spacing-unit--tiny;
margin-right: $inuit-base-spacing-unit--tiny;
}
.dropdown {
font-size: var(--px-dropdown-content-font-size, inherit);
Expand Down Expand Up @@ -223,6 +217,8 @@ $inuit-enable-btn--primary: true;
.item-icon {
--iron-icon-width: var(--px-dropdown-item-icon-size, calculateRem(16px));
--iron-icon-height: var(--px-dropdown-item-icon-size, calculateRem(16px));
margin-right: $inuit-base-spacing-unit--tiny;
margin-left: $inuit-base-spacing-unit--tiny;
}
.checkbox {
margin-right: $inuit-base-spacing-unit--tiny;
Expand Down Expand Up @@ -309,3 +305,9 @@ $inuit-enable-btn--primary: true;
border-width: 6px;
margin-left: -6px;
}

$inuit-enable-paddings--small: true;
$inuit-enable-paddings--tiny: true;
$inuit-enable-paddings--none: true;
$inuit-enable-margins--small: true;
@import "px-spacing-design/_trumps.spacing.scss";

0 comments on commit 556d24b

Please sign in to comment.