Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 8de5974
Author: Alin Voinea <contact@avoinea.com>
Date:   Fri Jul 1 12:40:52 2022 +0300

    Move border style to eea design system to keep backward compatibility

commit a9edffb
Author: Alin Voinea <contact@avoinea.com>
Date:   Fri Jul 1 11:41:07 2022 +0300

    Refactoring border options
  • Loading branch information
avoinea committed Jul 1, 2022
1 parent e8d4c12 commit ca241f5
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 24 deletions.
7 changes: 4 additions & 3 deletions src/components/templates/default/Edit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -287,9 +287,10 @@ const Edit = (props) => {
vertical: menuPosition.vertical,
className: cx(
data.menuAlign,
menuPosition.direction === 'left'
? 'borderRight'
: menuPosition.direction === 'right' && 'borderLeft',
menuPosition.direction === 'left' ? 'border-right' : '',
menuPosition.direction === 'right' ? 'border-left' : '',
menuPosition.direction === 'top' ? 'border-bottom' : '',
menuPosition.direction === 'bottom' ? 'border-top' : '',
{ container: isContainer },
),
}}
Expand Down
7 changes: 4 additions & 3 deletions src/components/templates/default/View.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,10 @@ const View = (props) => {
vertical: menuPosition.vertical,
className: cx(
data.menuAlign,
menuPosition.direction === 'left'
? 'borderRight'
: menuPosition.direction === 'right' && 'borderLeft',
menuPosition.direction === 'left' ? 'border-right' : '',
menuPosition.direction === 'right' ? 'border-left' : '',
menuPosition.direction === 'top' ? 'border-bottom' : '',
menuPosition.direction === 'bottom' ? 'border-top' : '',
{ container: isContainer },
),
}}
Expand Down
17 changes: 0 additions & 17 deletions src/less/menu.less
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,6 @@
justify-content: flex-start;
}

&.borderLeft {
border-right-width: 0;
border-left-width: 0.0625rem;
border-left-style: solid;
border-left-color: #bcbec0;

.item.active {
border-right-width: 0rem;
border-left-style: solid;
margin: 0em 0em 0em -0.2rem;
}

.item:active {
border-right-width: 0rem;
}
}

&.right {
justify-content: flex-end;
}
Expand Down
5 changes: 4 additions & 1 deletion src/utils/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@ const getMenuPosition = (data) => {
if (['bottom'].includes(position)) {
return {
attached: position,
direction: position,
};
}
return {};
return {
direction: position,
};
};

const toggleItem = (container, item, hidden) => {
Expand Down

0 comments on commit ca241f5

Please sign in to comment.