Skip to content

Commit

Permalink
breaking(buttons): style circular.basic and basic.floated buttons as …
Browse files Browse the repository at this point in the history
…circular.icon
  • Loading branch information
ichim-david authored May 22, 2024
1 parent 5e55764 commit 46a30c8
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@eeacms/volto-eea-design-system",
"version": "1.23.8",
"version": "1.30.0",
"description": "@eeacms/volto-eea-design-system: Volto add-on",
"main": "src/index.js",
"author": "European Environment Agency: IDM2 A-Team",
Expand Down
10 changes: 9 additions & 1 deletion theme/themes/eea/elements/button.overrides
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,21 @@
*******************************/
// ensure circular button gets the border color of the current text color
// and acts as a circular button
.ui.circular.basic.button,
.ui.basic.floated.button,
.ui.circular.icon.button {
padding: @circularButtonPadding;
border-width: @circularButtonBorderWidth;
border-color: @circularButtonBorderColor;
border-radius: @circularButtonBorderRadius;
line-height: @circularButtonLineHeight;
}

.ui.basic.button > .icon {
margin: @basicButtonIconMargin;
vertical-align: @basicButtonIconVerticalAlign;
}

// toolbar yes and cancel icons go outside the button area with default line
// height
#toolbar .toolbar-content button,
Expand Down Expand Up @@ -140,8 +148,8 @@ p.ui.button {
.ui.button.search {
box-sizing: border-box;
border: @buttonBorder @white;
background: @searchButtonBackground;
border-radius: @searchButtonBorderRadius;
background: @searchButtonBackground;
color: @searchButtonColor;
font-size: @searchButtonFontSize;

Expand Down
6 changes: 5 additions & 1 deletion theme/themes/eea/elements/button.variables
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,9 @@
@basicLoadingColor: @offWhite;
@basicTextTransform: none;

@basicButtonIconMargin: 0 !important;
@basicButtonIconVerticalAlign: top;

/* Basic Hover */
@basicHoverBackground: #FFFFFF;
@basicHoverTextColor: @hoveredTextColor;
Expand Down Expand Up @@ -303,9 +306,10 @@
/* Circular */
@circularButtonBorderWidth: 2px;
@circularButtonBorderColor: currentColor;
@circularButtonPadding: 0.25em;
@circularButtonPadding: 0;
@circularButtonIconFontSize: 1.375em;
@circularButtonLineHeight: 1;
@circularButtonBorderRadius: 50%;

/*-------------------
Variations
Expand Down

0 comments on commit 46a30c8

Please sign in to comment.