Skip to content

Font Size Configuration and Disabled Button Color Fix #93

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 1 commit into from
Dec 1, 2020
Merged

Font Size Configuration and Disabled Button Color Fix #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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": "0.6.0",
"version": "0.6.1",
"private": false,
"publishConfig": {
"registry": "https://nexus.iroha.tech/repository/npm-soramitsu-private/"
Expand Down
52 changes: 18 additions & 34 deletions src/styles/button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ $s-color-button-tertiary-background-focused: var(--s-color-base-background) !def
--s-color-button-tertiary-background-focused: #{$s-color-button-tertiary-background-focused};
}

@mixin disabled {
&:disabled, &:disabled:hover {
color: var(--s-color-base-on-disabled);
background-color: var(--s-color-base-disabled);
border-color: var(--s-color-base-disabled);
}
}

.s-loading {
padding: 12px 17.5px;
i {
Expand Down Expand Up @@ -46,11 +54,7 @@ $s-color-button-tertiary-background-focused: var(--s-color-base-background) !def
background-color: var(--s-color-theme-accent-focused);
border-color: var(--s-color-theme-accent-focused);
}
&:disabled, &:disabled:hover {
color: var(--s-color-base-content-quaternary);
background-color: var(--s-color-base-disabled);
border-color: var(--s-color-base-disabled);
}
@include disabled;
}
.s-secondary {
background-color: var(--s-color-base-on-accent);
Expand All @@ -61,22 +65,14 @@ $s-color-button-tertiary-background-focused: var(--s-color-base-background) !def
background-color: var(--s-color-base-on-accent);
border-color: var(--s-color-theme-accent);
}
&:disabled, &:disabled:hover {
color: var(--s-color-base-content-quaternary);
background-color: var(--s-color-base-disabled);
border-color: var(--s-color-base-disabled);
}
@include disabled;
&.s-alternative {
&:hover, &:active, &:focus {
color: var(--s-color-base-content-primary);
background-color: var(--s-color-base-background);
border-color: var(--s-color-base-background);
}
&:disabled, &:disabled:hover {
color: var(--s-color-base-content-quaternary);
background-color: var(--s-color-base-disabled);
border-color: var(--s-color-base-disabled);
}
@include disabled;
}
}
.s-link {
Expand All @@ -88,7 +84,7 @@ $s-color-button-tertiary-background-focused: var(--s-color-base-background) !def
background-color: transparent;
}
&:disabled, &:disabled:hover {
color: var(--s-color-base-content-quaternary);
color: var(--s-color-base-on-disabled);
}
}
.s-tertiary {
Expand All @@ -110,32 +106,28 @@ $s-color-button-tertiary-background-focused: var(--s-color-base-background) !def
background-color: var(--s-color-button-tertiary-background-focused);
border-color: var(--s-color-button-tertiary-background-focused);
}
&:disabled, &:disabled:hover {
color: var(--s-color-base-content-quaternary);
background-color: var(--s-color-base-disabled);
border-color: var(--s-color-base-disabled);
}
@include disabled;
}
.s-action {
&.s-big {
width: $s-size-big;
padding: 12px;
i {
font-size: 20px;
font-size: var(--s-icon-font-size-medium);
}
}
&.s-medium {
width: $s-size-medium;
padding: 10px;
i {
font-size: 18px;
font-size: var(--s-icon-font-size-small);
}
}
&.s-small {
width: $s-size-small;
padding: 9px;
i {
font-size: 16px;
font-size: var(--s-icon-font-size-mini);
margin-left: -2px;
margin-top: -2px;
}
Expand All @@ -148,11 +140,7 @@ $s-color-button-tertiary-background-focused: var(--s-color-base-background) !def
background-color: var(--s-color-base-background-hover);
border-color: var(--s-color-base-background-hover);
}
&:disabled, &:disabled:hover {
color: var(--s-color-base-content-quaternary);
background-color: var(--s-color-base-disabled);
border-color: var(--s-color-base-disabled);
}
@include disabled;
&.s-alternative {
background-color: var(--s-color-base-on-accent);
border-color: var(--s-color-base-border-primary);
Expand All @@ -161,11 +149,7 @@ $s-color-button-tertiary-background-focused: var(--s-color-base-background) !def
background-color: var(--s-color-base-background);
border-color: var(--s-color-base-background);
}
&:disabled, &:disabled:hover {
color: var(--s-color-base-content-quaternary);
background-color: var(--s-color-base-disabled);
border-color: var(--s-color-base-disabled);
}
@include disabled;
}
}
button {
Expand Down
2 changes: 1 addition & 1 deletion src/styles/checkbox.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
&.s-small {
@extend .s-small;
.el-checkbox__label {
font-size: 12px;
font-size: var(--s-font-size-mini);
}
&,
&.is-bordered {
Expand Down
2 changes: 1 addition & 1 deletion src/styles/collapse.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
.el-icon-arrow-right {
font-family: $s-font-family-icons;
@extend .s-icon-chevron-bottom;
font-size: 16px;
font-size: var(--s-icon-font-size-mini);
padding: 8px;
width: 32px;
height: 32px;
Expand Down
48 changes: 26 additions & 22 deletions src/styles/common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,40 +13,40 @@ html {
}

/* Typography */
h1 {
h1, h2, h3, h4, h5, h6 {
font-family: $s-font-family-default;
}

h1, h2, h3, h4 {
font-weight: normal;
font-size: 36px;
}

h5, h6 {
font-weight: bold;
}

h1 {
font-size: var(--s-heading1-font-size);
}

h2 {
font-family: $s-font-family-default;
font-weight: normal;
font-size: 30px;
font-size: var(--s-heading2-font-size);
}

h3 {
font-family: $s-font-family-default;
font-weight: normal;
font-size: 24px;
font-size: var(--s-heading3-font-size);
}

h4 {
font-family: $s-font-family-default;
font-weight: normal;
font-size: 18px;
font-size: var(--s-heading4-font-size);
}

h5 {
font-family: $s-font-family-default;
font-weight: bold;
font-size: 16px;
font-size: var(--s-heading5-font-size);
}

h6 {
font-family: $s-font-family-default;
font-weight: bold;
font-size: 14px;
font-size: var(--s-heading6-font-size);
}

.s-flex {
Expand All @@ -58,15 +58,19 @@ h6 {
}

.s-big {
height: $s-size-big;
height: var(--s-size-big);
}

.s-medium {
height: $s-size-medium;
height: var(--s-size-medium);
}

.s-small {
height: $s-size-small;
height: var(--s-size-small);
}

.s-mini {
height: var(--s-size-mini);
}

.s-border-radius-big {
Expand Down Expand Up @@ -122,13 +126,13 @@ button > span {
.el-message-box__header {
.el-message-box__title {
color: var(--s-color-base-content-primary);
font-size: 16px;
font-size: var(--s-heading5-font-size);
}
}
.el-message-box__btns {
button.el-button.el-button--default.el-button--small {
height: $s-size-medium;
font-size: 14px;
font-size: var(--s-font-size-small);
border-radius: var(--s-border-radius-mini);
&:hover, &:active, &:focus {
color: var(--s-color-theme-accent);
Expand Down
2 changes: 1 addition & 1 deletion src/styles/datepicker.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
// TODO: add default animation from material-ui
color: var(--s-color-base-content-tertiary);
text-align: left;
font-size: 12px;
font-size: var(--s-font-size-mini);
padding: 0 15px;
padding-top: 5px;
top: 1px;
Expand Down
2 changes: 1 addition & 1 deletion src/styles/dialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
}
.el-dialog__title {
font-weight: bold;
font-size: 16px;
font-size: var(--s-heading5-font-size);
color: var(--s-color-base-content-primary);
}
> * {
Expand Down
2 changes: 1 addition & 1 deletion src/styles/dropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
cursor: pointer;
}
.s-icon-more-horizontal {
font-size: 24px;
font-size: var(--s-icon-font-size-big);
}
}
.el-dropdown-menu__item {
Expand Down
2 changes: 1 addition & 1 deletion src/styles/form.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
position: absolute;
bottom: 6px;
left: 4px;
font-size: 16px;
font-size: var(--s-icon-font-size-mini);
color: var(--s-color-status-error);
}
.el-input__inner,
Expand Down
4 changes: 2 additions & 2 deletions src/styles/input.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
// TODO: add default animation from material-ui
color: var(--s-color-base-content-tertiary);
text-align: left;
font-size: 12px;
font-size: var(--s-font-size-mini);
padding: 0 15px;
padding-top: 5px;
top: 1px;
Expand Down Expand Up @@ -150,7 +150,7 @@
.s-icon-file-upload {
top: 16px;
right: 16px;
font-size: 24px;
font-size: var(--s-icon-font-size-big);
z-index: 1;
position: absolute;
+ input {
Expand Down
2 changes: 1 addition & 1 deletion src/styles/json-input.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ $color-ide-boolean: #0000FF;
color: var(--s-color-base-on-accent);
border-radius: var(--s-border-radius-mini);
padding: 10px;
font-size: 12px;
font-size: var(--s-font-size-mini);
line-height: 1.2;
}
}
4 changes: 2 additions & 2 deletions src/styles/menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ $margin-bottom-menu-item: 8px;
}
[class^="s-icon-"] {
margin-right: 12px;
font-size: 20px;
font-size: var(--s-icon-font-size-medium);
}
i {
color: var(--s-menu-text-color);
Expand All @@ -67,7 +67,7 @@ $margin-bottom-menu-item: 8px;
align-items: center;
[class^="s-icon-"] {
margin-right: 12px;
font-size: 20px;
font-size: var(--s-icon-font-size-medium);
}
i {
color: var(--s-menu-text-color);
Expand Down
4 changes: 2 additions & 2 deletions src/styles/pagination.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,10 @@
.el-pagination__sizes .el-select .el-input {
.el-input__inner {
height: 22px !important;
font-size: 12px;
font-size: var(--s-font-size-mini);
}
.el-select__caret {
font-size: 12px;
font-size: var(--s-font-size-mini);
line-height: 23px;
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/styles/radio.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ $radio-button-border-color: var(--s-color-theme-accent);
@mixin radio-button-size(
$modifier: "small",
$size: $s-size-small,
$font-size: $s-font-size-small
$font-size: var(--s-font-size-mini)
) {
$radio-button-vertical-padding: #{($size - $font-size) / 2 - $radio-button-border-width};
#{$radio-button-class} {
Expand Down Expand Up @@ -59,7 +59,7 @@ $radio-button-border-color: var(--s-color-theme-accent);
padding-top: 9px;
}
> .el-radio__label {
font-size: 12px;
font-size: var(--s-font-size-mini);
}
> .el-radio__input .el-radio__inner {
width: 14px;
Expand Down Expand Up @@ -185,8 +185,8 @@ $radio-button-border-color: var(--s-color-theme-accent);
}
&-group {
@include radio-button-size;
@include radio-button-size("medium", $s-size-medium, $s-font-size-big);
@include radio-button-size("big", $s-size-big, $s-font-size-big);
@include radio-button-size("medium", $s-size-medium, var(--s-font-size-small));
@include radio-button-size("big", $s-size-big, var(--s-font-size-small));
#{$radio-button-class} {
&__inner {
background-color: var(--s-color-utility-surface);
Expand Down
4 changes: 2 additions & 2 deletions src/styles/scroll-sections.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.s-scroll-sections {
font-family: $s-font-family-default;
font-size: 14px;
font-size: var(--s-font-size-small)
}
.s-scroll-menu {
font-weight: 600;
Expand Down Expand Up @@ -39,7 +39,7 @@
padding-bottom: 90%;
color: var(--s-color-base-content-primary);
.title {
font-size: 16px;
font-size: var(--s-heading5-font-size);
}
}
.s-scroll-section-item {
Expand Down
Loading