Skip to content

fix action button #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 4, 2021
Merged

fix action button #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
922c82d
fix action button
Nikita-Polyakov Aug 4, 2021
a64ad97
set 0 padding for action neu button
Nikita-Polyakov Aug 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@soramitsu/soramitsu-js-ui",
"version": "1.0.8",
"version": "1.0.9",
"private": false,
"publishConfig": {
"registry": "https://nexus.iroha.tech/repository/npm-soramitsu/"
Expand Down
17 changes: 16 additions & 1 deletion src/styles/neumorphism/button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,9 @@ $neu-button-action-text-color-hover: var(--s-color-base-content-secondary) !defa
$neu-button-action-text-color-pressed: var(--s-color-theme-accent) !default;
$neu-button-action-text-color-alternative: var(--s-color-base-content-tertiary) !default;
$neu-button-action-text-color-alternative-active: var(--s-color-base-content-secondary) !default;
$neu-button-action-primary-text-color: var(--s-color-base-on-accent) !default;
// Action button: Dark: text colors
$neu-button-action-primary-text-color--dark: var(--s-color-utility-surface) !default;
// Action button: border colors
$neu-button-action-border-color: transparent !default;
$neu-button-action-border-color-hover: $neu-button-action-border-color !default;
Expand All @@ -133,6 +136,14 @@ $neu-button-action-box-shadow-hover: $neu-button-action-box-shadow !default;
$neu-button-action-box-shadow-pressed: var(--s-shadow-element) !default;
$neu-button-action-box-shadow-alternative: none !default;

:root {
--neu-button-action-primary-text-color: #{$neu-button-action-primary-text-color};
}

[design-system-theme="dark"] {
--neu-button-action-primary-text-color: #{$neu-button-action-primary-text-color--dark};
}

$neu-button-padding-big: 7px 13px !default;
$neu-button-padding-medium: 5px 13px !default;
$neu-button-padding-small: 4px 6px !default;
Expand Down Expand Up @@ -166,7 +177,7 @@ $neu-button-padding-mini: 3px 6px !default;

@mixin action-size ($suffix: 'big') {
&.s-#{$suffix} {
padding: 7px;
padding: 0;
height: var(--s-size-#{$suffix});
width: var(--s-size-#{$suffix});
}
Expand Down Expand Up @@ -293,6 +304,10 @@ $neu-button-padding-mini: 3px 6px !default;
@include action-size('small');
@include action-size('mini');

&.s-primary {
color: var(--neu-button-action-primary-text-color);
}

&:not(.s-primary) {
background: $neu-button-action-background-color;
border-color: $neu-button-action-border-color;
Expand Down